public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-19 18:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.8' into v1.8

Browse Source
This commit is contained in:
wangjiahao
2022-02-28 11:36:02 +08:00
parent 7aaad18dd9 cc9a961927
commit 5e794da1f5
7 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/api/chart/chart.js
View File

@@ -9,16 +9,6 @@ export function post(url, data) {
})
}
export function ajaxGetData(id, data) {
return request({
url: '/chart/view/getOneWithPermission/' + id,
method: 'post',
loading: true,
hideMsg: true,
data
})
}
export function getChartTree(data) {
return request({
url: 'api',
@@ -60,9 +50,9 @@ export function checkSameDataSet(viewIdSource, viewIdTarget) {
})
}
export function ajaxGetDataOnly(id, data) {
export function ajaxGetDataOnly(id, panelId, data) {
return request({
url: '/chart/view/getData/' + id,
url: '/chart/view/getData/' + id + '/' + panelId,
method: 'post',
loading: true,
hideMsg: true,

4
frontend/src/api/panel/panel.js
View File

@@ -56,9 +56,9 @@ export function groupTree(data, loading = true, timeout = 60000) {
})
}
export function viewData(id, data) {
export function viewData(id, panelId, data) {
return request({
url: '/chart/view/getData/' + id,
url: '/chart/view/getData/' + id + '/' + panelId,
method: 'post',
hideMsg: true,
data