mirror of
https://github.com/dataease/dataease.git
synced 2025-02-24 19:42:56 +08:00
refactor(数据大屏): 调整屏幕展示模式转变导致部分大屏超出边框问题
This commit is contained in:
parent
4c4796a675
commit
1b2a2c24d5
@ -126,6 +126,9 @@ const baseComponentData = computed(() =>
|
|||||||
)
|
)
|
||||||
const canvasStyle = computed(() => {
|
const canvasStyle = computed(() => {
|
||||||
let style = {}
|
let style = {}
|
||||||
|
if (isMainCanvas(canvasId.value) && !isDashboard()) {
|
||||||
|
style['overflowY'] = 'hidden !important'
|
||||||
|
}
|
||||||
if (canvasStyleData.value && canvasStyleData.value.width && isMainCanvas(canvasId.value)) {
|
if (canvasStyleData.value && canvasStyleData.value.width && isMainCanvas(canvasId.value)) {
|
||||||
style = {
|
style = {
|
||||||
...getCanvasStyle(canvasStyleData.value),
|
...getCanvasStyle(canvasStyleData.value),
|
||||||
@ -236,30 +239,10 @@ const resetLayout = () => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
const restorePre = () => {
|
|
||||||
if (previewCanvas.value) {
|
|
||||||
//div容器获取tableBox.value.clientWidth
|
|
||||||
let canvasWidth = previewCanvas.value.clientWidth
|
|
||||||
let canvasHeight = previewCanvas.value.clientHeight
|
|
||||||
scaleWidthPoint.value = (canvasWidth * 100) / canvasStyleData.value.width
|
|
||||||
scaleHeightPoint.value = (canvasHeight * 100) / canvasStyleData.value.height
|
|
||||||
scaleMin.value = isDashboard()
|
|
||||||
? Math.floor(Math.min(scaleWidthPoint.value, scaleHeightPoint.value))
|
|
||||||
: scaleWidthPoint.value
|
|
||||||
if (dashboardActive.value) {
|
|
||||||
cellWidth.value = canvasWidth / pcMatrixCount.value.x
|
|
||||||
cellHeight.value = canvasHeight / pcMatrixCount.value.y
|
|
||||||
scaleMin.value = isMainCanvas(canvasId.value) ? scaleMin.value * 1.2 : outerScale.value * 100
|
|
||||||
}
|
|
||||||
renderReady.value = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
const restore = () => {
|
const restore = () => {
|
||||||
if (isReport.value) {
|
if (isReport.value) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
restorePre()
|
|
||||||
resetLayout()
|
resetLayout()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -403,7 +386,9 @@ const filterBtnShow = computed(
|
|||||||
const datasetParamsInit = item => {
|
const datasetParamsInit = item => {
|
||||||
customDatasetParamsRef.value?.optInit(item)
|
customDatasetParamsRef.value?.optInit(item)
|
||||||
}
|
}
|
||||||
|
const dataVPreview = computed(
|
||||||
|
() => dvInfo.value.type === 'dataV' && canvasId.value === 'canvas-main'
|
||||||
|
)
|
||||||
defineExpose({
|
defineExpose({
|
||||||
restore
|
restore
|
||||||
})
|
})
|
||||||
@ -414,7 +399,7 @@ defineExpose({
|
|||||||
:id="domId"
|
:id="domId"
|
||||||
class="canvas-container"
|
class="canvas-container"
|
||||||
:style="canvasStyle"
|
:style="canvasStyle"
|
||||||
:class="{ 'de-download-custom': downloadStatus }"
|
:class="{ 'de-download-custom': downloadStatus, 'datav-preview': dataVPreview }"
|
||||||
ref="previewCanvas"
|
ref="previewCanvas"
|
||||||
@mousedown="handleMouseDown"
|
@mousedown="handleMouseDown"
|
||||||
>
|
>
|
||||||
@ -487,4 +472,8 @@ defineExpose({
|
|||||||
.fix-button {
|
.fix-button {
|
||||||
position: fixed !important;
|
position: fixed !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.datav-preview {
|
||||||
|
overflow-y: hidden !important;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
Loading…
Reference in New Issue
Block a user