Skip to content

增加了变量查询功能 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

增加了变量查询功能 #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75afd75
Update datasource.js
lostin21st Sep 12, 2019
8525dc8
增加变量替换功能
lostin21st Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/datasource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,12 @@ export class GenericDatasource {
var dimensionJson = target.dimensions;
var i = dimensionJson.length;
while (i--) {
dimensionArray.push({"instanceId":dimensionJson[i]});
//判断是否使用了变量，如果使用了变量将其替换为所选值
if (dimensionJson[i][0] === '$') {
dimensionArray.push({ "instanceId": this.templateSrv.replace(dimensionJson[i]) });
} else {
dimensionArray.push({ "instanceId": dimensionJson[i] });
}
}
dimensions ='';
dimensions =dimensions.concat(JSON.stringify(dimensionArray));
Expand Down Expand Up @@ -511,4 +516,4 @@ export class GenericDatasource {
} // 不为空
return false; // 为空
}
}
}