From c7db0d16d38c3ec9d292a2f72e0ed155b573d3ab Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 6 Jan 2025 22:08:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E8=AE=BE=E7=BD=AE=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=9C=AA=E8=83=BD=E8=AF=95=E8=AF=95=E5=8F=8D=E9=A6=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/common/CommonStyleSet.vue | 4 ++-- core/core-frontend/src/custom-component/component-list.ts | 2 +- core/core-frontend/src/custom-component/de-tabs/Component.vue | 4 ++-- core/core-frontend/src/utils/canvasUtils.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue index 84b6e7c035..34cf381d04 100644 --- a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue +++ b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue @@ -584,10 +584,10 @@ const checkItalic = () => { } const checkTextDecoration = () => { - if (styleForm.value.textDecoration === 'normal') { + if (styleForm.value.textDecoration === 'none') { styleForm.value.textDecoration = 'underline' } else { - styleForm.value.textDecoration = 'normal' + styleForm.value.textDecoration = 'none' } changeStyle({ key: 'textDecoration', value: styleForm.value.textDecoration }) } diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts index bd01862fae..e1c0c9cb24 100644 --- a/core/core-frontend/src/custom-component/component-list.ts +++ b/core/core-frontend/src/custom-component/component-list.ts @@ -563,7 +563,7 @@ const list = [ // #13540 fontWeight: 'normal', fontStyle: 'normal', - textDecoration: 'normal' + textDecoration: 'none' } }, { 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 a02b84a2fa..c84dd38a4a 100644 --- a/core/core-frontend/src/custom-component/de-tabs/Component.vue +++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue @@ -422,16 +422,16 @@ const headClass = computed(() => { const titleStyle = itemName => { if (editableTabsValue.value === itemName) { return { + textDecoration: element.value.style.textDecoration, fontStyle: element.value.style.fontStyle, fontWeight: element.value.style.fontWeight, - textDecoration: element.value.style.textDecoration, fontSize: (element.value.style.activeFontSize || 18) * scale.value + 'px' } } else { return { + textDecoration: element.value.style.textDecoration, fontStyle: element.value.style.fontStyle, fontWeight: element.value.style.fontWeight, - textDecoration: element.value.style.textDecoration, fontSize: (element.value.style.fontSize || 16) * scale.value + 'px' } } diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index d0cc60b42b..3c66bbc9c4 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -210,7 +210,7 @@ export function historyItemAdaptor( if (componentItem.component === 'DeTabs') { componentItem.style.fontStyle = componentItem.style.fontStyle || 'normal' componentItem.style.fontWeight = componentItem.style.fontWeight || 'normal' - componentItem.style.textDecoration = componentItem.style.textDecoration || 'normal' + componentItem.style.textDecoration = componentItem.style.textDecoration || 'none' componentItem.propValue.forEach(tabItem => { tabItem.componentData.forEach(tabComponent => { historyItemAdaptor(tabComponent, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)