冲突解决

src/views/chart/view/ChartEdit.vue

@@ -2207,7 +2207,6 @@ 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')
-      )
     },
     },
     showSeniorCfg() {
     showSeniorCfg() {
       return (
       return (
@@ -2231,7 +2230,6 @@ 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'))
-      )
     },
     },
     showAssistLineCfg() {
     showAssistLineCfg() {
       return includesAny(this.view.type, 'bar', 'line', 'area', 'mix')
       return includesAny(this.view.type, 'bar', 'line', 'area', 'mix')
@@ -2243,7 +2241,6 @@ export default {
       return includesAny(this.view.type, 'gauge', 'liquid') ||
       return includesAny(this.view.type, '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'))
-      )
     },
     },
     showDrill() {
     showDrill() {
       return (
       return (