diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js index fc4c5b7c69..6ca3a206a6 100644 --- a/frontend/src/api/dataset/dataset.js +++ b/frontend/src/api/dataset/dataset.js @@ -185,7 +185,7 @@ export function multFieldValues(data) { return request({ url: '/dataset/field/multFieldValues', method: 'post', - loading: true, + loading: false, data }) } @@ -241,6 +241,7 @@ export function checkCustomDs() { loading: true }) } + export function exportExcel(data) { return request({ url: '/dataset/taskLog/export', @@ -268,4 +269,5 @@ export function exportDataset(data) { responseType: 'blob' }) } + export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree, checkCustomDs, exportDataset } diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue index 032794c410..1fc60a50ab 100644 --- a/frontend/src/components/deDrag/index.vue +++ b/frontend/src/components/deDrag/index.vue @@ -602,7 +602,7 @@ export default { return 'auto' } } - if (this.element.auxiliaryMatrix) { + if (this.element.auxiliaryMatrix && this.curCanvasScaleSelf) { const height = Math.round(this.height / this.curCanvasScaleSelf.matrixStyleHeight) * this.curCanvasScaleSelf.matrixStyleHeight return (height - this.curGap * 2) + 'px' } else { diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index 8633394a71..95feea34ab 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -202,7 +202,7 @@ export default { }) }, checkSelected(param) { - return (this.linkageActiveParam.name === param.name) && + return (this.linkageActiveParam.name === param.name || (this.linkageActiveParam.name === 'NO_DATA' && !param.name)) && (this.linkageActiveParam.category === param.category) }, preDraw() {