dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5930 from ulleo/dev

Browse Source 
支持ECharts排序柱状图插件
This commit is contained in:
ulleo 2023-08-17 16:50:16 +08:00 committed by GitHub
commit 2ffce2cebd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/components/canvas/utils/style.js
View File

@ -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])
}

2
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -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() {