diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue index e6cb00c61d..7b0dfbff02 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -207,11 +207,19 @@ const curComponentId = computed(() => { const { emitter } = useEmitt() const curScale = computed(() => { - return canvasStyleData.value.scale / 100 + if (dashboardActive.value) { + return (canvasStyleData.value.scale * 1.5) / 100 + } else { + return canvasStyleData.value.scale / 100 + } }) const curBaseScale = computed(() => { - return dvMainStore.canvasStyleData.scale / 100 + if (dashboardActive.value) { + return (dvMainStore.canvasStyleData.scale * 1.5) / 100 + } else { + return dvMainStore.canvasStyleData.scale / 100 + } }) const pointShadowShow = computed(() => { @@ -1340,6 +1348,7 @@ defineExpose({ v-else :is="findComponent(item.component)" :id="'component' + item.id" + :scale="curBaseScale" class="component" :is-edit="true" :style="getComponentStyle(item.style)" 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 d7bdb80ca0..684da1ad21 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue @@ -126,6 +126,7 @@ const restore = () => { if (dashboardActive.value) { cellWidth.value = canvasWidth / pcMatrixCount.value.x cellHeight.value = canvasHeight / pcMatrixCount.value.y + scaleWidth.value = scaleWidth.value * 1.5 } else { changeRefComponentsSizeWithScale( componentData.value, diff --git a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue index ffbedeff26..9cf388cb59 100644 --- a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue +++ b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue @@ -2,7 +2,6 @@
{ return editMode.value === 'edit' }) -const autoStyle = computed(() => { - return { - height: 100 / scale.value + '%!important', - width: 100 / scale.value + '%!important', - left: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2 - top: 50 * (1 - 1 / scale.value) + '%', - transform: 'scale(' + scale.value + ')' - } -}) - watch( () => active.value, val => { diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue index 9f13217ba1..52521852cb 100644 --- a/core/core-frontend/src/custom-component/v-query/Component.vue +++ b/core/core-frontend/src/custom-component/v-query/Component.vue @@ -43,9 +43,14 @@ const props = defineProps({ type: String, required: true, default: '' + }, + scale: { + type: Number, + required: false, + default: 1 } }) -const { element, view } = toRefs(props) +const { element, view, scale } = toRefs(props) const { t } = useI18n() const dvMainStore = dvMainStoreWithOut() const { curComponent, canvasViewInfo } = storeToRefs(dvMainStore) @@ -311,17 +316,21 @@ const labelStyle = computed(() => { color: customStyle.labelColor || '#1f2329' } as CSSProperties }) -const opacityStyle = computed(() => { - return element.value?.style?.opacity - ? ({ - opacity: element.value.style.opacity - } as CSSProperties) - : {} +const autoStyle = computed(() => { + return { + position: 'absolute', + height: 100 / scale.value + '%!important', + width: 100 / scale.value + '%!important', + left: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2 + top: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2 + transform: 'scale(' + scale.value + ')', + opacity: element.value?.style?.opacity || 1 + } as CSSProperties })