edit
This commit is contained in:
@ -30,7 +30,7 @@ module.exports = {
|
|||||||
// },
|
// },
|
||||||
'//api': {
|
'//api': {
|
||||||
target: {
|
target: {
|
||||||
host: 'tms-api-dev.eascs.com',
|
host: 'tms-api-test.eascs.com',
|
||||||
protocol: 'https:',
|
protocol: 'https:',
|
||||||
port: 443
|
port: 443
|
||||||
},
|
},
|
||||||
|
|||||||
@ -42,6 +42,7 @@ const APPINIT_PROVIDES = [
|
|||||||
multi: true
|
multi: true
|
||||||
},
|
},
|
||||||
{ provide: DEFAULT_CURRENCY_CODE, useValue: '¥' },
|
{ provide: DEFAULT_CURRENCY_CODE, useValue: '¥' },
|
||||||
|
{ provide: RouteReuseStrategy, useClass: ReuseTabStrategy, deps: [ReuseTabService] },
|
||||||
AuthGuard
|
AuthGuard
|
||||||
];
|
];
|
||||||
// #endregion
|
// #endregion
|
||||||
@ -55,6 +56,8 @@ import { SharedModule } from './shared/shared.module';
|
|||||||
import { STWidgetModule } from './shared/widget/st-widget.module';
|
import { STWidgetModule } from './shared/widget/st-widget.module';
|
||||||
import { registerLocaleData } from '@angular/common';
|
import { registerLocaleData } from '@angular/common';
|
||||||
import { AuthGuard } from './core/guards/auth.guard';
|
import { AuthGuard } from './core/guards/auth.guard';
|
||||||
|
import { RouteReuseStrategy } from '@angular/router';
|
||||||
|
import { ReuseTabService, ReuseTabStrategy } from '@delon/abc/reuse-tab';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [AppComponent],
|
declarations: [AppComponent],
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template #subLink let-i>
|
<ng-template #subLink let-i>
|
||||||
<a *ngIf="!i.externalLink" [routerLink]="i.link" [target]="i.target">{{ i.text }} </a>
|
<a *ngIf="!i.externalLink" (click)="routeTo(i.link)" [target]="i.target">{{ i.text }} </a>
|
||||||
<a *ngIf="i.externalLink" [attr.href]="i.externalLink" [attr.target]="i.target">{{ i.text }} </a>
|
<a *ngIf="i.externalLink" [attr.href]="i.externalLink" [attr.target]="i.target">{{ i.text }} </a>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ul *ngIf="menus" nz-menu [nzMode]="mode" [nzTheme]="pro.theme"
|
<ul *ngIf="menus" nz-menu [nzMode]="mode" [nzTheme]="pro.theme"
|
||||||
@ -22,7 +22,7 @@
|
|||||||
<ng-container *ngFor="let l1 of menus">
|
<ng-container *ngFor="let l1 of menus">
|
||||||
<li *ngIf="l1.children!.length === 0" nz-menu-item class="alain-pro__menu-item"
|
<li *ngIf="l1.children!.length === 0" nz-menu-item class="alain-pro__menu-item"
|
||||||
[class.alain-pro__menu-item--disabled]="l1.disabled" [nzSelected]="l1._selected" [nzDisabled]="l1.disabled">
|
[class.alain-pro__menu-item--disabled]="l1.disabled" [nzSelected]="l1._selected" [nzDisabled]="l1.disabled">
|
||||||
<a *ngIf="!l1.externalLink" [routerLink]="l1.link" (click)="closeCollapsed()" class="alain-pro__menu-title">
|
<a *ngIf="!l1.externalLink" (click)="routeTo(l1.link);closeCollapsed()" class="alain-pro__menu-title">
|
||||||
<ng-template [ngTemplateOutlet]="mainLink" [ngTemplateOutletContext]="{ $implicit: l1 }"></ng-template>
|
<ng-template [ngTemplateOutlet]="mainLink" [ngTemplateOutletContext]="{ $implicit: l1 }"></ng-template>
|
||||||
</a>
|
</a>
|
||||||
<a *ngIf="l1.externalLink" [attr.href]="l1.externalLink" [attr.target]="l1.target" (click)="closeCollapsed()"
|
<a *ngIf="l1.externalLink" [attr.href]="l1.externalLink" [attr.target]="l1.target" (click)="closeCollapsed()"
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
|
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
|
||||||
import { NavigationEnd, Router } from '@angular/router';
|
import { NavigationEnd, Router } from '@angular/router';
|
||||||
|
import { ReuseTabService } from '@delon/abc/reuse-tab';
|
||||||
import { MenuService } from '@delon/theme';
|
import { MenuService } from '@delon/theme';
|
||||||
import { InputBoolean } from '@delon/util';
|
import { InputBoolean } from '@delon/util';
|
||||||
import { NzMenuModeType } from 'ng-zorro-antd/menu';
|
import { NzMenuModeType } from 'ng-zorro-antd/menu';
|
||||||
@ -25,7 +26,13 @@ export class LayoutProMenuComponent implements OnInit, OnDestroy {
|
|||||||
@Input() @InputBoolean() disabledAcl = false;
|
@Input() @InputBoolean() disabledAcl = false;
|
||||||
@Input() mode: NzMenuModeType = 'inline';
|
@Input() mode: NzMenuModeType = 'inline';
|
||||||
|
|
||||||
constructor(private menuSrv: MenuService, private router: Router, public pro: BrandService, private cdr: ChangeDetectorRef) {}
|
constructor(
|
||||||
|
private menuSrv: MenuService,
|
||||||
|
private router: Router,
|
||||||
|
public pro: BrandService,
|
||||||
|
private cdr: ChangeDetectorRef,
|
||||||
|
private reuseService: ReuseTabService
|
||||||
|
) {}
|
||||||
|
|
||||||
private cd(): void {
|
private cd(): void {
|
||||||
this.cdr.markForCheck();
|
this.cdr.markForCheck();
|
||||||
@ -121,4 +128,11 @@ export class LayoutProMenuComponent implements OnInit, OnDestroy {
|
|||||||
unsubscribe$.next();
|
unsubscribe$.next();
|
||||||
unsubscribe$.complete();
|
unsubscribe$.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
routeTo(link: string | undefined) {
|
||||||
|
if (link) {
|
||||||
|
this.reuseService.clear();
|
||||||
|
this.router.navigate([link]);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -144,7 +144,6 @@ export class MenuModalComponent implements OnInit {
|
|||||||
i18n: null,
|
i18n: null,
|
||||||
// i18n: this.sf?.value.keyCode,
|
// i18n: this.sf?.value.keyCode,
|
||||||
menuType: 0,
|
menuType: 0,
|
||||||
reuse: 0,
|
|
||||||
shortcut: 0,
|
shortcut: 0,
|
||||||
hideInBreadcrumb: 0,
|
hideInBreadcrumb: 0,
|
||||||
functionType: 0,
|
functionType: 0,
|
||||||
|
|||||||
@ -41,9 +41,6 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
|
|||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.initSF();
|
this.initSF();
|
||||||
this.initST();
|
this.initST();
|
||||||
this.ar.url.subscribe(params => {
|
|
||||||
this.st?.load(1);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
search() {
|
search() {
|
||||||
|
|||||||
Reference in New Issue
Block a user