dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12336 from vvlladd28/bug/scada-symbol/merge-setting-array

Browse Source 
Fixed incorrect merging of default SCADA symbol settings with user-defined settings
This commit is contained in:
Igor Kulikov 2024-12-27 12:11:19 +02:00 committed by GitHub
commit 032de76596
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-ngx/src/app/modules/home/components/widget/lib/scada/scada-symbol.models.ts
View File

@ -52,6 +52,7 @@ import {
isUndefined,
isUndefinedOrNull,
mergeDeep,
mergeDeepIgnoreArray,
parseFunction
} from '@core/utils';
import { BehaviorSubject, forkJoin, Observable, Observer, of, Subject } from 'rxjs';
@ -564,7 +565,7 @@ export class ScadaSymbolObject {
const doc: XMLDocument = new DOMParser().parseFromString(this.svgContent, 'image/svg+xml');
this.metadata = parseScadaSymbolMetadataFromDom(doc);
const defaults = defaultScadaSymbolObjectSettings(this.metadata);
this.settings = mergeDeep<ScadaSymbolObjectSettings>({} as ScadaSymbolObjectSettings,
this.settings = mergeDeepIgnoreArray<ScadaSymbolObjectSettings>({} as ScadaSymbolObjectSettings,
defaults, this.inputSettings || {} as ScadaSymbolObjectSettings);
this.prepareMetadata();
this.prepareSvgShape(doc);

4
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/scada/scada-symbol-object-settings.component.ts
View File

@ -48,7 +48,7 @@ import {
} from '@home/components/widget/lib/scada/scada-symbol.models';
import { IAliasController } from '@core/api/widget-api.models';
import { TargetDevice, widgetType } from '@shared/models/widget.models';
import { isDefinedAndNotNull, mergeDeep } from '@core/utils';
import { isDefinedAndNotNull, mergeDeepIgnoreArray } from '@core/utils';
import {
ScadaSymbolBehaviorGroup,
ScadaSymbolPropertyRow,
@ -288,7 +288,7 @@ export class ScadaSymbolObjectSettingsComponent implements OnInit, OnChanges, Co
private setupValue() {
if (this.metadata) {
const defaults = defaultScadaSymbolObjectSettings(this.metadata);
this.modelValue = mergeDeep<ScadaSymbolObjectSettings>(defaults, this.modelValue);
this.modelValue = mergeDeepIgnoreArray<ScadaSymbolObjectSettings>(defaults, this.modelValue);
this.scadaSymbolObjectSettingsFormGroup.patchValue(
this.modelValue, {emitEvent: false}
);