forked from github/dataease
refacor(视图): 优化视图联动loading显示,空值处理问题
This commit is contained in:
parent
edf2aba91b
commit
b5a3a66362
@ -185,7 +185,7 @@ export function multFieldValues(data) {
|
|||||||
return request({
|
return request({
|
||||||
url: '/dataset/field/multFieldValues',
|
url: '/dataset/field/multFieldValues',
|
||||||
method: 'post',
|
method: 'post',
|
||||||
loading: true,
|
loading: false,
|
||||||
data
|
data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -241,6 +241,7 @@ export function checkCustomDs() {
|
|||||||
loading: true
|
loading: true
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export function exportExcel(data) {
|
export function exportExcel(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/dataset/taskLog/export',
|
url: '/dataset/taskLog/export',
|
||||||
@ -268,4 +269,5 @@ export function exportDataset(data) {
|
|||||||
responseType: 'blob'
|
responseType: 'blob'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree, checkCustomDs, exportDataset }
|
export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree, checkCustomDs, exportDataset }
|
||||||
|
@ -602,7 +602,7 @@ export default {
|
|||||||
return 'auto'
|
return 'auto'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this.element.auxiliaryMatrix) {
|
if (this.element.auxiliaryMatrix && this.curCanvasScaleSelf) {
|
||||||
const height = Math.round(this.height / this.curCanvasScaleSelf.matrixStyleHeight) * this.curCanvasScaleSelf.matrixStyleHeight
|
const height = Math.round(this.height / this.curCanvasScaleSelf.matrixStyleHeight) * this.curCanvasScaleSelf.matrixStyleHeight
|
||||||
return (height - this.curGap * 2) + 'px'
|
return (height - this.curGap * 2) + 'px'
|
||||||
} else {
|
} else {
|
||||||
|
@ -202,7 +202,7 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
checkSelected(param) {
|
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)
|
(this.linkageActiveParam.category === param.category)
|
||||||
},
|
},
|
||||||
preDraw() {
|
preDraw() {
|
||||||
|
Loading…
Reference in New Issue
Block a user