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 9d862c47bd..63063d3e34 100644 --- a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue +++ b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue @@ -6,6 +6,7 @@ @keyup.stop @dblclick="setEdit" @click="onClick" + :style="richTextStyle" > { @@ -561,6 +583,8 @@ const conditionAdaptor = (chart: Chart) => { return res } +const richTextStyle = computed(() => [{ '--de-canvas-scale': props.scale }]) + onMounted(() => { viewInit() }) @@ -583,6 +607,12 @@ defineExpose({ width: 0px !important; height: 0px !important; } + ::v-deep(p) { + zoom: var(--de-canvas-scale); + } + ::v-deep(span) { + zoom: var(--de-canvas-scale); + } } :deep(.ol) { diff --git a/core/core-frontend/src/custom-component/user-view/Component.vue b/core/core-frontend/src/custom-component/user-view/Component.vue index 74187ef5fa..b43a501d71 100644 --- a/core/core-frontend/src/custom-component/user-view/Component.vue +++ b/core/core-frontend/src/custom-component/user-view/Component.vue @@ -58,18 +58,19 @@ const props = defineProps({ const { element, view, active, searchCount, scale } = toRefs(props) const autoStyle = computed(() => { - if (element.value.innerType === 'rich-text') { - 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 + ')' - } as CSSProperties - } else { - return {} - } + return {} + // if (element.value.innerType === 'rich-text') { + // 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 + ') translateZ(0)' + // } as CSSProperties + // } else { + // return {} + // } }) const emits = defineEmits(['onPointClick']) 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 c9adda525f..c95240831a 100644 --- a/core/core-frontend/src/custom-component/v-query/Component.vue +++ b/core/core-frontend/src/custom-component/v-query/Component.vue @@ -557,7 +557,7 @@ const autoStyle = computed(() => { width: 100 / scale.value + '%!important', left: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2 top: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2 - transform: 'scale(' + scale.value + ')', + transform: 'scale(' + scale.value + ') translateZ(0)', opacity: element.value?.style?.opacity || 1 } as CSSProperties }) diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue index c0a0af58e6..51e2f48950 100644 --- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue +++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue @@ -596,7 +596,7 @@ const autoStyle = computed(() => { height: 20 * scale.value + 8 + 'px', width: 100 / scale.value + '%!important', left: 50 * (1 - 1 / scale.value) + '%', // 放大余量 除以 2 - transform: 'scale(' + scale.value + ')' + transform: 'scale(' + scale.value + ') translateZ(0)' } }) diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index eefe17263b..913e832f46 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -944,6 +944,7 @@ const loadPluginCategory = data => {