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

Merge pull request #6663 from ulleo/dev

Browse Source 
fix: echarts组合图高级设置显示不支持
This commit is contained in:
ulleo 2023-11-13 15:53:25 +08:00 committed by GitHub
commit 3b7ab13003
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/frontend/src/views/chart/view/ChartEdit.vue
View File

@ -2061,11 +2061,11 @@ export default {
}, },
showCfg() { showCfg() {
return includesAny(this.view.type, 'bar', 'line', 'area', 'gauge', 'table', 'liquid') && this.view.type !== 'race-bar' || return includesAny(this.view.type, 'bar', 'line', 'area', 'gauge', 'table', 'liquid') && this.view.type !== 'race-bar' ||
equalsAny(this.view.type, 'text', 'label', 'map', 'buddle-map') equalsAny(this.view.type, 'text', 'label', 'map', 'buddle-map') || this.view.render === 'echarts' && includesAny(this.view.type, 'mix')
}, },
showSeniorCfg() { showSeniorCfg() {
return includesAny(this.view.type, 'bar', 'line', 'area', 'table') || return includesAny(this.view.type, 'bar', 'line', 'area', 'table') ||
equalsAny(this.view.type, 'table-normal', 'table-info', 'map') equalsAny(this.view.type, 'table-normal', 'table-info', 'map') || this.view.render === 'echarts' && includesAny(this.view.type, 'mix')
}, },
showFunctionCfg() { showFunctionCfg() {
return includesAny(this.view.type, 'bar', 'line', 'area', 'mix', 'table') || return includesAny(this.view.type, 'bar', 'line', 'area', 'mix', 'table') ||
@ -2080,7 +2080,7 @@ export default {
} }
return includesAny(this.view.type, 'bar', 'line', 'area', 'gauge', 'liquid') || return includesAny(this.view.type, 'bar', 'line', 'area', 'gauge', 'liquid') ||
equalsAny(this.view.type, 'text', 'label') || equalsAny(this.view.type, 'text', 'label') ||
(this.view.render === 'antv' && this.view.type.includes('table')) (this.view.render === 'antv' && this.view.type.includes('table')) || this.view.render === 'echarts' && includesAny(this.view.type, 'mix')
}, },
showAssistLineCfg() { showAssistLineCfg() {
return includesAny(this.view.type, 'bar', 'line', 'area', 'mix') return includesAny(this.view.type, 'bar', 'line', 'area', 'mix')