|
|
@ -21,12 +21,13 @@ import { |
|
|
Input, |
|
|
Input, |
|
|
OnChanges, |
|
|
OnChanges, |
|
|
OnInit, |
|
|
OnInit, |
|
|
Output, |
|
|
Output, Renderer2, |
|
|
SimpleChanges, |
|
|
SimpleChanges, |
|
|
ViewChild, |
|
|
ViewChild, ViewContainerRef, |
|
|
ViewEncapsulation |
|
|
ViewEncapsulation |
|
|
} from '@angular/core'; |
|
|
} from '@angular/core'; |
|
|
import { |
|
|
import { |
|
|
|
|
|
AbstractControl, |
|
|
ControlValueAccessor, |
|
|
ControlValueAccessor, |
|
|
NG_VALIDATORS, |
|
|
NG_VALIDATORS, |
|
|
NG_VALUE_ACCESSOR, |
|
|
NG_VALUE_ACCESSOR, |
|
|
@ -47,6 +48,15 @@ import { |
|
|
scadaSymbolElementStateRenderHighlightRules, |
|
|
scadaSymbolElementStateRenderHighlightRules, |
|
|
scadaSymbolElementStateRenderPropertiesHighlightRules |
|
|
scadaSymbolElementStateRenderPropertiesHighlightRules |
|
|
} from '@home/pages/scada-symbol/scada-symbol.models'; |
|
|
} from '@home/pages/scada-symbol/scada-symbol.models'; |
|
|
|
|
|
import { MatButton } from '@angular/material/button'; |
|
|
|
|
|
import { TbPopoverService } from '@shared/components/popover.service'; |
|
|
|
|
|
import { deepClone } from '@core/utils'; |
|
|
|
|
|
import { |
|
|
|
|
|
ScadaSymbolBehaviorPanelComponent |
|
|
|
|
|
} from '@home/pages/scada-symbol/metadata-components/scada-symbol-behavior-panel.component'; |
|
|
|
|
|
import { |
|
|
|
|
|
ScadaSymbolMetadataTagFunctionPanelComponent |
|
|
|
|
|
} from '@home/pages/scada-symbol/metadata-components/scada-symbol-metadata-tag-function-panel.component'; |
|
|
|
|
|
|
|
|
@Component({ |
|
|
@Component({ |
|
|
selector: 'tb-scada-symbol-metadata-tag', |
|
|
selector: 'tb-scada-symbol-metadata-tag', |
|
|
@ -66,83 +76,41 @@ import { |
|
|
], |
|
|
], |
|
|
encapsulation: ViewEncapsulation.None |
|
|
encapsulation: ViewEncapsulation.None |
|
|
}) |
|
|
}) |
|
|
export class ScadaSymbolMetadataTagComponent implements ControlValueAccessor, OnInit, OnChanges, Validator { |
|
|
export class ScadaSymbolMetadataTagComponent implements ControlValueAccessor, OnInit, Validator { |
|
|
|
|
|
|
|
|
@ViewChild('tagSelect') |
|
|
|
|
|
tagSelect: MatSelect; |
|
|
|
|
|
|
|
|
|
|
|
@ViewChild('expansionPanel') |
|
|
|
|
|
expansionPanel: MatExpansionPanel; |
|
|
|
|
|
|
|
|
|
|
|
@ViewChild('renderFunctionExpansionPanel') |
|
|
@ViewChild('editStateRenderFunctionButton') |
|
|
renderFunctionExpansionPanel: MatExpansionPanel; |
|
|
editStateRenderFunctionButton: MatButton; |
|
|
|
|
|
|
|
|
@ViewChild('clickActionExpansionPanel') |
|
|
@ViewChild('editClickActionButton') |
|
|
clickActionExpansionPanel: MatExpansionPanel; |
|
|
editClickActionButton: MatButton; |
|
|
|
|
|
|
|
|
@ViewChild('stateRenderFunction') |
|
|
|
|
|
stateRenderFunction: JsFuncComponent; |
|
|
|
|
|
|
|
|
|
|
|
@ViewChild('clickAction') |
|
|
|
|
|
clickAction: JsFuncComponent; |
|
|
|
|
|
|
|
|
|
|
|
@Input() |
|
|
@Input() |
|
|
disabled: boolean; |
|
|
disabled: boolean; |
|
|
|
|
|
|
|
|
@Input() |
|
|
|
|
|
tags: string[]; |
|
|
|
|
|
|
|
|
|
|
|
@Input() |
|
|
@Input() |
|
|
elementStateRenderFunctionCompleter: TbEditorCompleter; |
|
|
elementStateRenderFunctionCompleter: TbEditorCompleter; |
|
|
|
|
|
|
|
|
@Input() |
|
|
@Input() |
|
|
clickActionFunctionCompleter: TbEditorCompleter; |
|
|
clickActionFunctionCompleter: TbEditorCompleter; |
|
|
|
|
|
|
|
|
@Output() |
|
|
|
|
|
tagRemoved = new EventEmitter(); |
|
|
|
|
|
|
|
|
|
|
|
availableTags: string[]; |
|
|
|
|
|
|
|
|
|
|
|
tagFormGroup: UntypedFormGroup; |
|
|
tagFormGroup: UntypedFormGroup; |
|
|
|
|
|
|
|
|
modelValue: IotSvgTag; |
|
|
modelValue: IotSvgTag; |
|
|
|
|
|
|
|
|
scadaSymbolElementStateRenderHighlightRules = scadaSymbolElementStateRenderHighlightRules; |
|
|
|
|
|
scadaSymbolElementStateRenderPropertiesHighlightRules = scadaSymbolElementStateRenderPropertiesHighlightRules; |
|
|
|
|
|
|
|
|
|
|
|
scadaSymbolClickActionHighlightRules = scadaSymbolClickActionHighlightRules; |
|
|
|
|
|
scadaSymbolClickActionPropertiesHighlightRules = scadaSymbolClickActionPropertiesHighlightRules; |
|
|
|
|
|
|
|
|
|
|
|
private propagateChange = (_val: any) => {}; |
|
|
private propagateChange = (_val: any) => {}; |
|
|
|
|
|
|
|
|
constructor(private fb: UntypedFormBuilder) { |
|
|
constructor(private fb: UntypedFormBuilder, |
|
|
|
|
|
private popoverService: TbPopoverService, |
|
|
|
|
|
private renderer: Renderer2, |
|
|
|
|
|
private viewContainerRef: ViewContainerRef) { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ngOnInit() { |
|
|
ngOnInit() { |
|
|
this.availableTags = (this.tags || []).concat(); |
|
|
|
|
|
this.tagFormGroup = this.fb.group({ |
|
|
this.tagFormGroup = this.fb.group({ |
|
|
tag: [null, [Validators.required]], |
|
|
tag: [null, []], |
|
|
stateRenderFunction: [null, []], |
|
|
stateRenderFunction: [null, []], |
|
|
clickAction: [null, []] |
|
|
clickAction: [null, []] |
|
|
}); |
|
|
}); |
|
|
this.tagFormGroup.valueChanges.subscribe( |
|
|
|
|
|
() => this.updateModel() |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ngOnChanges(changes: SimpleChanges): void { |
|
|
|
|
|
for (const propName of Object.keys(changes)) { |
|
|
|
|
|
const change = changes[propName]; |
|
|
|
|
|
if (!change.firstChange && change.currentValue !== change.previousValue) { |
|
|
|
|
|
if (['tags'].includes(propName)) { |
|
|
|
|
|
this.availableTags = (this.tags || []).concat(); |
|
|
|
|
|
if (this.modelValue?.tag && !this.availableTags.includes(this.modelValue?.tag)) { |
|
|
|
|
|
this.availableTags.push(this.modelValue?.tag); |
|
|
|
|
|
this.availableTags.sort(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
registerOnChange(fn: any): void { |
|
|
registerOnChange(fn: any): void { |
|
|
@ -163,9 +131,6 @@ export class ScadaSymbolMetadataTagComponent implements ControlValueAccessor, On |
|
|
|
|
|
|
|
|
writeValue(value: IotSvgTag): void { |
|
|
writeValue(value: IotSvgTag): void { |
|
|
this.modelValue = value; |
|
|
this.modelValue = value; |
|
|
if (value?.tag && !(this.tags || []).includes(value?.tag)) { |
|
|
|
|
|
this.availableTags = (this.tags || []).concat(value.tag).sort(); |
|
|
|
|
|
} |
|
|
|
|
|
const clickAction = value?.actions && value?.actions.click ? value.actions.click.actionFunction : null; |
|
|
const clickAction = value?.actions && value?.actions.click ? value.actions.click.actionFunction : null; |
|
|
this.tagFormGroup.patchValue( |
|
|
this.tagFormGroup.patchValue( |
|
|
{ |
|
|
{ |
|
|
@ -186,27 +151,61 @@ export class ScadaSymbolMetadataTagComponent implements ControlValueAccessor, On |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
editTagStateRenderFunction(): void { |
|
|
editTagStateRenderFunction(): void { |
|
|
this.openPanelWithCallback(this.expansionPanel, () => { |
|
|
this.openTagFunction('renderFunction', this.editStateRenderFunctionButton); |
|
|
|
|
|
/*this.openPanelWithCallback(this.expansionPanel, () => { |
|
|
this.openPanelWithCallback(this.renderFunctionExpansionPanel, () => { |
|
|
this.openPanelWithCallback(this.renderFunctionExpansionPanel, () => { |
|
|
this.stateRenderFunction.focus(); |
|
|
this.stateRenderFunction.focus(); |
|
|
}); |
|
|
}); |
|
|
}); |
|
|
});*/ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
editClickAction(): void { |
|
|
editClickAction(): void { |
|
|
this.openPanelWithCallback(this.expansionPanel, () => { |
|
|
this.openTagFunction('clickAction', this.editClickActionButton); |
|
|
|
|
|
/*this.openPanelWithCallback(this.expansionPanel, () => { |
|
|
this.openPanelWithCallback(this.clickActionExpansionPanel, () => { |
|
|
this.openPanelWithCallback(this.clickActionExpansionPanel, () => { |
|
|
this.clickAction.focus(); |
|
|
this.clickAction.focus(); |
|
|
}); |
|
|
}); |
|
|
}); |
|
|
});*/ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
focus() { |
|
|
private openTagFunction(tagFunctionType: 'renderFunction' | 'clickAction', |
|
|
this.tagSelect._elementRef.nativeElement.scrollIntoView(); |
|
|
button: MatButton) { |
|
|
this.tagSelect.focus(); |
|
|
const trigger = button._elementRef.nativeElement; |
|
|
|
|
|
trigger.scrollIntoView(); |
|
|
|
|
|
if (this.popoverService.hasPopover(trigger)) { |
|
|
|
|
|
this.popoverService.hidePopover(trigger); |
|
|
|
|
|
} else { |
|
|
|
|
|
let tagFunctionControl: AbstractControl; |
|
|
|
|
|
let completer: TbEditorCompleter; |
|
|
|
|
|
if (tagFunctionType === 'renderFunction') { |
|
|
|
|
|
tagFunctionControl = this.tagFormGroup.get('stateRenderFunction'); |
|
|
|
|
|
completer = this.elementStateRenderFunctionCompleter; |
|
|
|
|
|
} else if (tagFunctionType === 'clickAction') { |
|
|
|
|
|
tagFunctionControl = this.tagFormGroup.get('clickAction'); |
|
|
|
|
|
completer = this.clickActionFunctionCompleter; |
|
|
|
|
|
} |
|
|
|
|
|
const ctx: any = { |
|
|
|
|
|
tagFunction: tagFunctionControl.value, |
|
|
|
|
|
tagFunctionType, |
|
|
|
|
|
tag: this.tagFormGroup.get('tag').value, |
|
|
|
|
|
completer |
|
|
|
|
|
}; |
|
|
|
|
|
const scadaSymbolTagFunctionPanelPopover = this.popoverService.displayPopover(trigger, this.renderer, |
|
|
|
|
|
this.viewContainerRef, ScadaSymbolMetadataTagFunctionPanelComponent, |
|
|
|
|
|
['leftOnly', 'leftTopOnly', 'leftBottomOnly'], true, null, |
|
|
|
|
|
ctx, |
|
|
|
|
|
{}, |
|
|
|
|
|
{}, {}, true); |
|
|
|
|
|
scadaSymbolTagFunctionPanelPopover.tbComponentRef.instance.popover = scadaSymbolTagFunctionPanelPopover; |
|
|
|
|
|
scadaSymbolTagFunctionPanelPopover.tbComponentRef.instance.tagFunctionApplied.subscribe((tagFunction) => { |
|
|
|
|
|
scadaSymbolTagFunctionPanelPopover.hide(); |
|
|
|
|
|
tagFunctionControl.patchValue(tagFunction, {emitEvent: false}); |
|
|
|
|
|
this.updateModel(); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private openPanelWithCallback(panel: MatExpansionPanel, callback: () => void) { |
|
|
/* private openPanelWithCallback(panel: MatExpansionPanel, callback: () => void) { |
|
|
if (!panel.expanded) { |
|
|
if (!panel.expanded) { |
|
|
const s = panel.afterExpand.subscribe(() => { |
|
|
const s = panel.afterExpand.subscribe(() => { |
|
|
s.unsubscribe(); |
|
|
s.unsubscribe(); |
|
|
@ -218,13 +217,10 @@ export class ScadaSymbolMetadataTagComponent implements ControlValueAccessor, On |
|
|
} else { |
|
|
} else { |
|
|
callback(); |
|
|
callback(); |
|
|
} |
|
|
} |
|
|
} |
|
|
}*/ |
|
|
|
|
|
|
|
|
private updateModel() { |
|
|
private updateModel() { |
|
|
const value = this.tagFormGroup.value; |
|
|
const value = this.tagFormGroup.value; |
|
|
if (value.tag && !this.modelValue?.tag) { |
|
|
|
|
|
this.expansionPanel.open(); |
|
|
|
|
|
} |
|
|
|
|
|
this.modelValue = { |
|
|
this.modelValue = { |
|
|
tag: value.tag, |
|
|
tag: value.tag, |
|
|
stateRenderFunction: value.stateRenderFunction |
|
|
stateRenderFunction: value.stateRenderFunction |
|
|
|
Igor Kulikov
2 years ago