From 7b952b64a2b7273c6d2af68200a6ae790d9b59b1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 六月 2021 16:33:00 +0800
Subject: [PATCH] 2021-06-10

---
 src/tabviews/custom/components/chart/antv-bar-line/index.jsx |  540 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 343 insertions(+), 197 deletions(-)

diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index b1f524a..2f30000 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -2,7 +2,7 @@
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
 import { Chart } from '@antv/g2'
-import { connect } from 'react-redux'
+// import { connect } from 'react-redux'
 import DataSet from '@antv/data-set'
 import { Spin, Empty, notification } from 'antd'
 import moment from 'moment'
@@ -12,7 +12,7 @@
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
-import { modifyTabview } from '@/store/action'
+// import { modifyTabview } from '@/store/action'
 import MKEmitter from '@/utils/events.js'
 import './index.scss'
 
@@ -62,6 +62,7 @@
     let vstFields = null
 
     if (_config.plot.datatype === 'statistics') {
+      _config.plot.enabled = 'false'
       let _column = _config.columns.filter(col => _config.plot.InfoValue === col.field)[0]
       if (_column) {
         let decimal = 0
@@ -113,40 +114,109 @@
 
     _config.plot.color = _config.plot.color || 'rgba(0, 0, 0, 0.65)'
 
+    let bars = {}
     if (_config.plot.enabled === 'true' && _config.plot.customs && _config.plot.customs.length > 0) {
-      let colors = new Map()
+      let Bar_axis = []
+      _config.plot.customs = _config.plot.customs.map(item => {
+        item.name = transfield[item.type] || item.type
+        item.chartType = item.shape ? (item.shape[0] || 'bar') : 'bar'
+        item.shape = item.shape ? (item.shape[1] || '') : ''
+
+        if (item.chartType === 'bar') {
+          bars[item.type] = true
+          Bar_axis.push(item.type)
+        }
+
+        return item
+      })
+
+      _config.plot.hasBar = Bar_axis.length > 0
+
+      if (_config.plot.mutilBar !== 'overlap') {
+        _config.plot.Bar_axis = Bar_axis
+      }
+    } else {
+      _config.plot.enabled = 'false'
+    }
+
+    let colors = new Map()
+
+    if (_config.plot.colors && _config.plot.colors.length > 0) { // 棰滆壊璁剧疆
+      if (_config.plot.datatype === 'statistics') {
+        if (_config.plot.ramp === 'true') {
+          let _s = 'l(0) '
+          if (_config.plot.chartType === 'bar') {
+            _s = 'l(90) '
+          }
+          _config.plot.colors.forEach(item => {
+            if (!colors.has(item.type)) {
+              colors.set(item.type, _s + `0:${item.color} 1:${item.color1}`)
+            }
+          })
+        } else {
+          _config.plot.colors.forEach(item => {
+            if (!colors.has(item.type)) {
+              colors.set(item.type, item.color)
+            }
+          })
+        }
+      } else if (_config.plot.enabled === 'true') {
+        if (_config.plot.ramp === 'true') {
+          _config.plot.colors.forEach(item => {
+            let _type = transfield[item.type] || item.type
+            if (!colors.has(_type)) {
+              if (bars[item.type]) {
+                colors.set(_type, `l(90) 0:${item.color} 1:${item.color1}` )
+              } else {
+                colors.set(_type, `l(0) 0:${item.color} 1:${item.color1}` )
+              }
+            }
+          })
+        } else {
+          _config.plot.colors.forEach(item => {
+            let _type = transfield[item.type] || item.type
+            if (!colors.has(_type)) {
+              colors.set(_type, item.color)
+            }
+          })
+        }
+      } else {
+        if (_config.plot.ramp === 'true') {
+          let _s = 'l(0) '
+          if (_config.plot.chartType === 'bar') {
+            _s = 'l(90) '
+          }
+          _config.plot.colors.forEach(item => {
+            if (!transfield[item.type]) return
+            if (!colors.has(transfield[item.type])) {
+              colors.set(transfield[item.type], _s + `0:${item.color} 1:${item.color1}` )
+            }
+          })
+        } else {
+          _config.plot.colors.forEach(item => {
+            if (!transfield[item.type]) return
+            if (!colors.has(transfield[item.type])) {
+              colors.set(transfield[item.type], item.color)
+            }
+          })
+        }
+      }
+      _config.plot.$colors = colors
+    }
+
+    if (_config.plot.enabled === 'true') {
       let colorIndex = 0
       let limit = chartColors.length
-  
-      if (_config.plot.colors && _config.plot.colors.length > 0) {
-        _config.plot.colors.forEach(item => {
-          if (!colors.has(item.type)) {
-            colors.set(item.type, item.color)
-          }
-        })
-      }
-  
       let axisIndex = 0
-      let hasBar = false
-      let Bar_axis = []
       let fields = []
       let legends = []
   
       _config.plot.customs.forEach(item => {
-        item.name = transfield[item.type] || item.type
-        item.chartType = item.shape ? (item.shape[0] || 'bar') : 'bar'
-        item.shape = item.shape ? (item.shape[1] || '') : ''
-  
-        if (colors.get(item.type)) {
-          item.color = colors.get(item.type)
+        if (colors.has(item.name)) {
+          item.color = colors.get(item.name)
         } else {
           item.color = chartColors[colorIndex % limit]
           colorIndex++
-        }
-  
-        if (item.chartType === 'bar') {
-          hasBar = true
-          Bar_axis.push(item.type)
         }
   
         if (item.axis === 'true' && axisIndex < 2) {
@@ -172,16 +242,7 @@
       })
       _config.plot.customs = fields
       _config.plot.legends = legends
-      _config.plot.hasBar = hasBar
       _config.plot.axisIndex = axisIndex
-
-      if (_config.plot.mutilBar === 'overlap') {
-        _config.plot.Bar_axis = []
-      } else {
-        _config.plot.Bar_axis = Bar_axis
-      }
-    } else {
-      _config.plot.enabled = 'false'
     }
 
     this.setState({
@@ -457,7 +518,7 @@
    * 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
    */
   getdata = () => {
-    const { data, plot, vFields } = this.state
+    const { data, plot, vFields, config } = this.state
 
     if (!data || data.length === 0) {
       this.setState({empty: true})
@@ -502,6 +563,7 @@
           item[col.field] = item[col.field].toFixed(col.decimal)
           item[col.field] = +item[col.field]
         })
+        item.$$uuid = item[config.setting.primaryKey] || ''
         return item
       })
     } else if (plot.repeat === 'cumsum') {
@@ -536,6 +598,7 @@
           item[col.field] = item[col.field].toFixed(col.decimal)
           item[col.field] = +item[col.field]
         })
+        item.$$uuid = item[config.setting.primaryKey] || ''
         return item
       })
     } else { // plot.repeat === 'unrepeat'
@@ -555,6 +618,8 @@
             item[col.field] = item[col.field].toFixed(col.decimal)
             item[col.field] = +item[col.field]
           })
+          
+          item.$$uuid = item[config.setting.primaryKey] || ''
           _mdata.set(item[plot.Xaxis], item)
         }
       })
@@ -710,21 +775,11 @@
     let _data = []
     let _valfield = 'value'
     let _typefield = 'key'
-
-    let colors = new Map()
     let colorIndex = 0
 
     if (plot.datatype === 'statistics') {
       _valfield = plot.InfoValue
       _typefield = plot.InfoType
-
-      if (plot.colors && plot.colors.length > 0) { // 棰滆壊璁剧疆
-        plot.colors.forEach(item => {
-          if (!colors.has(item.type)) {
-            colors.set(item.type, item.color)
-          }
-        })
-      }
 
       _data = this.getStaticMsg()
     } else {
@@ -733,14 +788,6 @@
       if (plot.enabled === 'true') {
         this.customrender(data)
         return
-      }
-
-      if (plot.colors && plot.colors.length > 0) { // 棰滆壊璁剧疆
-        plot.colors.forEach(item => {
-          if (!colors.has(transfield[item.type])) {
-            colors.set(transfield[item.type], item.color)
-          }
-        })
       }
   
       const ds = new DataSet()
@@ -782,7 +829,7 @@
     }
     chart.scale(_valfield, {
       nice: true,
-      range: [0, 0.93]
+      range: [0, 0.9]
     })
     
     // 鍧愭爣杞存牸寮忓寲
@@ -838,14 +885,14 @@
         }
       })
 
-    if (plot.colors && plot.colors.length > 0) {
+    if (plot.$colors) {
       let limit = chartColors.length
       _chart.color(_typefield, (key) => {
-        if (colors.get(key)) {
-          return colors.get(key)
+        if (plot.$colors.has(key)) {
+          return plot.$colors.get(key)
         } else {
-          colors.set(key, chartColors[colorIndex % limit])
           colorIndex++
+          return chartColors[(colorIndex - 1) % limit]
         }
       })
     } else {
@@ -865,28 +912,54 @@
       })
     }
 
-    if (plot.point === 'true' && plot.colors && plot.colors.length > 0) {
-      let limit = chartColors.length
-      chart
+    if (plot.point === 'true') {
+      let _chart = chart
         .point()
         .position(`${plot.Xaxis}*${_valfield}`)
-        .color(_typefield, (key) => {
-          if (colors.get(key)) {
-            return colors.get(key)
+        .size(3)
+        .shape('circle')
+
+      if (plot.$colors) {
+        let limit = chartColors.length
+        _chart.color(_typefield, (key) => {
+          if (plot.$colors.has(key)) {
+            return plot.$colors.get(key)
           } else {
-            colors.set(key, chartColors[colorIndex % limit])
             colorIndex++
+            return chartColors[(colorIndex - 1) % limit]
           }
         })
-        .size(3)
-        .shape('circle')
-    } else if (plot.point === 'true') {
-      chart
-        .point()
+      } else {
+        _chart.color(_typefield)
+      }
+    }
+
+    if (plot.area === 'true') {
+      let area = chart
+        .area()
+        .shape(plot.shape || 'smooth')
         .position(`${plot.Xaxis}*${_valfield}`)
-        .color(_typefield)
-        .size(3)
-        .shape('circle')
+        .tooltip(false)
+
+      if (plot.$colors) {
+        let limit = chartColors.length
+        area.color(_typefield, (key) => {
+          if (plot.$colors.has(key)) {
+            return plot.$colors.get(key)
+          } else {
+            colorIndex++
+            return chartColors[(colorIndex - 1) % limit]
+          }
+        })
+      } else {
+        area.color(_typefield)
+      }
+    }
+
+    if (plot.interaction && plot.interaction.length) {
+      plot.interaction.forEach(t => {
+        chart.interaction(t)
+      })
     }
     
     chart.render()
@@ -925,7 +998,7 @@
 
     let padding = [10, 30, 30, 30]
 
-    if (!plot.Bar_axis.length) {
+    if (!plot.Bar_axis) {
       if (plot.axisIndex === 2) {
         padding = [10, 50, 30, 50]
       } else if (plot.axisIndex === 1) {
@@ -981,7 +1054,28 @@
       nice: true
     })
 
-    if (plot.Bar_axis.length) {
+    let lablecfg = {
+      position: 'top',
+      offset: 2,
+      style: {
+        fill: '#fff'
+      }
+    }
+
+    if (plot.label === 'top') {
+      lablecfg.offset = -5
+      lablecfg.style.textBaseline = 'top'
+    } else if (plot.label === 'middle') {
+      lablecfg.position = 'middle'
+      lablecfg.offset = 0
+    } else if (plot.label === 'bottom') {
+      lablecfg.position = 'bottom'
+      lablecfg.offset = 0
+    } else if (plot.label === 'true') {
+      lablecfg.style.fill = plot.color
+    }
+
+    if (plot.Bar_axis) {
       const view1 = chart.createView({
         region: {
           start: { x: 0, y: 0 },
@@ -1008,7 +1102,6 @@
       })
 
       view1.data(dvt.rows)
-      view1.interaction('other-visible')
 
       view1.scale('value', {
         nice: true,
@@ -1017,16 +1110,7 @@
   
       view1.legend(false)
 
-      let colors = new Map()
       let colorIndex = 0
-
-      if (plot.colors && plot.colors.length > 0) {
-        plot.colors.forEach(item => {
-          if (!colors.has(transfield[item.type])) {
-            colors.set(transfield[item.type], item.color)
-          }
-        })
-      }
   
       if (plot.adjust !== 'stack') {
         let _chart = view1
@@ -1049,29 +1133,31 @@
             }
           })
 
-        if (plot.colors && plot.colors.length > 0) {
+        if (plot.$colors) {
           let limit = chartColors.length
           _chart.color('key', (key) => {
-            if (colors.get(key)) {
-              return colors.get(key)
+            if (plot.$colors.has(key)) {
+              return plot.$colors.get(key)
             } else {
-              colors.set(key, chartColors[colorIndex % limit])
               colorIndex++
+              return chartColors[(colorIndex - 1) % limit]
             }
           })
         } else {
           _chart.color('key')
         }
         if (plot.label === 'true') {
-          _chart.label('value', (value) => {
+          _chart.label('value*key', (value, key) => {
             if (plot.show === 'percent') {
               value = value + '%'
             }
+
+            if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+              lablecfg.style.fill = plot.$colors.get(key)
+            }
             return {
               content: value,
-              style: {
-                fill: plot.color
-              }
+              ...lablecfg
             }
           })
         }
@@ -1098,29 +1184,30 @@
             }
           })
   
-        if (plot.colors && plot.colors.length > 0) {
+        if (plot.$colors) {
           let limit = chartColors.length
           _chart.color('key', (key) => {
-            if (colors.get(key)) {
-              return colors.get(key)
+            if (plot.$colors.has(key)) {
+              return plot.$colors.get(key)
             } else {
-              colors.set(key, chartColors[colorIndex % limit])
               colorIndex++
+              return chartColors[(colorIndex - 1) % limit]
             }
           })
         } else {
           _chart.color('key')
         }
         if (plot.label === 'true') {
-          _chart.label('value', (value) => {
+          _chart.label('value*key', (value, key) => {
             if (plot.show === 'percent') {
               value = value + '%'
             }
+            if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+              lablecfg.style.fill = plot.$colors.get(key)
+            }
             return {
               content: value,
-              style: {
-                fill: plot.color
-              }
+              ...lablecfg
             }
           })
         }
@@ -1143,17 +1230,15 @@
     })
 
     view2.data(dv.rows)
-    view2.interaction('other-visible')
-
     view2.legend(false)
 
     plot.customs.forEach((item, i) => {
-      if (item.chartType === 'bar' && !plot.Bar_axis.length) {
+      if (item.chartType === 'bar' && !plot.Bar_axis) {
         view2.axis(item.name, item.axis)
       
         view2.scale(item.name, {
           nice: true,
-          range: [0, 0.93]
+          range: [0, 0.9]
         })
         let _chart = view2
           .interval()
@@ -1175,11 +1260,12 @@
             if (plot.show === 'percent') {
               value = value + '%'
             }
+            if (plot.label === 'true' && plot.labelColor === 'custom' && item.color) {
+              lablecfg.style.fill = item.color
+            }
             return {
               content: value,
-              style: {
-                fill: plot.color
-              }
+              ...lablecfg
             }
           })
         }
@@ -1187,7 +1273,7 @@
           _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
         }
       } else if (item.chartType === 'line') {
-        if (!plot.Bar_axis.length) {
+        if (!plot.Bar_axis) {
           view2.axis(item.name, item.axis)
         } else {
           view2.axis(item.name, { grid: null, title: null, label: null })
@@ -1233,6 +1319,14 @@
       }
     })
 
+    if (plot.interaction && plot.interaction.length) {
+      plot.interaction.forEach(t => {
+        if (t === 'element-active' || t === 'element-highlight') {
+          chart.interaction(t)
+        }
+      })
+    }
+
     chart.render()
   }
 
@@ -1240,26 +1334,17 @@
    * @description 鏌辩姸鍥炬覆鏌�
    */
   barrender = () => {
-    const { plot, transfield } = this.state
+    const { plot, transfield, config } = this.state
 
     let _data = []
     let _valfield = 'value'
     let _typefield = 'key'
 
-    let colors = new Map()
     let colorIndex = 0
 
     if (plot.datatype === 'statistics') {
       _valfield = plot.InfoValue
       _typefield = plot.InfoType
-
-      if (plot.colors && plot.colors.length > 0) { // 棰滆壊璁剧疆
-        plot.colors.forEach(item => {
-          if (!colors.has(item.type)) {
-            colors.set(item.type, item.color)
-          }
-        })
-      }
 
       _data = this.getStaticMsg()
     } else {
@@ -1268,14 +1353,6 @@
       if (plot.enabled === 'true') {
         this.customrender(data)
         return
-      }
-
-      if (plot.colors && plot.colors.length > 0) { // 棰滆壊璁剧疆
-        plot.colors.forEach(item => {
-          if (!colors.has(transfield[item.type])) {
-            colors.set(transfield[item.type], item.color)
-          }
-        })
       }
 
       const ds = new DataSet()
@@ -1358,10 +1435,44 @@
       })
     }
 
-    let offset = {offsetY: 5}
+    let lablecfg = {
+      position: 'top',
+      offset: 2,
+      style: {
+        fill: '#fff'
+      }
+    }
+
+    if (plot.label === 'top') {
+      lablecfg.offset = -5
+      lablecfg.style.textBaseline = 'top'
+    } else if (plot.label === 'middle') {
+      lablecfg.position = 'middle'
+      lablecfg.offset = 0
+    } else if (plot.label === 'bottom') {
+      lablecfg.position = 'bottom'
+      lablecfg.offset = 0
+    } else if (plot.label === 'true') {
+      lablecfg.style.fill = plot.color
+    }
+
     if (plot.transpose === 'true') {
       chart.coordinate().transpose()
-      offset = {offsetY: 0, offsetX: -10}
+      if (plot.label === 'top') {
+        delete lablecfg.style.textBaseline
+        lablecfg.position = 'right'
+        lablecfg.offset = -3
+        lablecfg.style.textAlign = 'end'
+      } else if (plot.label === 'middle') {
+        lablecfg.position = 'middle'
+        lablecfg.offset = 0
+      } else if (plot.label === 'bottom') {
+        lablecfg.position = 'left'
+        lablecfg.offset = 2
+      } else if (plot.label === 'true') {
+        lablecfg.position = 'right'
+        lablecfg.offset = 2
+      }
     }
 
     if (plot.coordinate === 'polar') {
@@ -1389,36 +1500,47 @@
           }
         })
 
-      if (plot.colors && plot.colors.length > 0) {
+      if (plot.$colors) {
         let limit = chartColors.length
         _chart.color(_typefield, (key) => {
-          if (colors.get(key)) {
-            return colors.get(key)
+          if (plot.$colors.has(key)) {
+            return plot.$colors.get(key)
           } else {
-            colors.set(key, chartColors[colorIndex % limit])
             colorIndex++
+            return chartColors[(colorIndex - 1) % limit]
           }
         })
       } else {
         _chart.color(_typefield)
       }
       if (plot.label === 'true') {
-        _chart.label(_valfield, (value) => {
+        _chart.label(`${_valfield}*${_typefield}`, (value, key) => {
           if (plot.show === 'percent') {
             value = value + '%'
           }
+
+          if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+            lablecfg.style.fill = plot.$colors.get(key)
+          }
+
           return {
             content: value,
-            style: {
-              fill: plot.color
-            },
-            ...offset
+            ...lablecfg
           }
         })
       }
 
       if (plot.barSize || plot.correction) {
         _chart.size(plot.barSize || 35)
+      }
+      if (plot.selectColor) {
+        _chart.state({
+          selected: {
+            style: {
+              fill: plot.selectColor,
+            }
+          }
+        })
       }
       if (plot.barRadius) {
         _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
@@ -1436,29 +1558,32 @@
           }
         })
 
-      if (plot.colors && plot.colors.length > 0) {
+      if (plot.$colors) {
         let limit = chartColors.length
         _chart.color(_typefield, (key) => {
-          if (colors.get(key)) {
-            return colors.get(key)
+          if (plot.$colors.has(key)) {
+            return plot.$colors.get(key)
           } else {
-            colors.set(key, chartColors[colorIndex % limit])
             colorIndex++
+            return chartColors[(colorIndex - 1) % limit]
           }
         })
       } else {
         _chart.color(_typefield)
       }
       if (plot.label === 'true') {
-        _chart.label(_valfield, (value) => {
+        _chart.label(`${_valfield}*${_typefield}`, (value, key) => {
           if (plot.show === 'percent') {
             value = value + '%'
           }
+
+          if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+            lablecfg.style.fill = plot.$colors.get(key)
+          }
+
           return {
             content: value,
-            style: {
-              fill: plot.color
-            }
+            ...lablecfg
           }
         })
       }
@@ -1466,56 +1591,76 @@
       if (plot.barSize || plot.correction) {
         _chart.size(plot.barSize || 35)
       }
+      if (plot.selectColor) {
+        _chart.state({
+          selected: {
+            style: {
+              fill: plot.selectColor,
+            }
+          }
+        })
+      }
       if (plot.barRadius) {
         _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
       }
     }
 
-    if (plot.linkmenu && plot.linkmenu.length > 0) {
-      let menu_id = plot.linkmenu.slice(-1)[0]
-      let menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
+    chart.on('element:click', (ev) => {
+      let data = ev.data.data
+      MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), null)
+    })
 
-      chart.on('element:dblclick', (ev) => {
-        if (!menu) {
-          notification.warning({
-            top: 92,
-            message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
-            duration: 5
-          })
-          return
-        }
+    // if (plot.linkmenu && plot.linkmenu.length > 0) {
+    //   let menu_id = plot.linkmenu.slice(-1)[0]
+    //   let menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
 
-        try {
-          let data = ev.data.data
-          let primaryId = ''
-          if (this.state.config.setting.primaryKey && data) {
-            primaryId = data[this.state.config.setting.primaryKey] || ''
-          }
+    //   chart.on('element:dblclick', (ev) => {
+    //     if (!menu) {
+    //       notification.warning({
+    //         top: 92,
+    //         message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
+    //         duration: 5
+    //       })
+    //       return
+    //     }
 
-          let newtab = {
-            ...menu,
-            selected: true,
-            param: {
-              $BID: primaryId
-            }
-          }
+    //     try {
+    //       let data = ev.data.data
+    //       let primaryId = ''
+    //       if (this.state.config.setting.primaryKey && data) {
+    //         primaryId = data[this.state.config.setting.primaryKey] || ''
+    //       }
+
+    //       let newtab = {
+    //         ...menu,
+    //         selected: true,
+    //         param: {
+    //           $BID: primaryId
+    //         }
+    //       }
   
-          let tabs = this.props.tabviews.filter(tab => {
-            tab.selected = false
-            return tab.MenuID !== newtab.MenuID
-          })
+    //       let tabs = this.props.tabviews.filter(tab => {
+    //         tab.selected = false
+    //         return tab.MenuID !== newtab.MenuID
+    //       })
   
-          if (this.props.tabviews.length > tabs.length) {
-            this.props.modifyTabview(fromJS(tabs).toJS())
-          }
+    //       if (this.props.tabviews.length > tabs.length) {
+    //         this.props.modifyTabview(fromJS(tabs).toJS())
+    //       }
   
-          this.setState({}, () => {
-            tabs.push(newtab)
-            this.props.modifyTabview(tabs)
-          })
-        } catch {
-          console.warn('鑿滃崟鎵撳紑澶辫触锛�')
-        }
+    //       this.setState({}, () => {
+    //         tabs.push(newtab)
+    //         this.props.modifyTabview(tabs)
+    //       })
+    //     } catch {
+    //       console.warn('鑿滃崟鎵撳紑澶辫触锛�')
+    //     }
+    //   })
+    // }
+
+    if (plot.interaction && plot.interaction.length) {
+      plot.interaction.forEach(t => {
+        chart.interaction(t)
       })
     }
 
@@ -1574,17 +1719,18 @@
   }
 }
 
-const mapStateToProps = (state) => {
-  return {
-    tabviews: state.tabviews,
-    permMenus: state.permMenus,
-  }
-}
+// const mapStateToProps = (state) => {
+//   return {
+//     tabviews: state.tabviews,
+//     permMenus: state.permMenus,
+//   }
+// }
 
-const mapDispatchToProps = (dispatch) => {
-  return {
-    modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
-  }
-}
+// const mapDispatchToProps = (dispatch) => {
+//   return {
+//     modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
+//   }
+// }
 
-export default connect(mapStateToProps, mapDispatchToProps)(LineChart)
\ No newline at end of file
+// export default connect(mapStateToProps, mapDispatchToProps)(LineChart)
+export default LineChart
\ No newline at end of file

--
Gitblit v1.8.0