From a16b0b7266cb3b44c47ac8715382215ee641a354 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 28 Apr 2022 13:27:32 +0800 Subject: [PATCH] edit --- .../basic-setting/basic-setting.component.html | 15 +++++---------- .../basic-setting/basic-setting.component.ts | 7 +++++-- .../dynamic-setting-h5.component.html | 2 +- .../dynamic-setting-h5.component.ts | 2 ++ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index c1c43834..a8bfa044 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -8,15 +8,10 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - + - + - + \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts index bc02ace2..d4adde93 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts @@ -9,8 +9,8 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { Component, OnInit, ViewChild } from '@angular/core'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; -import { dateTimePickerUtil } from '@delon/util'; import { SystemService } from '../../services/system.service'; const NOJSONTYPE = new Set([8, 12, 13]); @Component({ @@ -23,7 +23,10 @@ export class BasicSettingComponent implements OnInit { selectedTab: any = null; labelWidth = 250; 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() { this.getTypeList(); diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 0f7e8ee2..3d52444d 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -156,7 +156,7 @@
+ *ngIf="selectedTab?.configKey!=='freight' && labelWidth!==0 && isCanSave">保存
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 544ca3bc..5c3b0261 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -28,6 +28,8 @@ export class DynamicSettingH5Component implements OnInit { @Input() configList: any = []; + @Input() + isCanSave = true; @Output() selectedEvent = new EventEmitter(); @Output()