@magic-xpa/angular 4.1000.0-dev4100.405 → 4.1000.0-dev4100.408
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -5
- package/esm2020/src/services/OverlayWindowService.mjs +9 -37
- package/esm2020/src/services/magic-color.service.mjs +1 -1
- package/esm2020/src/services/subform.magic.service.mjs +1 -1
- package/esm2020/src/services/table.magic.service.mjs +1 -1
- package/esm2020/src/ui/GuiInteractiveExecutor.mjs +1 -8
- package/esm2020/src/ui/components/base-magic-alert.component.mjs +1 -1
- package/esm2020/src/ui/components/base-magic-confirm.component.mjs +1 -1
- package/esm2020/src/ui/components/magic-alert.component.mjs +8 -8
- package/esm2020/src/ui/components/magic-confirmation-box.component.mjs +11 -11
- package/esm2020/src/ui/directives/magic/nocontrol.magic.directive.mjs +6 -8
- package/esm2020/src/ui/directives/magic-focus.directive.mjs +1 -1
- package/esm2020/src/ui/directives/magic.directive.mjs +5 -10
- package/esm2020/src/ui/directives/magicViewContainerRef.directive.mjs +1 -1
- package/esm2020/src/ui/magic-root.component.mjs +2 -2
- package/fesm2015/magic-xpa-angular.mjs +32 -68
- package/fesm2015/magic-xpa-angular.mjs.map +1 -1
- package/fesm2020/magic-xpa-angular.mjs +32 -68
- package/fesm2020/magic-xpa-angular.mjs.map +1 -1
- package/package.json +3 -3
- package/src/services/OverlayWindowService.d.ts +3 -9
- package/src/ui/GuiInteractiveExecutor.d.ts +0 -1
- package/src/ui/directives/magic/nocontrol.magic.directive.d.ts +2 -3
- package/src/ui/directives/magic.directive.d.ts +2 -4
@@ -18,9 +18,9 @@ import * as i1$1 from '@angular/platform-browser';
|
|
18
18
|
import * as i1$2 from '@angular/common/http';
|
19
19
|
import { HttpClientModule } from '@angular/common/http';
|
20
20
|
import { maskitoTimeOptionsGenerator } from '@maskito/kit';
|
21
|
-
import * as i2$1 from '@angular/cdk/platform';
|
22
21
|
import { MaskitoModule } from '@maskito/angular';
|
23
22
|
import { NativeDateAdapter, MAT_DATE_LOCALE, DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core';
|
23
|
+
import * as i1$3 from '@angular/cdk/platform';
|
24
24
|
|
25
25
|
class ControlMetadata {
|
26
26
|
constructor() {
|
@@ -718,9 +718,6 @@ class GuiInteractiveExecutor {
|
|
718
718
|
case InteractiveCommandType.GET_LAST_ROUTE:
|
719
719
|
this.OnGetLastRoute();
|
720
720
|
break;
|
721
|
-
case InteractiveCommandType.OPEN_FORM:
|
722
|
-
this.OnOpenForm();
|
723
|
-
break;
|
724
721
|
}
|
725
722
|
}
|
726
723
|
catch (ex) {
|
@@ -762,10 +759,6 @@ class GuiInteractiveExecutor {
|
|
762
759
|
OnMessageBox() {
|
763
760
|
this.overlayService.openConfirmationBox(this.command._mgValue.title, this.command._mgValue.str, this.command._mgValue.style);
|
764
761
|
}
|
765
|
-
OnOpenForm() {
|
766
|
-
if (this.command._boolVal)
|
767
|
-
this.overlayService.loadAndOpenModule(this.command.controlName, this.command._mgValue.str, this.command._mgValue.path);
|
768
|
-
}
|
769
762
|
OnSetTitle() {
|
770
763
|
this.task.setTitle(this.command._mgValue.title);
|
771
764
|
}
|
@@ -1182,13 +1175,13 @@ MagicAlertComponent.ɵcmp = i0.ɵɵdefineComponent({ type: MagicAlertComponent,
|
|
1182
1175
|
} }, styles: [".mg-message-background[_ngcontent-%COMP%]{background-color:#f5f5f5;width:40%;font-family:Open Sans,Helvetica Neue,Helvetica,Arial,sans-serif;padding:17px;border-radius:5px;text-align:center;margin-top:10%;margin-left:auto;margin-right:auto;border:1px solid gray}button[_ngcontent-%COMP%]{background-color:#8cd4f5;color:#fff;border:none;box-shadow:none;font-size:17px;font-weight:500;border-radius:5px;padding:10px 32px;margin:26px 5px 0;cursor:pointer}"] });
|
1183
1176
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MagicAlertComponent, [{
|
1184
1177
|
type: Component,
|
1185
|
-
args: [{ selector: 'sample-magic-alert-component', template: `<div>
|
1186
|
-
<div class="mg-message-background">
|
1187
|
-
<h2> {{title}}</h2>
|
1188
|
-
<p>{{message}} </p>
|
1189
|
-
|
1190
|
-
<button (click)="OnClose()">OK</button>
|
1191
|
-
</div>
|
1178
|
+
args: [{ selector: 'sample-magic-alert-component', template: `<div>
|
1179
|
+
<div class="mg-message-background">
|
1180
|
+
<h2> {{title}}</h2>
|
1181
|
+
<p>{{message}} </p>
|
1182
|
+
|
1183
|
+
<button (click)="OnClose()">OK</button>
|
1184
|
+
</div>
|
1192
1185
|
</div>`, styles: [".mg-message-background{background-color:#f5f5f5;width:40%;font-family:Open Sans,Helvetica Neue,Helvetica,Arial,sans-serif;padding:17px;border-radius:5px;text-align:center;margin-top:10%;margin-left:auto;margin-right:auto;border:1px solid gray}button{background-color:#8cd4f5;color:#fff;border:none;box-shadow:none;font-size:17px;font-weight:500;border-radius:5px;padding:10px 32px;margin:26px 5px 0;cursor:pointer}\n"] }]
|
1193
1186
|
}], null, null); })();
|
1194
1187
|
|
@@ -1217,16 +1210,16 @@ MagicConfirmationBoxComponent.ɵcmp = i0.ɵɵdefineComponent({ type: MagicConfir
|
|
1217
1210
|
} }, styles: [".mg-message-background[_ngcontent-%COMP%]{background-color:#f5f5f5;width:40%;font-family:Open Sans,Helvetica Neue,Helvetica,Arial,sans-serif;padding:17px;border-radius:5px;text-align:center;margin-top:10%;margin-left:auto;margin-right:auto;border:1px solid gray}button[_ngcontent-%COMP%]{background-color:#8cd4f5;color:#fff;border:none;box-shadow:none;font-size:17px;font-weight:500;border-radius:5px;padding:10px 32px;margin:26px 5px 0;cursor:pointer}button.cancel[_ngcontent-%COMP%]{background-color:#c1c1c1}"] });
|
1218
1211
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MagicConfirmationBoxComponent, [{
|
1219
1212
|
type: Component,
|
1220
|
-
args: [{ selector: 'sample-magic-confirmation-box', template: `<div>
|
1221
|
-
<div class="mg-message-background">
|
1222
|
-
<h2> {{title}}</h2>
|
1223
|
-
{{message}}
|
1224
|
-
<br>
|
1225
|
-
<br>
|
1226
|
-
|
1227
|
-
<button (click)="OnClose(true)">OK</button>
|
1228
|
-
<button class="cancel" (click)="OnClose(false)">Cancel</button>
|
1229
|
-
</div>
|
1213
|
+
args: [{ selector: 'sample-magic-confirmation-box', template: `<div>
|
1214
|
+
<div class="mg-message-background">
|
1215
|
+
<h2> {{title}}</h2>
|
1216
|
+
{{message}}
|
1217
|
+
<br>
|
1218
|
+
<br>
|
1219
|
+
|
1220
|
+
<button (click)="OnClose(true)">OK</button>
|
1221
|
+
<button class="cancel" (click)="OnClose(false)">Cancel</button>
|
1222
|
+
</div>
|
1230
1223
|
</div>`, styles: [".mg-message-background{background-color:#f5f5f5;width:40%;font-family:Open Sans,Helvetica Neue,Helvetica,Arial,sans-serif;padding:17px;border-radius:5px;text-align:center;margin-top:10%;margin-left:auto;margin-right:auto;border:1px solid gray}button{background-color:#8cd4f5;color:#fff;border:none;box-shadow:none;font-size:17px;font-weight:500;border-radius:5px;padding:10px 32px;margin:26px 5px 0;cursor:pointer}button.cancel{background-color:#c1c1c1}\n"] }]
|
1231
1224
|
}], null, null); })();
|
1232
1225
|
|
@@ -1289,42 +1282,17 @@ class confirmationBox {
|
|
1289
1282
|
}
|
1290
1283
|
|
1291
1284
|
class OverlayWindowService {
|
1292
|
-
constructor(componentFactoryResolver, componentList, engineMagicService,
|
1285
|
+
constructor(componentFactoryResolver, componentList, engineMagicService, overlayContainerMagicProvider, confirmationComponentsMagicProvider) {
|
1293
1286
|
this.componentFactoryResolver = componentFactoryResolver;
|
1294
1287
|
this.componentList = componentList;
|
1295
1288
|
this.engineMagicService = engineMagicService;
|
1296
|
-
this.magicLazyModuleLoader = magicLazyModuleLoader;
|
1297
|
-
this.injector = injector;
|
1298
|
-
this.compiler = compiler;
|
1299
1289
|
this.overlayContainerMagicProvider = overlayContainerMagicProvider;
|
1300
1290
|
this.confirmationComponentsMagicProvider = confirmationComponentsMagicProvider;
|
1301
1291
|
this.overlayWindowFocusManager = null;
|
1302
|
-
this.changeDetectorRef = null;
|
1303
1292
|
}
|
1304
|
-
init(overlayWindowsContainerViewRef, rootMagicElement
|
1293
|
+
init(overlayWindowsContainerViewRef, rootMagicElement) {
|
1305
1294
|
this.overlayWindowsContainerViewRef = overlayWindowsContainerViewRef;
|
1306
1295
|
this.overlayWindowFocusManager = new OverlayWindowFocusManager(rootMagicElement);
|
1307
|
-
this.changeDetectorRef = changeDetectorRef;
|
1308
|
-
}
|
1309
|
-
loadAndOpenModule(formName, taskId, taskDescription) {
|
1310
|
-
let moduleRef = this.componentList.getModuleRef(formName);
|
1311
|
-
if (moduleRef == null) {
|
1312
|
-
let lazyLoadModule = this.componentList.getLazyLoadModuleData(formName);
|
1313
|
-
if (lazyLoadModule != null) {
|
1314
|
-
let moduleName = lazyLoadModule.moduleName.replace("Magic", "");
|
1315
|
-
moduleName = moduleName.replace("Module", "");
|
1316
|
-
this.magicLazyModuleLoader.Load(moduleName).then(m => {
|
1317
|
-
const compiled = this.compiler.compileModuleAndAllComponentsSync(m[lazyLoadModule.moduleName]);
|
1318
|
-
moduleRef = compiled.ngModuleFactory.create(this.injector);
|
1319
|
-
this.open(formName, taskId, taskDescription);
|
1320
|
-
this.finishConfirmation(Styles.MSGBOX_BUTTON_OK, true);
|
1321
|
-
});
|
1322
|
-
}
|
1323
|
-
}
|
1324
|
-
else {
|
1325
|
-
this.open(formName, taskId, taskDescription);
|
1326
|
-
this.finishConfirmation(Styles.MSGBOX_BUTTON_OK, true);
|
1327
|
-
}
|
1328
1296
|
}
|
1329
1297
|
open(formName, taskId, taskDescription) {
|
1330
1298
|
let comp = this.componentList.lazyLoadModulesMap != null && this.componentList.lazyLoadModulesMap.hasOwnProperty(formName) ? null : this.componentList.getComponent(formName);
|
@@ -1335,7 +1303,6 @@ class OverlayWindowService {
|
|
1335
1303
|
guiEvent.TaskID = taskId;
|
1336
1304
|
this.engineMagicService.insertEvent(guiEvent);
|
1337
1305
|
});
|
1338
|
-
this.changeDetectorRef.detectChanges();
|
1339
1306
|
}
|
1340
1307
|
close(commandStr) {
|
1341
1308
|
this.overlayWindowsContainerViewRef.remove();
|
@@ -1381,14 +1348,14 @@ class OverlayWindowService {
|
|
1381
1348
|
return componentRef;
|
1382
1349
|
}
|
1383
1350
|
}
|
1384
|
-
OverlayWindowService.ɵfac = function OverlayWindowService_Factory(t) { return new (t || OverlayWindowService)(i0.ɵɵinject(i0.ComponentFactoryResolver), i0.ɵɵinject(ComponentListMagicService), i0.ɵɵinject(EngineMagicService), i0.ɵɵinject(
|
1351
|
+
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)); };
|
1385
1352
|
OverlayWindowService.ɵprov = i0.ɵɵdefineInjectable({ token: OverlayWindowService, factory: OverlayWindowService.ɵfac, providedIn: 'root' });
|
1386
1353
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(OverlayWindowService, [{
|
1387
1354
|
type: Injectable,
|
1388
1355
|
args: [{
|
1389
1356
|
providedIn: 'root'
|
1390
1357
|
}]
|
1391
|
-
}], function () { return [{ type: i0.ComponentFactoryResolver }, { type: ComponentListMagicService }, { type: EngineMagicService }, { type:
|
1358
|
+
}], function () { return [{ type: i0.ComponentFactoryResolver }, { type: ComponentListMagicService }, { type: EngineMagicService }, { type: OverlayContainerMagicProvider }, { type: ConfirmationComponentsMagicProvider }]; }, null); })();
|
1392
1359
|
class OverlayWindowFocusManager {
|
1393
1360
|
constructor(rootMagicElement) {
|
1394
1361
|
this.rootMagicElement = null;
|
@@ -2808,12 +2775,11 @@ class MagicDirective {
|
|
2808
2775
|
this.eventsOnlyVal = true;
|
2809
2776
|
}
|
2810
2777
|
;
|
2811
|
-
constructor(_task, element, renderer, vcRef,
|
2778
|
+
constructor(_task, element, renderer, vcRef, magicRow) {
|
2812
2779
|
this._task = _task;
|
2813
2780
|
this.element = element;
|
2814
2781
|
this.renderer = renderer;
|
2815
2782
|
this.vcRef = vcRef;
|
2816
|
-
this.platform = platform;
|
2817
2783
|
this.magicRow = magicRow;
|
2818
2784
|
this.eventHandlers = {};
|
2819
2785
|
this.eventsOnlyVal = false;
|
@@ -2835,8 +2801,6 @@ class MagicDirective {
|
|
2835
2801
|
let fromButton = false;
|
2836
2802
|
if (this.htmlElement instanceof HTMLButtonElement)
|
2837
2803
|
fromButton = true;
|
2838
|
-
if (fromButton && (this.platform.IOS || this.platform.SAFARI))
|
2839
|
-
this.task.insertEvent(getGuiEventObj("focus", this.id, +this.rowId));
|
2840
2804
|
this.task.insertEvent(getGuiEventObj(event, this.id, +this.rowId, fromButton));
|
2841
2805
|
if (MagicDirective.noOfAutoCompleteBoxesOpened < 1)
|
2842
2806
|
e.cancelBubble = true;
|
@@ -2978,14 +2942,14 @@ class MagicDirective {
|
|
2978
2942
|
}
|
2979
2943
|
MagicDirective.opened = false;
|
2980
2944
|
MagicDirective.noOfAutoCompleteBoxesOpened = 0;
|
2981
|
-
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(
|
2945
|
+
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)); };
|
2982
2946
|
MagicDirective.ɵdir = i0.ɵɵdefineDirective({ type: MagicDirective, selectors: [["", "magic", ""]], inputs: { magic: "magic", eventsOnly: "eventsOnly", rowId: "rowId" } });
|
2983
2947
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MagicDirective, [{
|
2984
2948
|
type: Directive,
|
2985
2949
|
args: [{
|
2986
2950
|
selector: "[magic]"
|
2987
2951
|
}]
|
2988
|
-
}], function () { return [{ type: TaskMagicService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ViewContainerRef }, { type:
|
2952
|
+
}], function () { return [{ type: TaskMagicService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ViewContainerRef }, { type: RowMagicDirective, decorators: [{
|
2989
2953
|
type: Optional
|
2990
2954
|
}] }]; }, { magic: [{
|
2991
2955
|
type: Input,
|
@@ -3000,8 +2964,8 @@ MagicDirective.ɵdir = i0.ɵɵdefineDirective({ type: MagicDirective, selectors:
|
|
3000
2964
|
class NoControlMagicDirective extends MagicDirective {
|
3001
2965
|
set magic(val) { this.id = val; this.selector = 'magicnc'; }
|
3002
2966
|
;
|
3003
|
-
constructor(_task, element, renderer, vcRef,
|
3004
|
-
super(_task, element, renderer, vcRef,
|
2967
|
+
constructor(_task, element, renderer, vcRef, magicRow) {
|
2968
|
+
super(_task, element, renderer, vcRef, magicRow);
|
3005
2969
|
}
|
3006
2970
|
regEvents() {
|
3007
2971
|
super.regEvents();
|
@@ -3163,14 +3127,14 @@ class NoControlMagicDirective extends MagicDirective {
|
|
3163
3127
|
}
|
3164
3128
|
}
|
3165
3129
|
}
|
3166
|
-
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(
|
3130
|
+
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)); };
|
3167
3131
|
NoControlMagicDirective.ɵdir = i0.ɵɵdefineDirective({ type: NoControlMagicDirective, selectors: [["", "magicnc", ""]], inputs: { magic: ["magicnc", "magic"] }, features: [i0.ɵɵInheritDefinitionFeature] });
|
3168
3132
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(NoControlMagicDirective, [{
|
3169
3133
|
type: Directive,
|
3170
3134
|
args: [{
|
3171
3135
|
selector: '[magicnc]'
|
3172
3136
|
}]
|
3173
|
-
}], function () { return [{ type: TaskMagicService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ViewContainerRef }, { type:
|
3137
|
+
}], function () { return [{ type: TaskMagicService }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ViewContainerRef }, { type: RowMagicDirective, decorators: [{
|
3174
3138
|
type: Optional
|
3175
3139
|
}] }]; }, { magic: [{
|
3176
3140
|
type: Input,
|
@@ -4104,7 +4068,7 @@ class MagicShellComponent {
|
|
4104
4068
|
this.engineMagicService.TerminateContextUsingFetchAPI();
|
4105
4069
|
}
|
4106
4070
|
ngAfterViewInit() {
|
4107
|
-
this.overlayWindowService.init(this.overlayWindowsContainerViewRef, this.rootMagicElementRef.nativeElement
|
4071
|
+
this.overlayWindowService.init(this.overlayWindowsContainerViewRef, this.rootMagicElementRef.nativeElement);
|
4108
4072
|
this.engineMagicService.startMagicEngine(this.httpClient);
|
4109
4073
|
}
|
4110
4074
|
setViewContainerRef(vcRef) {
|
@@ -4671,11 +4635,11 @@ class MgDateAdapter extends NativeDateAdapter {
|
|
4671
4635
|
}
|
4672
4636
|
}
|
4673
4637
|
}
|
4674
|
-
MgDateAdapter.ɵfac = function MgDateAdapter_Factory(t) { return new (t || MgDateAdapter)(i0.ɵɵinject(
|
4638
|
+
MgDateAdapter.ɵfac = function MgDateAdapter_Factory(t) { return new (t || MgDateAdapter)(i0.ɵɵinject(i1$3.Platform), i0.ɵɵinject(TaskMagicService), i0.ɵɵinject(MAT_DATE_LOCALE)); };
|
4675
4639
|
MgDateAdapter.ɵprov = i0.ɵɵdefineInjectable({ token: MgDateAdapter, factory: MgDateAdapter.ɵfac });
|
4676
4640
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MgDateAdapter, [{
|
4677
4641
|
type: Injectable
|
4678
|
-
}], function () { return [{ type:
|
4642
|
+
}], function () { return [{ type: i1$3.Platform }, { type: TaskMagicService }, { type: undefined, decorators: [{
|
4679
4643
|
type: Inject,
|
4680
4644
|
args: [MAT_DATE_LOCALE]
|
4681
4645
|
}] }]; }, null); })();
|