tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

UI: liquid level widget basic settings icon validaton fix

pull/9456/head
Dmitriymush 3 years ago
parent
4f3b690f36
commit
354c131eb1
1 changed files with 15 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts

28
ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.ts
View File

@ -319,6 +319,7 @@ export class LiquidLevelCardBasicConfigComponent extends BasicWidgetConfigCompon
const datasourceUnits: string = this.levelCardWidgetConfigForm.get('datasourceUnits').value; const datasourceUnits: string = this.levelCardWidgetConfigForm.get('datasourceUnits').value;
const layout: LevelCardLayout = this.levelCardWidgetConfigForm.get('layout').value; const layout: LevelCardLayout = this.levelCardWidgetConfigForm.get('layout').value;
const showTitleIcon: AbstractControl<boolean> = this.levelCardWidgetConfigForm.get('showTitleIcon'); const showTitleIcon: AbstractControl<boolean> = this.levelCardWidgetConfigForm.get('showTitleIcon');
const showTitle: boolean = this.levelCardWidgetConfigForm.get('showTitle').value;
const volumeSource: AbstractControl<LevelSelectOptions> = this.levelCardWidgetConfigForm.get('volumeSource'); const volumeSource: AbstractControl<LevelSelectOptions> = this.levelCardWidgetConfigForm.get('volumeSource');
const units: AbstractControl<string> = this.levelCardWidgetConfigForm.get('units'); const units: AbstractControl<string> = this.levelCardWidgetConfigForm.get('units');
const tooltipUnits: AbstractControl<string> = this.levelCardWidgetConfigForm.get('tooltipUnits'); const tooltipUnits: AbstractControl<string> = this.levelCardWidgetConfigForm.get('tooltipUnits');
@ -374,8 +375,7 @@ export class LiquidLevelCardBasicConfigComponent extends BasicWidgetConfigCompon
} }
} }
if (trigger === 'showTitle') { if (trigger === 'showTitle' || !trigger) {
const showTitle: boolean = this.levelCardWidgetConfigForm.get('showTitle').value;
if (showTitle) { if (showTitle) {
this.levelCardWidgetConfigForm.get('title').enable({emitEvent: false}); this.levelCardWidgetConfigForm.get('title').enable({emitEvent: false});
this.levelCardWidgetConfigForm.get('titleFont').enable({emitEvent: false}); this.levelCardWidgetConfigForm.get('titleFont').enable({emitEvent: false});
@ -390,18 +390,20 @@ export class LiquidLevelCardBasicConfigComponent extends BasicWidgetConfigCompon
emitEventFields.push('title', 'titleFont', 'titleColor', 'showTitleIcon'); emitEventFields.push('title', 'titleFont', 'titleColor', 'showTitleIcon');
} }
if (showTitleIcon?.value) { if (trigger === 'showTitleIcon' || !trigger) {
this.levelCardWidgetConfigForm.get('titleIcon').enable({emitEvent: false}); if (showTitleIcon?.value && !showTitleIcon.disabled && showTitle) {
this.levelCardWidgetConfigForm.get('iconColor').enable({emitEvent: false}); this.levelCardWidgetConfigForm.get('titleIcon').enable({emitEvent: false});
this.levelCardWidgetConfigForm.get('iconSize').enable({emitEvent: false}); this.levelCardWidgetConfigForm.get('iconColor').enable({emitEvent: false});
this.levelCardWidgetConfigForm.get('iconSizeUnit').enable({emitEvent: false}); this.levelCardWidgetConfigForm.get('iconSize').enable({emitEvent: false});
} else { this.levelCardWidgetConfigForm.get('iconSizeUnit').enable({emitEvent: false});
this.levelCardWidgetConfigForm.get('titleIcon').disable({emitEvent: false}); } else {
this.levelCardWidgetConfigForm.get('iconColor').disable({emitEvent: false}); this.levelCardWidgetConfigForm.get('titleIcon').disable({emitEvent: false});
this.levelCardWidgetConfigForm.get('iconSize').disable({emitEvent: false}); this.levelCardWidgetConfigForm.get('iconColor').disable({emitEvent: false});
this.levelCardWidgetConfigForm.get('iconSizeUnit').disable({emitEvent: false}); this.levelCardWidgetConfigForm.get('iconSize').disable({emitEvent: false});
this.levelCardWidgetConfigForm.get('iconSizeUnit').disable({emitEvent: false});
}
emitEventFields.push('titleIcon', 'iconColor', 'iconSize', 'iconSizeUnit');
} }
emitEventFields.push('titleIcon', 'iconColor', 'iconSize', 'iconSizeUnit');
if (trigger === 'showBackgroundOverlay') { if (trigger === 'showBackgroundOverlay') {
const showBackgroundOverlay: boolean = this.levelCardWidgetConfigForm.get('showBackgroundOverlay').value; const showBackgroundOverlay: boolean = this.levelCardWidgetConfigForm.get('showBackgroundOverlay').value;

Write Preview
Loading…
Cancel
Save