diff --git a/core/core-frontend/src/components/data-visualization/CanvasAttr.vue b/core/core-frontend/src/components/data-visualization/CanvasAttr.vue index 8fa8f48fb9..b27066d6cd 100644 --- a/core/core-frontend/src/components/data-visualization/CanvasAttr.vue +++ b/core/core-frontend/src/components/data-visualization/CanvasAttr.vue @@ -66,7 +66,7 @@ onMounted(() => { effect="dark" size="middle" :min="600" - :max="100000" + :max="50000" v-model="canvasStyleData.width" @change="onBaseChange" controls-position="right" @@ -79,7 +79,7 @@ onMounted(() => { effect="dark" size="middle" :min="600" - :max="100000" + :max="50000" v-model="canvasStyleData.height" @change="onBaseChange" controls-position="right" diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue index a1423b3cda..6b55cce64d 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue @@ -53,6 +53,11 @@ const props = defineProps({ userId: { type: String, require: false + }, + outerScale: { + type: Number, + required: false, + default: 1 } }) @@ -65,6 +70,7 @@ const { showPosition, previewActive, downloadStatus, + outerScale, userId } = toRefs(props) const domId = 'preview-' + canvasId.value @@ -134,7 +140,9 @@ const restore = () => { if (dashboardActive.value) { cellWidth.value = canvasWidth / pcMatrixCount.value.x cellHeight.value = canvasHeight / pcMatrixCount.value.y - scaleWidth.value = scaleWidth.value * 1.5 + scaleWidth.value = isMainCanvas(canvasId.value) + ? scaleWidth.value * 1.5 + : outerScale.value * 100 } else { changeRefComponentsSizeWithScale( componentData.value, diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue index 093f4b86a0..8bb920aedd 100644 --- a/core/core-frontend/src/custom-component/de-tabs/Component.vue +++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue @@ -70,6 +70,7 @@ :canvas-id="element.id + '--' + tabItem.name" :preview-active="editableTabsValue === tabItem.name" :show-position="showPosition" + :outer-scale="scale" > @@ -150,6 +151,11 @@ const props = defineProps({ type: String, required: false, default: 'canvas' + }, + scale: { + type: Number, + required: false, + default: 1 } }) const { element, isEdit, showPosition, canvasStyleData, canvasViewInfo, dvInfo } = toRefs(props)