github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 修复下划线设置按钮样式未能试试反馈问题

Browse Source
This commit is contained in:
wangjiahao 2025-01-06 22:08:09 +08:00 committed by 王嘉豪
parent 6ca1db9572
commit c7db0d16d3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-frontend/src/custom-component/common/CommonStyleSet.vue
View File

@ -584,10 +584,10 @@ const checkItalic = () => {
} }
const checkTextDecoration = () => { const checkTextDecoration = () => {
if (styleForm.value.textDecoration === 'normal') { if (styleForm.value.textDecoration === 'none') {
styleForm.value.textDecoration = 'underline' styleForm.value.textDecoration = 'underline'
} else { } else {
styleForm.value.textDecoration = 'normal' styleForm.value.textDecoration = 'none'
} }
changeStyle({ key: 'textDecoration', value: styleForm.value.textDecoration }) changeStyle({ key: 'textDecoration', value: styleForm.value.textDecoration })
} }

2
core/core-frontend/src/custom-component/component-list.ts
View File

@ -563,7 +563,7 @@ const list = [
// #13540 // #13540
fontWeight: 'normal', fontWeight: 'normal',
fontStyle: 'normal', fontStyle: 'normal',
textDecoration: 'normal' textDecoration: 'none'
} }
}, },
{ {

4
core/core-frontend/src/custom-component/de-tabs/Component.vue
View File

@ -422,16 +422,16 @@ const headClass = computed(() => {
const titleStyle = itemName => { const titleStyle = itemName => {
if (editableTabsValue.value === itemName) { if (editableTabsValue.value === itemName) {
return { return {
textDecoration: element.value.style.textDecoration,
fontStyle: element.value.style.fontStyle, fontStyle: element.value.style.fontStyle,
fontWeight: element.value.style.fontWeight, fontWeight: element.value.style.fontWeight,
textDecoration: element.value.style.textDecoration,
fontSize: (element.value.style.activeFontSize || 18) * scale.value + 'px' fontSize: (element.value.style.activeFontSize || 18) * scale.value + 'px'
} }
} else { } else {
return { return {
textDecoration: element.value.style.textDecoration,
fontStyle: element.value.style.fontStyle, fontStyle: element.value.style.fontStyle,
fontWeight: element.value.style.fontWeight, fontWeight: element.value.style.fontWeight,
textDecoration: element.value.style.textDecoration,
fontSize: (element.value.style.fontSize || 16) * scale.value + 'px' fontSize: (element.value.style.fontSize || 16) * scale.value + 'px'
} }
} }

2
core/core-frontend/src/utils/canvasUtils.ts
View File

@ -210,7 +210,7 @@ export function historyItemAdaptor(
if (componentItem.component === 'DeTabs') { if (componentItem.component === 'DeTabs') {
componentItem.style.fontStyle = componentItem.style.fontStyle || 'normal' componentItem.style.fontStyle = componentItem.style.fontStyle || 'normal'
componentItem.style.fontWeight = componentItem.style.fontWeight || '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 => { componentItem.propValue.forEach(tabItem => {
tabItem.componentData.forEach(tabComponent => { tabItem.componentData.forEach(tabComponent => {
historyItemAdaptor(tabComponent, reportFilterInfo, attachInfo, canvasVersion, canvasInfo) historyItemAdaptor(tabComponent, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)