From 51dfb8de763b62de88ea34caca16305b3a98720c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 21 Oct 2024 13:44:34 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E4=BF=AE=E5=A4=8D=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=97=A0=E6=B3=95=E8=BF=9B=E5=85=A5=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/data-visualization/canvas/CanvasCore.vue | 2 +- .../src/custom-component/rich-text/DeRichTextView.vue | 2 +- .../src/custom-component/scroll-text/Component.vue | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) 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 c79a90e21b..ecd562365f 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -1586,7 +1586,7 @@ defineExpose({ @input="handleInput" :dv-info="dvInfo" :canvas-active="canvasActive" - :show-position="'edit'" + :show-position="'canvas'" /> { const computedCanEdit = computed(() => { return ( - ['canvas', 'canvasDataV'].includes(showPosition.value) && + ['canvas', 'canvasDataV', 'edit'].includes(showPosition.value) && editStatus.value && canEdit.value === false && !isError.value && diff --git a/core/core-frontend/src/custom-component/scroll-text/Component.vue b/core/core-frontend/src/custom-component/scroll-text/Component.vue index 4fdad6b013..11dbdf3829 100644 --- a/core/core-frontend/src/custom-component/scroll-text/Component.vue +++ b/core/core-frontend/src/custom-component/scroll-text/Component.vue @@ -144,10 +144,9 @@ const varStyle = computed(() => [ const init = () => { timeId = setInterval(() => { - const outerId = - showPosition.value === 'edit' - ? 'shape-id-' + element.value.id - : 'wrapper-outer-id-' + element.value.id + const outerId = ['canvas', 'canvasDataV', 'edit'].includes(showPosition.value) + ? 'shape-id-' + element.value.id + : 'wrapper-outer-id-' + element.value.id const componentOut = document.getElementById(outerId) if (componentOut && text.value) { const textValue = text.value.clientWidth