zek 16.1.2 → 16.1.3
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.
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Input, Directive } from '@angular/core';
|
|
2
|
-
import { PRIMARY_OUTLET } from '@angular/router';
|
|
3
2
|
import { AppBaseModule } from '../zek.module';
|
|
4
3
|
import { PrintType } from '../models/print.model';
|
|
5
4
|
import { WebApiClient } from '../services';
|
|
@@ -35,9 +34,10 @@ export class BaseComponent extends CoreComponent {
|
|
|
35
34
|
navigateReturnUrl() {
|
|
36
35
|
const returnUrl = this.getQueryParam('returnUrl') || this.getParam('returnUrl');
|
|
37
36
|
if (returnUrl) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
37
|
+
this.router.navigateByUrl(returnUrl);
|
|
38
|
+
// let urlTree = this.router.parseUrl(returnUrl);
|
|
39
|
+
// const urlWithoutParams = urlTree.root.children[PRIMARY_OUTLET].segments.map(it => it.path).join('/')
|
|
40
|
+
// this.router.navigate([urlWithoutParams, urlTree.root.children[PRIMARY_OUTLET].segments[urlTree.root.children[PRIMARY_OUTLET].segments.length - 1].parameters]);
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
this.router.navigate([this.router.url.substring(0, this.router.url.lastIndexOf('/'))]);
|
|
@@ -94,4 +94,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.7", ngImpor
|
|
|
94
94
|
}], model: [{
|
|
95
95
|
type: Input
|
|
96
96
|
}] } });
|
|
97
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"base.component.js","sourceRoot":"","sources":["../../../../../projects/zek/src/lib/components/base.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Input, Directive, Type } from '@angular/core';\r\nimport { ActivatedRoute, Router, PRIMARY_OUTLET } from '@angular/router';\r\nimport { AppBaseModule } from '../zek.module';\r\n\r\nimport { PrintType } from '../models/print.model';\r\nimport { WebApiClient } from '../services';\r\nimport { CoreComponent } from './core.component';\r\nimport { BooleanInput, StringInput } from './types';\r\nimport { Convert, UrlHelper } from '../utils';\r\n\r\n@Directive()\r\nexport class BaseComponent<TModel = any> extends CoreComponent {\r\n    constructor(\r\n        protected readonly route: ActivatedRoute,\r\n        protected readonly router: Router\r\n    ) {\r\n        super();\r\n    }\r\n\r\n\r\n    private _readOnly = false;\r\n    @Input()\r\n    get readOnly() {\r\n        return this._readOnly;\r\n    }\r\n    set readOnly(v: BooleanInput) {\r\n        this._readOnly = Convert.toBooleanProperty(v);\r\n    }\r\n\r\n    private _url: string | null = null;\r\n    protected get url(): string {\r\n        if (!this._url)\r\n            this._url = UrlHelper.getNoParam(this.router.url);\r\n        return this._url;\r\n    }\r\n\r\n    @Input() model?: TModel | null;\r\n\r\n\r\n\r\n    protected getParam(name: string) {\r\n        return this.route.snapshot.paramMap.get(name);\r\n    }\r\n    protected getQueryParam(name: string) {\r\n        return this.route.snapshot.queryParamMap.get(name);\r\n    }\r\n\r\n\r\n    protected navigateReturnUrl() {\r\n        const returnUrl = this.getQueryParam('returnUrl') || this.getParam('returnUrl');\r\n        if (returnUrl) {\r\n            this.router.navigateByUrl(returnUrl);\r\n            // let urlTree = this.router.parseUrl(returnUrl);\r\n            // const urlWithoutParams = urlTree.root.children[PRIMARY_OUTLET].segments.map(it => it.path).join('/')\r\n            // this.router.navigate([urlWithoutParams, urlTree.root.children[PRIMARY_OUTLET].segments[urlTree.root.children[PRIMARY_OUTLET].segments.length - 1].parameters]);\r\n            return;\r\n        }\r\n\r\n        this.router.navigate([this.router.url.substring(0, this.router.url.lastIndexOf('/'))]);\r\n    }\r\n\r\n\r\n    cancel() {\r\n        this.navigateReturnUrl();\r\n    }\r\n\r\n    downloadFile(blob: Blob | null, fileName: string, type?: string | null) {\r\n        if (!blob) return;\r\n\r\n        const nav = (window.navigator as any);\r\n        if (nav && nav.msSaveOrOpenBlob) {\r\n            nav.msSaveOrOpenBlob(blob, fileName);\r\n        } else {\r\n            let a = document.createElement('a');\r\n            a.href = URL.createObjectURL(blob);\r\n            a.download = fileName;\r\n            a.target = '_blank';\r\n            document.body.appendChild(a);\r\n            a.click();\r\n            document.body.removeChild(a);\r\n        }\r\n    }\r\n    print(id?: number | null, printType?: PrintType) {\r\n        const split = this.url.split('/');\r\n        if (split.length < 2) {\r\n            return;\r\n        }\r\n        const template = split[1];\r\n        let api = AppBaseModule.injector.get<WebApiClient>(WebApiClient as Type<WebApiClient>);\r\n\r\n        let actionName: string;\r\n\r\n        switch (printType) {\r\n            case PrintType.Pdf:\r\n                actionName = 'PrintPdfIdLink';\r\n                break;\r\n\r\n            default:\r\n                actionName = 'ShowIdLink'\r\n                break;\r\n        }\r\n        api.getString(`api/Reports/${actionName}`, { template, id }).subscribe(url => {\r\n            if (url) {\r\n                window.open(url, '_blank');\r\n            }\r\n        });\r\n    }\r\n}\r\n"]}
|
package/fesm2022/zek.mjs
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
2
|
import { Injectable, InjectionToken, Inject, NgModule, Directive, Input, EventEmitter, Output, ViewChild, Pipe, Component, forwardRef, ViewEncapsulation, ChangeDetectionStrategy, Optional, HostListener } from '@angular/core';
|
|
3
|
-
import * as i1 from '@angular/router';
|
|
4
|
-
import { NavigationStart, PRIMARY_OUTLET, RouterModule } from '@angular/router';
|
|
5
3
|
import { BehaviorSubject, Subject, catchError, of, firstValueFrom, ReplaySubject, timer } from 'rxjs';
|
|
4
|
+
import * as i1 from '@angular/router';
|
|
5
|
+
import { NavigationStart, RouterModule } from '@angular/router';
|
|
6
6
|
import * as i1$1 from '@ngx-translate/core';
|
|
7
7
|
import { TranslateModule } from '@ngx-translate/core';
|
|
8
8
|
import * as i1$2 from '@angular/common/http';
|
|
@@ -1838,9 +1838,10 @@ class BaseComponent extends CoreComponent {
|
|
|
1838
1838
|
navigateReturnUrl() {
|
|
1839
1839
|
const returnUrl = this.getQueryParam('returnUrl') || this.getParam('returnUrl');
|
|
1840
1840
|
if (returnUrl) {
|
|
1841
|
-
|
|
1842
|
-
|
|
1843
|
-
|
|
1841
|
+
this.router.navigateByUrl(returnUrl);
|
|
1842
|
+
// let urlTree = this.router.parseUrl(returnUrl);
|
|
1843
|
+
// const urlWithoutParams = urlTree.root.children[PRIMARY_OUTLET].segments.map(it => it.path).join('/')
|
|
1844
|
+
// this.router.navigate([urlWithoutParams, urlTree.root.children[PRIMARY_OUTLET].segments[urlTree.root.children[PRIMARY_OUTLET].segments.length - 1].parameters]);
|
|
1844
1845
|
return;
|
|
1845
1846
|
}
|
|
1846
1847
|
this.router.navigate([this.router.url.substring(0, this.router.url.lastIndexOf('/'))]);
|