From 496624a1525dd1999eaebf72b4d87aeb68499440 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 15 Jan 2024 22:38:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E7=BB=84=E4=B8=AD=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E8=BF=98=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=A7=BB=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rich-text/DeRichTextView.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) 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 92e8e17ab7..6c47b38582 100644 --- a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue +++ b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue @@ -92,15 +92,10 @@ const props = defineProps({ themes: { type: String as PropType, default: 'dark' - }, - canvasActive: { - type: Boolean, - required: false, - default: true } }) -const { scale, element, editMode, active, disabled, showPosition, canvasActive } = toRefs(props) +const { scale, element, editMode, active, disabled, showPosition } = toRefs(props) const state = reactive({ data: null, @@ -276,8 +271,16 @@ const showPlaceHolder = computed(() => { ) }) +const editActive = computed(() => { + if (element.value.canvasId.includes('Group') && !active.value) { + return false + } else { + return true + } +}) + const setEdit = () => { - if (computedCanEdit.value && canvasActive.value) { + if (computedCanEdit.value && editActive.value) { canEdit.value = true element.value['editing'] = true myValue.value = element.value.propValue.textValue