Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-04-28 13:43:37 +08:00
parent ab323d0f8c 76caf33fcd
commit 22ba6e11b4
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
View File

@ -8,15 +8,10 @@
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<app-dynamic-setting-h5 <app-dynamic-setting-h5 [tabs]="tabs" [configList]="configList" [selectedTab]="selectedTab"
[tabs]="tabs" (selectedEvent)="getConfigList($event)" (saveEvent)="saveAction($event)" [labelWidth]="labelWidth"
[configList]="configList" [isCanSave]="isCanSave">
[selectedTab]="selectedTab"
(selectedEvent)="getConfigList($event)"
(saveEvent)="saveAction($event)"
[labelWidth]="labelWidth"
>
<custom-element> <custom-element>
<app-parterl-config [configList]="configList"></app-parterl-config> <app-parterl-config [configList]="configList"></app-parterl-config>
</custom-element> </custom-element>
</app-dynamic-setting-h5> </app-dynamic-setting-h5>

7
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts
View File

@ -9,8 +9,8 @@
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ACLService } from '@delon/acl';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { dateTimePickerUtil } from '@delon/util';
import { SystemService } from '../../services/system.service'; import { SystemService } from '../../services/system.service';
const NOJSONTYPE = new Set([8, 12, 13]); const NOJSONTYPE = new Set([8, 12, 13]);
@Component({ @Component({
@ -23,7 +23,10 @@ export class BasicSettingComponent implements OnInit {
selectedTab: any = null; selectedTab: any = null;
labelWidth = 250; labelWidth = 250;
configList: any = []; configList: any = [];
constructor(public service: SystemService) {} isCanSave = false;
constructor(public service: SystemService, private acl: ACLService) {
this.isCanSave = !!acl.data.abilities?.find(a => a === 'SYSTEM-BASIC_SETTING-save');
}
ngOnInit() { ngOnInit() {
this.getTypeList(); this.getTypeList();

2
src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
View File

@ -156,7 +156,7 @@
<div class="mb-md save-btn"> <div class="mb-md save-btn">
<button class="ml-lg" nz-button nzSize="large" nzType="primary" (click)="saveAction()" <button class="ml-lg" nz-button nzSize="large" nzType="primary" (click)="saveAction()"
*ngIf="selectedTab?.configKey!=='freight' && labelWidth!==0">保存</button> *ngIf="selectedTab?.configKey!=='freight' && labelWidth!==0 && isCanSave">保存</button>
</div> </div>
</div> </div>
</div> </div>

2
src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
View File

@ -28,6 +28,8 @@ export class DynamicSettingH5Component implements OnInit {
@Input() @Input()
configList: any = []; configList: any = [];
@Input()
isCanSave = true;
@Output() @Output()
selectedEvent = new EventEmitter<any>(); selectedEvent = new EventEmitter<any>();
@Output() @Output()