diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js index 1d1ac320e8..fba57c474f 100644 --- a/frontend/src/components/canvas/utils/style.js +++ b/frontend/src/components/canvas/utils/style.js @@ -127,7 +127,13 @@ export const customAttrTrans = { ], 'tooltip': { 'textStyle': ['fontSize'] - } + }, + 'slider': [ + 'fontSize' + ], + 'graphic': [ + 'fontSize' + ] } export const customStyleTrans = { 'text': ['fontSize'], @@ -375,7 +381,7 @@ export function adaptCurTheme(customStyle, customAttr, chartType) { } } -export function adaptCurThemeCommonStyle(component,adaptFrom = 'them') { +export function adaptCurThemeCommonStyle(component, adaptFrom = 'them') { const commonStyle = store.state.canvasStyleData.chartInfo.chartCommonStyle for (const key in commonStyle) { Vue.set(component.commonBackground, key, commonStyle[key]) @@ -383,9 +389,9 @@ export function adaptCurThemeCommonStyle(component,adaptFrom = 'them') { if (isFilterComponent(component.component)) { const filterStyle = store.state.canvasStyleData.chartInfo.filterStyle for (const styleKey in filterStyle) { - if(adaptFrom === 'copy'){ + if (adaptFrom === 'copy') { Vue.set(component.style, styleKey, filterStyle[styleKey]) - }else if (adaptFrom === 'them' && styleKey !== 'horizontal' && styleKey !== 'vertical') { + } else if (adaptFrom === 'them' && styleKey !== 'horizontal' && styleKey !== 'vertical') { // 主题变化位置属性不修改 Vue.set(component.style, styleKey, filterStyle[styleKey]) } diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 0d5faf0cf6..e5f715844e 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1955,7 +1955,7 @@ export default { return this.$store.state.panel.panelInfo }, showCfg() { - return includesAny(this.view.type, 'bar', 'line', 'area', 'gauge', 'table') || + return includesAny(this.view.type, 'bar', 'line', 'area', 'gauge', 'table') && this.view.type !== 'race-bar' || equalsAny(this.view.type, 'text', 'label', 'map', 'buddle-map') }, showSeniorCfg() {