IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Graph: Preseve existing data links in field config when loading dashboard (#27295)

Browse Source 
* Graph: Preseve existing data links in field config

* ts fix
This commit is contained in:
Torkel Ödegaard
2020-08-31 17:53:21 +02:00
committed by GitHub
parent 06323b8e52
commit 4b8f4df18d
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/state/PanelModel.ts
View File

@@ -203,6 +203,7 @@ export class PanelModel implements DataConfigSource {
getOptions() {
return this.options;
}
getFieldConfig() {
return this.fieldConfig;
}
@@ -309,6 +310,7 @@ export class PanelModel implements DataConfigSource {
if (plugin.angularConfigCtrl) {
return;
}
this.options = _.mergeWith({}, plugin.defaults, this.options || {}, (objValue: any, srcValue: any): any => {
if (_.isArray(srcValue)) {
return srcValue;