From 49f09cc6f8ff8c30a75ed1a9d6f510b69b73962a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 十二月 2023 21:05:37 +0800
Subject: [PATCH] 2023-12-12

---
 src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 2089 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 1,498 insertions(+), 591 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 c74f855..f86a91e 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -3,15 +3,18 @@
 import { is, fromJS } from 'immutable'
 import { Chart } from '@antv/g2'
 import DataSet from '@antv/data-set'
-import { Spin, Empty, Select, notification } from 'antd'
+import { Spin, Empty, notification, Modal } from 'antd'
+import { DownloadOutlined } from '@ant-design/icons'
+import moment from 'moment'
 
 import asyncComponent from './asyncButtonComponent'
-// import searchLine from '../../share/searchLine'
+import { chartColors } from '@/utils/option.js'
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
 import UtilsDM from '@/utils/utils-datamanage.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
+import MKEmitter from '@/utils/events.js'
+import TimerTask from '@/utils/timer-task.js'
+import NormalHeader from '@/tabviews/custom/components/share/normalheader'
 import './index.scss'
 
 const ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
@@ -19,50 +22,47 @@
 
 class LineChart extends Component {
   static propTpyes = {
-    BID: PropTypes.any,              // 鐖剁骇Id
-    data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
     config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
-    mainSearch: PropTypes.any,       // 鍏ㄥ眬鎼滅储鏉′欢
-    menuType: PropTypes.any,         // 鑿滃崟绫诲瀷
-    dataManager: PropTypes.any,      // 鏁版嵁鏉冮檺
   }
 
   state = {
-    dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, // 瀛楀吀
-    config: true,              // 鍥捐〃閰嶇疆淇℃伅
+    BID: '',                   // 涓昏〃ID
+    config: null,              // 鍥捐〃閰嶇疆淇℃伅
     empty: true,               // 鍥捐〃鏁版嵁涓虹┖
     loading: false,            // 鏁版嵁鍔犺浇鐘舵��
     chartId: Utils.getuuid(),  // 鍥捐〃Id
-    title: '',                 // 缁勪欢鏍囬
-    sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
+    transfield: {},            // 瀛楁鍚嶇О缈昏瘧
     plot: null,                // 鍥捐〃璁剧疆
-    data: null,                // 鏁版嵁
     search: null,              // 鎼滅储鏉′欢
     vFields: [],               // 鏁板�煎瓧娈�
     vstFields: null,           // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
-    chartData: [],             // 鍥捐〃鏁版嵁
-    chartFields: [],           // 缁熻鍥捐〃鐢熸垚瀛楁闆�
-    selectFields: [],          // 缁熻鍥捐〃閫夋嫨瀛楁
-    percentFields: []          // 璁剧疆涓虹櫨鍒嗘瘮鐨勫瓧娈碉紝tooltip鏃跺鍔�%
+    chart: null
   }
 
+  data = []
+  loaded = false
+
   UNSAFE_componentWillMount () {
-    const { config, data } = this.props
+    const { config } = this.props
+
     let _config = fromJS(config).toJS()
+    let BID = ''
+    let BData = ''
 
-    let _data = null
-    let _sync = config.setting.sync === 'true'
-
-    if (config.setting.sync === 'true' && data) {
-      _data = data[config.dataName] || []
-      _sync = false
+    if (config.setting.supModule) {
+      BData = window.GLOB.CacheData.get(config.setting.supModule)
+    } else {
+      BData = window.GLOB.CacheData.get(config.$pageId)
+    }
+    if (BData) {
+      BID = BData.$BID || ''
     }
 
     let vFields = []
-    let percentFields = []
     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
@@ -92,415 +92,678 @@
             show: _config.plot.show,
             decimal
           })
+        }
+      })
+    }
 
-          if (_config.plot.show === 'percent') {
-            percentFields.push(col.label)
+    _config.plot.height = Utils.getHeight(_config.plot.height)
+    _config.style.height = 'auto'
+    _config.style.minHeight = _config.plot.height + 30
+
+    if (_config.plot.correction) {
+      delete _config.plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
+      _config.plot.barSize = 35
+    }
+
+    if (!_config.plot.legend || _config.plot.legend === 'hidden') {
+      _config.plot.legend = false
+    }
+
+    if (_config.plot.title) {
+      _config.style.minHeight = _config.style.minHeight + 45
+    }
+
+    let transfield = {}
+    _config.columns.forEach(col => {
+      if (col.field) {
+        transfield[col.field] = col.label
+      }
+    })
+
+    _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 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' && Bar_axis.length > 1) {
+        _config.plot.Bar_axis = Bar_axis
+      }
+
+      if (_config.plot.Bar_axis && _config.plot.Bar_axis.length) {
+        let label = _config.plot.label
+
+        if (label === 'false') {
+          _config.plot.customs.forEach(item => {
+            if (!Bar_axis.includes(item.type)) return
+            if (item.label === 'true') {
+              label = 'true'
+            }
+          })
+        } else {
+          let reset = true
+          _config.plot.customs.forEach(item => {
+            if (!Bar_axis.includes(item.type)) return
+            if (item.label === 'true') {
+              reset = false
+            }
+          })
+          if (reset) {
+            label = 'false'
+          }
+        }
+
+        _config.plot.$label = label
+      }
+
+      if (_config.plot.zoomYaxis === 'adjust' && _config.plot.mutilBar === 'stack') {
+        if (_config.plot.Bar_axis) {
+          _config.plot.zoomFields = _config.plot.Yaxis.filter(cell => !_config.plot.Bar_axis.includes(cell))
+        }
+      }
+    } 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' || (_config.plot.chartType === 'line' && _config.plot.rampDirection === 'vertical')) {
+            _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' || (_config.plot.chartType === 'line' && _config.plot.rampDirection === 'vertical')) {
+            _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
+    }
+
+    let limit = _config.plot.XLimit || 11
+
+    let xc = {label: {
+      formatter: (val) => {
+        if (!val || /^\s+$/.test(val)) return val
+        let _val = `${val}`
+        if (_val.length <= limit) return val
+        return _val.substring(0, limit) + '...'
+      },
+      style: { fill: _config.plot.color }
+    }}
+    let yc = {label: { style: { fill: _config.plot.color } }}
+    if (_config.plot.grid === 'hidden') {
+      yc.grid = null
+    }
+    if (_config.plot.y_line === 'show') {
+      yc.line = {style: { stroke: '#D1D2CE' }}
+    }
+    if (_config.plot.lineColor) {
+      xc.tickLine = {style: { stroke: _config.plot.lineColor }}
+      xc.line = { style: { stroke: _config.plot.lineColor } }
+      if (yc.grid !== null) {
+        yc.grid = { line: { style: { stroke: _config.plot.lineColor } }}
+      }
+      if (yc.line) {
+        yc.line = { style: { stroke: _config.plot.lineColor } }
+      }
+    }
+
+    _config.plot.$xc = xc
+    _config.plot.$yc = yc
+
+    _config.plot.$paddingLeft = 30
+    _config.plot.$paddingRight = 30
+
+    if (_config.plot.enabled === 'true') {
+      let colorIndex = 0
+      let limit = chartColors.length
+      let axisIndex = 0
+      let fields = []
+      let legends = []
+      let vFieldsShow = {}
+
+      _config.plot.customs.forEach(item => {
+        if (colors.has(item.name)) {
+          item.color = colors.get(item.name)
+        } else {
+          item.color = chartColors[colorIndex % limit]
+          colorIndex++
+        }
+  
+        if (item.axis === 'true' && axisIndex < 2) {
+          if (axisIndex === 0) {
+            item.axis = { label: {style: { fill: _config.plot.color }} }
+            if (item.title !== 'false') {
+              item.axis.title = { style: { fill: _config.plot.color } }
+              _config.plot.$paddingLeft = 50
+            }
+            if (_config.plot.grid === 'hidden') {
+              item.axis.grid = null
+            }
+            if (_config.plot.y_line === 'show') {
+              item.axis.line = {style: { stroke: '#D1D2CE' }}
+            }
+            if (_config.plot.lineColor) {
+              if (item.axis.grid !== null) {
+                item.axis.grid = { line: { style: { stroke: _config.plot.lineColor } }}
+              }
+              if (item.axis.line) {
+                item.axis.line = { style: { stroke: _config.plot.lineColor } }
+              }
+            }
+            fields.unshift(item)
+          } else {
+            item.axis = { grid: null, label: {style: { fill: _config.plot.color }} }
+            if (item.title !== 'false') {
+              item.axis.title = { style: { fill: _config.plot.color } }
+              _config.plot.$paddingRight = 60
+            }
+            if (_config.plot.y_line === 'show') {
+              item.axis.line = {style: { stroke: '#D1D2CE' }}
+            }
+            if (_config.plot.lineColor && item.axis.line) {
+              item.axis.line = { style: { stroke: _config.plot.lineColor } }
+            }
+            fields.splice(1, 0, item)
+          }
+          axisIndex++
+        } else {
+          item.axis = { grid: null, title: null, label: null }
+          fields.push(item)
+        }
+  
+        
+        legends.push({
+          value: item.name,
+          name: item.name,
+          marker: { symbol: item.chartType === 'bar' ? 'square' : 'hyphen', style: { stroke: item.color,fill: item.color, r: 5, lineWidth: 2 } }
+        })
+
+        if (!_config.plot.Bar_axis || item.chartType !== 'bar') { // 鎶樼嚎鍥炬垨閲嶅彔涓嬬殑鏌辩姸鍥惧彲鍗曠嫭璁剧疆鏄剧ず绫诲瀷
+          if (item.show) {
+            vFieldsShow[item.type] = item.show
+          } else {
+            item.show = _config.plot.show
           }
         }
       })
+      _config.plot.customs = fields
+      _config.plot.legends = legends
+      _config.plot.axisIndex = axisIndex
+      vFields.forEach(item => {
+        if (vFieldsShow[item.field]) {
+          item.show = vFieldsShow[item.field]
+        }
+      })
+    }
+
+    if (_config.setting.sync === 'true') {
+      _config.setting.onload = 'false'
+
+      if (window.GLOB.SyncData.has(_config.dataName)) {
+        this.data = window.GLOB.SyncData.get(_config.dataName) || []
+  
+        if (_config.$cache) {
+          Api.writeCacheConfig(_config.uuid, fromJS(this.data).toJS(), BID)
+        }
+  
+        _config.setting.sync = 'false'
+  
+        this.loaded = true
+  
+        window.GLOB.SyncData.delete(_config.dataName)
+      }
     }
 
     this.setState({
       config: _config,
-      data: _data,
+      BID: BID || '',
       vFields: vFields,
       vstFields: vstFields,
-      percentFields: percentFields,
-      arr_field: _config.columns.map(col => col.field).join(','),
       plot: _config.plot,
-      sync: _sync,
-      title: config.setting.title,
-      search: Utils.initMainSearch(config.search)
-    }, () => {
-      if (config.setting.sync !== 'true') {
-        this.loadData()
-      } else if (config.setting.sync === 'true') {
-        if (!_data) {
-          this.setState({
-            loading: true
-          })
-        } else {
-          this.handleData()
-        }
-      }
+      search: _config.$searches,
+      transfield
     })
-  }
-
-  /**
-   * @description 鏍¢獙鍥捐〃鐨勬寜閽粍锛屽鏋滀负缁熻鍥捐〃锛岃绠楀浘琛ㄥ瓧娈�
-   */
-  componentDidMount () {
-
-  }
-
-  /**
-   * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
-   */
-  UNSAFE_componentWillReceiveProps (nextProps) {
-    const { sync, config } = this.state
-
-    if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
-      let _data = []
-      if (nextProps.data && nextProps.data[config.dataName]) {
-        _data = nextProps.data[config.dataName] || []
-      }
-
-      this.setState({sync: false, loading: false, data: _data}, () => {
-        this.handleData()
-      })
-    }
   }
 
   shouldComponentUpdate (nextProps, nextState) {
     return !is(fromJS(this.state), fromJS(nextState))
   }
 
-  handleData = () => {
-    const { data, plot } = this.state
+  componentDidMount () {
+    const { config } = this.state
 
-    if (plot.datatype === 'statistics') {
-      let result = this.getStaticMsg(data)
-      
-      this.setState({
-        chartData: result.data,
-        chartFields: result.chartFields,
-        selectFields: result.selectFields
-      }, () => {
-        let _element = document.getElementById(this.state.chartId)
-        if (_element) {
-          _element.innerHTML = ''
-        }
-        this.viewrender()
+    MKEmitter.addListener('reloadData', this.reloadData)
+    MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+    MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+    MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+    
+    if (config.setting.useMSearch) {
+      MKEmitter.addListener('searchRefresh', this.searchRefresh)
+    }
+
+    if (config.setting.sync === 'true') {
+      MKEmitter.addListener('transferSyncData', this.transferSyncData)
+    }
+
+    if (config.timer) {
+      this.timer = new TimerTask()
+      this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
+        this.loadData('timer')
       })
-    } else {
-      let _element = document.getElementById(this.state.chartId)
-      if (_element) {
-        _element.innerHTML = ''
+    }
+
+    this.initExec()
+  }
+
+  /**
+   * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+   */
+  componentWillUnmount () {
+    this.setState = () => {
+      return
+    }
+    MKEmitter.removeListener('reloadData', this.reloadData)
+    MKEmitter.removeListener('searchRefresh', this.searchRefresh)
+    MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+    MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+    MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+    MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+
+    this.timer && this.timer.stop()
+  }
+
+  initExec = () => {
+    const { config, BID } = this.state
+
+    if (config.$cache) {
+      if (config.$time) {
+        if (!this.loaded) {
+          Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+            if (!res.valid && config.setting.onload === 'true') {
+              setTimeout(() => {
+                this.loadData('init')
+              }, config.setting.delay || 0)
+            }
+  
+            if (!res.data || this.loaded) return
+
+            this.data = res.data
+            this.handleData()
+          })
+        } else {
+          this.handleData()
+        }
+      } else {
+        if (!this.loaded) {
+          Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+            if (!res.data || this.loaded) return
+    
+            this.data = res.data
+            this.handleData()
+          })
+        }
+
+        if (config.setting.onload === 'true') {
+          setTimeout(() => {
+            this.loadData('init')
+          }, config.setting.delay || 0)
+        } else if (this.loaded) {
+          this.handleData()
+        }
       }
-      this.viewrender()
+    } else if (config.setting.onload === 'true') {
+      setTimeout(() => {
+        this.loadData()
+      }, config.setting.delay || 0)
+    } else if (this.loaded) {
+      this.handleData()
     }
   }
 
-  async loadData () {
-    const { mainSearch, BID, menuType, dataManager } = this.props
-    const { config, arr_field, search } = this.state
-    
-    let searches = fromJS(search).toJS()
-    if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
-      searches = [...mainSearch, ...searches]
+  transferSyncData = (syncId) => {
+    const { config, BID } = this.state
+
+    if (config.$syncId !== syncId) return
+
+    let _data = window.GLOB.SyncData.get(config.dataName) || []
+
+    if (config.$cache) {
+      Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
     }
 
-    this.setState({
-      loading: true
+    this.data = _data
+    this.handleData()
+
+    this.loaded = true
+
+    window.GLOB.SyncData.delete(config.dataName)
+
+    MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+  }
+
+  searchRefresh = (searchId) => {
+    const { config } = this.state
+
+    if (config.$searchId !== searchId) return
+    
+    this.setState({}, () => {
+      this.loadData()
     })
+  }
+
+  /**
+   * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
+   * @param {*} menuId     // 鑿滃崟Id
+   * @param {*} position   // 鍒锋柊浣嶇疆
+   * @param {*} btn        // 鎵ц鐨勬寜閽�
+   */
+  refreshByButtonResult = (menuId, position, btn) => {
+    const { config, BID } = this.state
+
+    if (config.uuid !== menuId) return
+
+    if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+      MKEmitter.emit('reloadData', config.setting.supModule, BID)
+    } else {
+      this.loadData()
+    }
+  }
+
+  reloadData = (menuId) => {
+    const { config } = this.state
+
+    if (config.uuid !== menuId) return
+
+    this.loadData()
+  }
+
+  resetParentParam = (MenuID, id) => {
+    const { config } = this.state
+
+    if (!config.setting.supModule || config.setting.supModule !== MenuID) return
+    if (id !== this.state.BID || id !== '') {
+      this.setState({ BID: id }, () => {
+        this.loadData()
+      })
+    }
+  }
+
+  /**
+   * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+   */
+  queryModuleParam = (menuId, callback) => {
+    const { config, search } = this.state
+
+    if (config.uuid !== menuId) return
+
+    let searches = search ? fromJS(search).toJS() : []
+    if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+      let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+      let keys = config.$s_keys || []
+      mainSearch.forEach(item => {
+        if (keys.includes(item.key.toLowerCase())) return
+
+        searches.push(item)
+      })
+    }
+
+    callback({
+      orderBy: config.setting.order || '',
+      search: searches,
+      menuName: config.name
+    })
+  }
+
+  /**
+   * @description 鏁版嵁鍔犺浇
+   */
+  async loadData (type) {
+    const { config, BID, search } = this.state
+
+    if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
+      if (!is(fromJS(this.data), fromJS([]))) {
+        this.data = []
+        this.handleData()
+      }
+      this.loaded = true
+      return
+    }
+
+    let searches = search ? fromJS(search).toJS() : []
+    if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+      let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+      let keys = config.$s_keys || []
+      mainSearch.forEach(item => {
+        if (keys.includes(item.key.toLowerCase())) return
+
+        searches.push(item)
+      })
+    }
+
+    if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
+      return
+    }
+
+    if (type !== 'timer') {
+      this.setState({
+        loading: true
+      })
+    }
 
     let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID, menuType, dataManager)
+    let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, '', '', BID)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
-      this.setState({
-        data: result.data.map((item, index) => {
-          item.key = index
-          return item
-        }),
-        loading: false
-      })
-    } else {
+      if (config.$cache && type === 'init') {
+        Api.writeCacheConfig(config.uuid, result.data || [], BID)
+      }
+
+      this.loaded = true
+
       this.setState({
         loading: false
       })
-      notification.error({
-        top: 92,
-        message: result.message,
-        duration: 10
-      })
-    }
-  }
 
-  /**
-   * @description 鍥捐〃鏁版嵁棰勫鐞�
-   * 1銆侀�氳繃鏄剧ず鍒楄繘琛屾暟鎹被鍨嬭浆鎹�
-   * 2銆侀噸澶嶆暟鎹細鍙栧钩鍧囧�笺�佺疮璁°�佸幓閲�
-   * 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
-   */
-  getdata = () => {
-    const { data, plot, vFields } = this.state
+      if (!is(fromJS(this.data), fromJS(result.data || []))) {
+        this.data = result.data || []
+        this.handleData()
+      }
 
-    if (!data) {
-      this.setState({empty: true})
-      return []
-    }
-
-    let _data = []
-    let _cdata = fromJS(data).toJS()
-
-    if (plot.repeat === 'average') {
-      let _mdata = new Map()
-      _cdata.forEach(item => {
-        vFields.forEach(col => {
-          if (typeof(item[col.field]) !== 'number') {
-            item[col.field] = parseFloat(item[col.field])
-            if (isNaN(item[col.field])) {
-              item[col.field] = 0
-            }
-          }
-          if (col.show === 'percent') {
-            item[col.field] = item[col.field] * 100
-          }
-        })
-
-        if (item[plot.Xaxis] && !_mdata.has(item[plot.Xaxis])) {
-          item.$count = 1
-          _mdata.set(item[plot.Xaxis], item)
-        } else if (item[plot.Xaxis]) {
-          let _item = _mdata.get(item[plot.Xaxis])
-          _item.$count++
-          vFields.forEach(col => {
-            _item[col.field] += item[col.field]
-          })
-          _mdata.set(item[plot.Xaxis], _item)
-        }
-      })
-
-      _data = [..._mdata.values()]
-      _data = _data.map(item => {
-        vFields.forEach(col => {
-          item[col.field] = item[col.field] / item.$count
-          item[col.field] = item[col.field].toFixed(col.decimal)
-          item[col.field] = +item[col.field]
-        })
-        return item
-      })
-    } else if (plot.repeat === 'cumsum') {
-      let _mdata = new Map()
-      _cdata.forEach(item => {
-        vFields.forEach(col => {
-          if (typeof(item[col.field]) !== 'number') {
-            item[col.field] = parseFloat(item[col.field])
-            if (isNaN(item[col.field])) {
-              item[col.field] = 0
-            }
-          }
-          if (col.show === 'percent') {
-            item[col.field] = item[col.field] * 100
-          }
-        })
-
-        if (item[plot.Xaxis] && !_mdata.has(item[plot.Xaxis])) {
-          _mdata.set(item[plot.Xaxis], item)
-        } else if (item[plot.Xaxis]) {
-          let _item = _mdata.get(item[plot.Xaxis])
-          vFields.forEach(col => {
-            _item[col.field] += item[col.field]
-          })
-          _mdata.set(item[plot.Xaxis], _item)
-        }
-      })
-
-      _data = [..._mdata.values()]
-      _data = _data.map(item => {
-        vFields.forEach(col => {
-          item[col.field] = item[col.field].toFixed(col.decimal)
-          item[col.field] = +item[col.field]
-        })
-        return item
-      })
-    } else { // plot.repeat === 'unrepeat'
-      let _mdata = new Map()
-      _cdata.forEach(item => {
-        if (item[plot.Xaxis] && !_mdata.has(item[plot.Xaxis])) {
-          vFields.forEach(col => {
-            if (typeof(item[col.field]) !== 'number') {
-              item[col.field] = parseFloat(item[col.field])
-              if (isNaN(item[col.field])) {
-                item[col.field] = 0
-              }
-            }
-            if (col.show === 'percent') {
-              item[col.field] = item[col.field] * 100
-            }
-            item[col.field] = item[col.field].toFixed(col.decimal)
-            item[col.field] = +item[col.field]
-          })
-          _mdata.set(item[plot.Xaxis], item)
-        }
-      })
-
-      _data = [..._mdata.values()]
-    }
-
-    if (plot.correction && plot.chartType === 'bar' && _data.length > 0 && _data.length < plot.correction) {
-      if (plot.enabled !== 'true' || (plot.customs && plot.customs.filter(cell => cell.chartType !== 'bar').length === 0)) {
-        let _num = plot.correction - _data.length
-        for (let i = 0; i < _num; i++) {
-          let _val = Array( i + 2 ).join(' ')
-          let _cell = {}
-          _cell[plot.Xaxis] = _val
-          vFields.forEach(col => {
-            _cell[col.field] = ''
-          })
-  
-          _data.push(_cell)
+      if (config.timer && config.clearField && result.data && result.data[0]) {
+        let vals = (config.clearValue || '').split(',')
+        if (vals.includes(result.data[0][config.clearField])) {
+          this.timer && this.timer.stop()
         }
       }
+      if (result.message) {
+        if (result.ErrCode === 'Y') {
+          Modal.success({
+            title: result.message
+          })
+        } else if (result.ErrCode === 'S') {
+          notification.success({
+            top: 92,
+            message: result.message,
+            duration: 2
+          })
+        }
+      }
+    } else {
+      this.setState({
+        loading: false
+      })
+      this.timer && this.timer.stop()
+      
+      if (!result.message) return
+      if (result.ErrCode === 'N') {
+        Modal.error({
+          title: result.message,
+        })
+      } else if (result.ErrCode !== '-2') {
+        notification.error({
+          top: 92,
+          message: result.message,
+          duration: 10
+        })
+      }
     }
-
-    this.setState({empty: _data.length === 0})
-    return _data
   }
 
   /**
-   * @description 缁熻鏁版嵁棰勫鐞嗭紝鍔ㄦ�佺敓鎴愮粺璁″瓧娈靛苟杩涜鏁版嵁杞崲
+   * @description 鏁版嵁棰勫鐞嗭紝缁熻鏁版嵁闇�瑕侀噸缃�
    */
-  getStaticMsg = (data) => {
+  handleData = () => {
+    let _element = document.getElementById(this.state.chartId)
+    if (_element) {
+      _element.innerHTML = ''
+    }
+    setTimeout(() => {
+      this.viewrender()
+    }, 100)
+  }
+
+  getdata = () => {
+    const { plot, vFields, config } = this.state
+
+    if (this.data.length === 0) {
+      this.setState({empty: true})
+      return []
+    } else {
+      this.setState({empty: false})
+    }
+
+    return fromJS(this.data).toJS().map(item => {
+      // dodge is not support linear attribute, please use category attribute! 鏃堕棿鏍煎紡
+      if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
+        item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+      } else {
+        item[plot.Xaxis] = '' + item[plot.Xaxis]
+      }
+
+      vFields.forEach(col => {
+        if (typeof(item[col.field]) !== 'number') {
+          item[col.field] = parseFloat(item[col.field])
+          if (isNaN(item[col.field])) {
+            item[col.field] = 0
+          }
+        }
+        if (col.show === 'percent') {
+          item[col.field] = item[col.field] * 100
+        }
+
+        item[col.field] = item[col.field].toFixed(col.decimal)
+        item[col.field] = +item[col.field]
+      })
+
+      item.$$uuid = item[config.setting.primaryKey] || ''
+
+      return item
+    })
+  }
+
+  /**
+   * @description 缁熻鏁版嵁棰勫鐞�
+   */
+  getStaticMsg = () => {
     const { plot, vstFields } = this.state
 
-    let percent = false
-    let decimal = 0
-
-    if (plot.show === 'percent') {
-      percent = true
-    }
-    if (vstFields) {
-      decimal = vstFields.decimal
-    }
-
-    if (!data) {
+    if (this.data.length === 0) {
       this.setState({empty: true})
-      return {data: [], chartFields: [], selectFields: []}
-    }
-
-    let _data = []
-    let _cdata = fromJS(data).toJS()
-    let _chartFields = []
-    let _selectFields = []
-
-    if (plot.repeat === 'average') {
-      let _mdata = new Map()
-      _cdata.forEach(item => {
-        if (!item[plot.InfoType] || !item[plot.Xaxis]) return
-        _chartFields.push(item[plot.InfoType])
-
-        item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
-        if (typeof(item[plot.InfoValue]) !== 'number') {
-          item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
-          if (isNaN(item[plot.InfoValue])) {
-            item[plot.InfoValue] = 0
-          }
-        }
-        if (percent) {
-          item[plot.InfoValue] = item[plot.InfoValue] * 100
-        }
-
-        if (!_mdata.has(item.$uuid)) {
-          item.$count = 1
-          _mdata.set(item.$uuid, item)
-        } else {
-          let _item = _mdata.get(item.$uuid)
-          _item.$count++
-          _item[plot.InfoValue] += item[plot.InfoValue]
-          _mdata.set(item.$uuid, _item)
-        }
-      })
-
-      _data = [..._mdata.values()]
-      _data = _data.map(item => {
-        item[plot.InfoValue] = item[plot.InfoValue] / item.$count
-        item[plot.InfoValue] = item[plot.InfoValue].toFixed(decimal)
-        item[plot.InfoValue] = +item[plot.InfoValue]
-
-        return item
-      })
-    } else if (plot.repeat === 'cumsum') {
-      let _mdata = new Map()
-      _cdata.forEach(item => {
-        if (!item[plot.InfoType] || !item[plot.Xaxis]) return
-        _chartFields.push(item[plot.InfoType])
-
-        item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
-
-        if (typeof(item[plot.InfoValue]) !== 'number') {
-          item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
-          if (isNaN(item[plot.InfoValue])) {
-            item[plot.InfoValue] = 0
-          }
-        }
-        if (percent) {
-          item[plot.InfoValue] = item[plot.InfoValue] * 100
-        }
-
-        if (!_mdata.has(item.$uuid)) {
-          _mdata.set(item.$uuid, item)
-        } else {
-          let _item = _mdata.get(item.$uuid)
-          _item[plot.InfoValue] += item[plot.InfoValue]
-          _mdata.set(item.$uuid, _item)
-        }
-      })
-
-      _data = [..._mdata.values()]
-      _data = _data.map(item => {
-        item[plot.InfoValue] = item[plot.InfoValue].toFixed(decimal)
-        item[plot.InfoValue] = +item[plot.InfoValue]
-
-        return item
-      })
-    } else { // plot.repeat === 'unrepeat'
-      let _mdata = new Map()
-      _cdata.forEach(item => {
-        if (!item[plot.InfoType] || !item[plot.Xaxis]) return
-        _chartFields.push(item[plot.InfoType])
-
-        item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
-
-        if (!_mdata.has(item.$uuid)) {
-          if (typeof(item[plot.InfoValue]) !== 'number') {
-            item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
-            if (isNaN(item[plot.InfoValue])) {
-              item[plot.InfoValue] = 0
-            }
-          }
-          if (percent) {
-            item[plot.InfoValue] = item[plot.InfoValue] * 100
-          }
-
-          item[plot.InfoValue] = item[plot.InfoValue].toFixed(decimal)
-          item[plot.InfoValue] = +item[plot.InfoValue]
-
-          _mdata.set(item.$uuid, item)
-        }
-      })
-
-      _data = [..._mdata.values()]
-    }
-
-    _chartFields = Array.from(new Set(_chartFields))
-
-    if (plot.InfoDefNumber >= _chartFields.length) {
-      _selectFields = _chartFields
+      return []
     } else {
-      _selectFields = _chartFields.slice(0, plot.InfoDefNumber)
+      this.setState({empty: false})
     }
 
-    return {data: _data, chartFields: _chartFields, selectFields: _selectFields}
-  }
+    let decimal = vstFields ? vstFields.decimal : 0
 
-  /**
-   * @description 鑾峰彇缁熻鍥捐〃灞曠ず鏁版嵁锛岄�氳繃閫夋嫨绫诲瀷绛涢��
-   */
-  getStaticData = () => {
-    const { plot, chartData, chartFields, selectFields } = this.state
+    return fromJS(this.data).toJS().map(item => {
+      if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
+        item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+      }
 
-    let _data = []
-    if (selectFields.length === chartFields.length) {
-      _data = chartData
-    } else {
-      _data = chartData.filter(item => selectFields.includes(item[plot.InfoType]))
-    }
+      if (typeof(item[plot.InfoValue]) !== 'number') {
+        item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
+        if (isNaN(item[plot.InfoValue])) {
+          item[plot.InfoValue] = 0
+        }
+      }
 
-    this.setState({empty: _data.length === 0})
-    return _data
+      if (plot.show === 'percent') {
+        item[plot.InfoValue] = item[plot.InfoValue] * 100
+      }
+
+      item[plot.InfoValue] = item[plot.InfoValue].toFixed(decimal)
+      item[plot.InfoValue] = +item[plot.InfoValue]
+
+      return item
+    })
   }
 
   /**
@@ -520,34 +783,23 @@
    * @description 鎶樼嚎鍥炬覆鏌�
    */
   linerender = () => {
-    const { plot, config, percentFields } = this.state
+    const { plot, transfield } = this.state
 
     let _data = []
     let _valfield = 'value'
     let _typefield = 'key'
-    let ispercent = false
+    let colorIndex = 0
 
     if (plot.datatype === 'statistics') {
       _valfield = plot.InfoValue
       _typefield = plot.InfoType
 
-      if (plot.show === 'percent') {
-        ispercent = true
-      }
-
-      _data = this.getStaticData()
+      _data = this.getStaticMsg()
     } else {
-      let transfield = {}
-      config.columns.forEach(col => {
-        if (col.field) {
-          transfield[col.field] = col.label
-        }
-      })
-  
       let data = this.getdata()
 
       if (plot.enabled === 'true') {
-        this.customrender(data, transfield)
+        this.customrender(data)
         return
       }
   
@@ -574,11 +826,11 @@
   
       _data = dv.rows
     }
-    
+
     const chart = new Chart({
       container: this.state.chartId,
       autoFit: true,
-      height: plot.height || 400
+      height: plot.height
     })
 
     chart.data(_data)
@@ -588,28 +840,29 @@
         range: [0, 1]
       })
     }
-    chart.scale(_valfield, {
+
+    let c = {
       nice: true,
-      range: [0, 0.93]
-    })
+      range: [0, 0.9]
+    }
 
-    // 鍧愭爣杞存牸寮忓寲
-    chart.axis(plot.Xaxis, {
-      label: {
-        formatter: (val) => {
-          if (!val || /^\s*$/.test(val)) return val
-          let _val = `${val}`
-          if (_val.length <= 11) return val
-          return _val.substring(0, 8) + '...'
-        }
-      }
-    })
+    if (plot.min || plot.min === 0) {
+      c.min = plot.min
+    }
+    if (plot.max || plot.max === 0) {
+      c.max = plot.max
+    }
+    chart.scale(_valfield, c)
 
-    if (!plot.legend || plot.legend === 'hidden') {
+    chart.axis(plot.Xaxis, plot.$xc)
+    chart.axis(_valfield, plot.$yc)
+
+    if (!plot.legend) {
       chart.legend(false)
     } else {
       chart.legend({
-        position: plot.legend
+        position: plot.legend,
+        itemName: { style: { fill: plot.color } }
       })
     }
 
@@ -635,116 +888,196 @@
     let _chart = chart
       .line()
       .position(`${plot.Xaxis}*${_valfield}`)
-      .color(_typefield)
       .shape(plot.shape || 'smooth')
       .tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+        let val = value
+        if (plot.show === 'percent') {
+          val = value + '%'
+        } else if (plot.show === 'thdSeparator') {
+          val = val + ''
+          val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+        }
+
         return {
           name: type,
-          value: percentFields.includes(type) || ispercent ? value + '%' : value
+          value: val
         }
       })
 
-    if (plot.label === 'true') {
-      _chart.label(_valfield)
+    if (plot.$colors) {
+      let limit = chartColors.length
+      _chart.color(_typefield, (key) => {
+        if (plot.$colors.has(key)) {
+          if (plot.area === 'true' && plot.rampDirection === 'vertical') {
+            return plot.$colors.get(key).replace(/l\(9?0\) 0:|\s1:.*/ig, '')
+          }
+          return plot.$colors.get(key)
+        } else {
+          colorIndex++
+          return chartColors[(colorIndex - 1) % limit]
+        }
+      })
+    } else {
+      _chart.color(_typefield)
+    }
+    if (plot.label !== 'false') {
+      _chart.label(_valfield, (value) => {
+        let val = value
+        if (plot.show === 'percent') {
+          val = value + '%'
+        } else if (plot.show === 'thdSeparator') {
+          val = val + ''
+          val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+        }
+        return {
+          content: val,
+          style: {
+            fill: plot.color
+          }
+        }
+      })
     }
 
     if (plot.point === 'true') {
-      chart
+      let _chart = chart
         .point()
         .position(`${plot.Xaxis}*${_valfield}`)
-        .color(_typefield)
         .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 {
+            colorIndex++
+            return chartColors[(colorIndex - 1) % limit]
+          }
+        })
+      } else {
+        _chart.color(_typefield)
+      }
+    }
+
+    if (plot.area === 'true') {
+      let area = chart
+        .area()
+        // .shape(plot.shape || 'smooth')
+        .position(`${plot.Xaxis}*${_valfield}`)
+        .tooltip(false)
+
+      if (plot.shape === 'smooth') {
+        area.shape('smooth')
+      }
+      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()
+
+    this.setState({chart})
   }
 
   /**
    * @description 鑷畾涔夋覆鏌�
    */
-  customrender = (data, transfield) => {
-    const { plot, percentFields } = this.state
+  customrender = (data) => {
+    const { plot, transfield } = this.state
 
-    let barfields = []
-    let fields = []
-    let legends = []
-
-    plot.customs.forEach(item => {
-      item.name = transfield[item.field] || item.field
-      if (item.axis === 'left') {
-        item.index = 0
-      } else if (item.axis === 'right') {
-        item.index = 1
-      } else {
-        item.index = 2
-      }
-
-      if (item.chartType === 'bar') {
-        barfields.push(item.field)
-        fields.unshift(item)
-      } else {
-        fields.push(item)
-      }
-
-      legends.push({
-        value: item.name,
-        name: item.name,
-        marker: { symbol: item.chartType === 'bar' ? 'square' : 'hyphen', style: { stroke: item.color,fill: item.color, r: 5, lineWidth: 2 } }
+    let max = 0
+    if (plot.zoomYaxis === 'adjust') {
+      data.forEach(item => {
+        if (plot.zoomFields) {
+          plot.zoomFields.forEach(f => {
+            if (item[f] > max) {
+              max = item[f]
+            }
+          })
+          let sum = 0
+          plot.Bar_axis.forEach(f => {
+            sum += item[f]
+          })
+          if (sum > max) {
+            max = sum
+          }
+        } else {
+          plot.Yaxis.forEach(f => {
+            if (item[f] > max) {
+              max = item[f]
+            }
+          })
+        }
       })
-    })
 
-    fields.sort((a, b) => a.index - b.index)
+      if (!isNaN(max)) {
+        max = Math.ceil(max)
+        let s = max > 10 ? Math.pow(10, (max + '').length - 2) : 1
+        max = Math.ceil(max / s) * s
+      } else {
+        max = 0
+      }
+    }
 
     const ds = new DataSet()
     const dv = ds.createView().source(data)
+
     dv.transform({
       type: 'map',
       callback(row) {
-        fields.forEach(line => {
-          row[line.name] = row[line.field]
+        plot.customs.forEach(line => {
+          row[line.name] = row[line.type]
         })
         return row
       }
     })
 
+    let padding = [10, 30, 30, 30]
+
+    if (!plot.Bar_axis) {
+      padding = [10, plot.$paddingRight, 30, plot.$paddingLeft]
+    }
+
     const chart = new Chart({
       container: this.state.chartId,
       autoFit: true,
-      height: plot.height || 400
+      height: plot.height
     })
+    
+    // 鍧愭爣杞存牸寮忓寲
+    chart.axis(plot.Xaxis, plot.$xc)
 
-    chart.data(dv.rows)
-
-    if (plot.coordinate !== 'polar' && barfields.length === 0) {
+    if (!plot.hasBar) {
       chart.scale(plot.Xaxis, {
         range: [0, 1]
       })
-    } else {
-      chart.scale(plot.Xaxis, {
-        range: [0.05, 0.95]
-      })
     }
-    
-    // 鍧愭爣杞存牸寮忓寲
-    chart.axis(plot.Xaxis, {
-      label: {
-        formatter: (val) => {
-          if (!val || /^\s*$/.test(val)) return val
-          let _val = `${val}`
-          if (_val.length <= 11) return val
-          return _val.substring(0, 8) + '...'
-        }
-      }
-    })
 
-    if (!plot.legend || plot.legend === 'hidden') {
+    if (!plot.legend) {
       chart.legend(false)
     } else {
       chart.legend({
         custom: true,
         position: plot.legend,
-        items: legends,
+        items: plot.legends,
+        itemName: { style: { fill: plot.color } }
       })
     }
 
@@ -756,69 +1089,372 @@
       })
     }
 
-    if (plot.transpose === 'true') {
-      chart.coordinate().transpose()
+    chart.scale({
+      nice: true
+    })
+
+    let lablecfg = {
+      position: 'top',
+      offset: 2,
+      style: {
+        fill: '#fff'
+      }
     }
 
-    if (plot.coordinate === 'polar') {
-      chart.coordinate('polar', {
-        innerRadius: 0.1,
-        radius: 0.8
+    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 },
+          end: { x: 1, y: 1 }
+        },
+        padding
+      })
+      const dst = new DataSet()
+      const dvt = dst.createView().source(data)
+  
+      dvt.transform({
+        type: 'fold',
+        fields: [...plot.Bar_axis],
+        key: 'key',
+        value: 'value'
+      })
+  
+      dvt.transform({
+        type: 'map',
+        callback(row) {
+          row.key = transfield[row.key] || row.key
+          return row
+        },
+      })
+
+      view1.data(dvt.rows)
+
+      let c = {
+        nice: true,
+        range: [0, 0.9]
+      }
+  
+      if (plot.zoomYaxis === 'adjust') {
+        if (max) {
+          c.min = 0
+          c.max = max
+        }
+      } else {
+        if (plot.min || plot.min === 0) {
+          c.min = plot.min
+        }
+        if (plot.max || plot.max === 0) {
+          c.max = plot.max
+          c.min = c.min || 0
+        }
+      }
+      view1.scale('value', c)
+      view1.axis('value', plot.$yc)
+  
+      if (plot.legend) {
+        view1.legend(false)
+      }
+
+      let colorIndex = 0
+  
+      if (plot.mutilBar !== 'stack') {
+        let _chart = view1
+          .interval()
+          .position(`${plot.Xaxis}*value`)
+          .adjust([
+            {
+              type: 'dodge',
+              marginRatio: 0
+            }
+          ])
+          .shape(plot.shape || 'rect')
+          .tooltip(`${plot.Xaxis}*value*key`, (name, value, key) => {
+            let val = value
+            if (plot.show === 'percent') {
+              val = value + '%'
+            } else if (plot.show === 'thdSeparator') {
+              val = val + ''
+              val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+            }
+            return {
+              name: key,
+              value: val
+            }
+          })
+
+        if (plot.$colors) {
+          let limit = chartColors.length
+          _chart.color('key', (key) => {
+            if (plot.$colors.has(key)) {
+              return plot.$colors.get(key)
+            } else {
+              colorIndex++
+              return chartColors[(colorIndex - 1) % limit]
+            }
+          })
+        } else {
+          _chart.color('key')
+        }
+        if (plot.$label !== 'false') {
+          _chart.label('value*key', (value, key) => {
+            if (plot.$label !== 'true' && value === 0) {
+              return null
+            }
+
+            let val = value
+            if (plot.show === 'percent') {
+              val = value + '%'
+            } else if (plot.show === 'thdSeparator') {
+              val = val + ''
+              val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+            }
+
+            if (plot.$label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+              lablecfg.style.fill = plot.$colors.get(key)
+            }
+            return {
+              content: val,
+              ...lablecfg
+            }
+          })
+        }
+
+        if (plot.barSize) {
+          _chart.size(plot.barSize || 35)
+        }
+        if (plot.barRadius) {
+          _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
+        }
+      } else if (plot.mutilBar === 'stack') {
+        let _chart = view1
+          .interval()
+          .position(`${plot.Xaxis}*value`)
+          .adjust('stack')
+          .shape(plot.shape || 'rect')
+          .tooltip(`${plot.Xaxis}*value*key`, (name, value, type) => {
+            let val = value
+            if (plot.show === 'percent') {
+              val = value + '%'
+            } else if (plot.show === 'thdSeparator') {
+              val = val + ''
+              val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+            }
+            return {
+              name: type,
+              value: val
+            }
+          })
+  
+        if (plot.$colors) {
+          let limit = chartColors.length
+          _chart.color('key', (key) => {
+            if (plot.$colors.has(key)) {
+              return plot.$colors.get(key)
+            } else {
+              colorIndex++
+              return chartColors[(colorIndex - 1) % limit]
+            }
+          })
+        } else {
+          _chart.color('key')
+        }
+        if (plot.$label !== 'false') {
+          _chart.label('value*key', (value, key) => {
+            if (plot.$label !== 'true' && value === 0) {
+              return null
+            }
+
+            let val = value
+            if (plot.show === 'percent') {
+              val = value + '%'
+            } else if (plot.show === 'thdSeparator') {
+              val = val + ''
+              val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+            }
+            if (plot.$label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+              lablecfg.style.fill = plot.$colors.get(key)
+            }
+            return {
+              content: val,
+              ...lablecfg
+            }
+          })
+        }
+
+        if (plot.barSize) {
+          _chart.size(plot.barSize || 35)
+        }
+        if (plot.barRadius) {
+          _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
+        }
+      }
+    }
+
+    let view2 = chart
+
+    if (plot.Bar_axis) {
+      view2 = chart.createView({
+        region: {
+          start: { x: 0, y: 0 },
+          end: { x: 1, y: 1 }
+        },
+        padding
       })
     }
 
-    fields.forEach((item, i) => {
-      if (i === 0) {
-        chart.axis(item.name, {
-          grid: {},
-          title: {},
-          label: {}
-        })
-      } else if (i === 1 && item.axis !== 'unset') {
-        chart.axis(item.name, {
-          grid: null,
-          title: {},
-          label: {}
-        })
-      } else {
-        chart.axis(item.name, {
-          grid: null,
-          title: null,
-          label: null
-        })
-      }
+    view2.data(dv.rows)
 
-      if (item.chartType === 'bar') {
-        let _chart = chart
+    if (plot.legend && plot.Bar_axis) {
+      view2.legend(false)
+    }
+
+    plot.customs.forEach(item => {
+      if (item.chartType === 'bar' && !plot.Bar_axis) {
+        view2.axis(item.name, item.axis)
+      
+        let c = {
+          nice: true,
+          range: [0, 0.9]
+        }
+    
+        if (plot.zoomYaxis === 'adjust') {
+          if (max) {
+            c.min = 0
+            c.max = max
+          }
+        } else {
+          if (item.min || item.min === 0) {
+            c.min = item.min
+          }
+          if (item.max || item.max === 0) {
+            c.max = item.max
+          }
+        }
+
+        view2.scale(item.name, c)
+        let _chart = view2
           .interval()
           .position(`${plot.Xaxis}*${item.name}`)
           .color(item.color)
           .shape(item.shape)
           .tooltip(`${item.name}`, (value) => {
+            let val = value
+            if (item.show === 'percent') {
+              val = value + '%'
+            } else if (item.show === 'thdSeparator') {
+              val = val + ''
+              val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+            }
             return {
               name: item.name,
-              value: percentFields.includes(item.name) ? value + '%' : value
+              value: val
             }
           })
 
-        if (item.label === 'true') {
-          _chart.label(item.name)
+        if (plot.barSize) {
+          _chart.size(plot.barSize || 35)
+        }
+        if (item.label !== 'false') {
+          _chart.label(item.name, (value) => {
+            if (plot.label !== 'true' && value === 0) {
+              return null
+            }
+
+            let val = value
+            if (item.show === 'percent') {
+              val = value + '%'
+            } else if (item.show === 'thdSeparator') {
+              val = val + ''
+              val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+            }
+            if (plot.label === 'true' && plot.labelColor === 'custom' && item.color) {
+              lablecfg.style.fill = item.color
+            }
+            return {
+              content: val,
+              ...lablecfg
+            }
+          })
+        }
+        if (plot.barRadius) {
+          _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
         }
       } else if (item.chartType === 'line') {
-        let _chart = chart
+        if (!plot.Bar_axis) {
+          view2.axis(item.name, item.axis)
+        } else {
+          view2.axis(item.name, { grid: null, title: null, label: null })
+        }
+        let c = {
+          nice: true,
+          range: [0, 0.9]
+        }
+    
+        if (plot.zoomYaxis === 'adjust') {
+          if (max) {
+            c.min = 0
+            c.max = max
+          }
+        } else {
+          if (item.min || item.min === 0) {
+            c.min = item.min
+          }
+          if (item.max || item.max === 0) {
+            c.max = item.max
+          }
+        }
+
+        view2.scale(item.name, c)
+        let _chart = view2
           .line()
           .position(`${plot.Xaxis}*${item.name}`)
           .color(item.color)
           .shape(item.shape)
           .tooltip(`${item.name}`, (value) => {
+            let val = value
+            if (item.show === 'percent') {
+              val = value + '%'
+            } else if (item.show === 'thdSeparator') {
+              val = val + ''
+              val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+            }
+
             return {
               name: item.name,
-              value: percentFields.includes(item.name) ? value + '%' : value
+              value: val
             }
           })
 
         if (item.label === 'true') {
-          _chart.label(item.name)
+          _chart.label(item.name, (value) => {
+            let val = value
+            if (item.show === 'percent') {
+              val = value + '%'
+            } else if (item.show === 'thdSeparator') {
+              val = val + ''
+              val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+            }
+
+            return {
+              content: val,
+              style: {
+                fill: plot.color
+              }
+            }
+          })
         }
 
         if (plot.point === 'true') {
@@ -832,42 +1468,52 @@
       }
     })
 
+    if (plot.interaction && plot.interaction.length) {
+      plot.interaction.forEach(t => {
+        if (t === 'element-active' || t === 'element-highlight') {
+          chart.interaction(t)
+        }
+      })
+    }
+
     chart.render()
+
+    this.setState({chart})
   }
 
   /**
    * @description 鏌辩姸鍥炬覆鏌�
    */
   barrender = () => {
-    const { plot, config, percentFields } = this.state
+    const { plot, transfield, config } = this.state
 
     let _data = []
     let _valfield = 'value'
     let _typefield = 'key'
-    let ispercent = false
+    let colorIndex = 0
+    let barcolors = {}
 
     if (plot.datatype === 'statistics') {
       _valfield = plot.InfoValue
       _typefield = plot.InfoType
 
-      if (plot.show === 'percent') {
-        ispercent = true
-      }
-
-      _data = this.getStaticData()
+      _data = this.getStaticMsg()
     } else {
-      let transfield = {}
-      config.columns.forEach(col => {
-        if (col.field) {
-          transfield[col.field] = col.label
-        }
-      })
-
       let data = this.getdata()
 
       if (plot.enabled === 'true') {
-        this.customrender(data, transfield)
+        this.customrender(data)
         return
+      }
+
+      if (plot.barcolors && plot.barcolors.length > 0 && plot.Yaxis.length === 1) {
+        data.forEach((item, i) => {
+          if (plot.barcolors[i]) {
+            barcolors[item[plot.Xaxis]] = plot.barcolors[i].color
+          }
+        })
+      } else {
+        barcolors = null
       }
 
       const ds = new DataSet()
@@ -896,45 +1542,34 @@
     const chart = new Chart({
       container: this.state.chartId,
       autoFit: true,
-      height: plot.height || 400
+      height: plot.height
     })
-
-    // dodge is not support linear attribute, please use category attribute! 鏃堕棿鏍煎紡
-    if (_data[0] && _data[0][plot.Xaxis] && /^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(_data[0][plot.Xaxis])) {
-      for (let i = 1; i < 12; i++) {
-        if (_data[i] && _data[i][plot.Xaxis] === _data[0][plot.Xaxis]) {
-          _data[i][plot.Xaxis] += ' '
-        } else {
-          break;
-        }
-      }
-      _data[0][plot.Xaxis] += ' '
-    }
 
     chart.data(_data)
 
-    chart.scale(_valfield, {
+    let c = {
       nice: true,
-      range: [0, 0.93]
-    })
+      range: [0, 0.9]
+    }
 
-    // 鍧愭爣杞存牸寮忓寲
-    chart.axis(plot.Xaxis, {
-      label: {
-        formatter: (val) => {
-          if (!val || /^\s*$/.test(val)) return val
-          let _val = `${val}`
-          if (_val.length <= 11) return val
-          return _val.substring(0, 8) + '...'
-        }
-      }
-    })
+    if (plot.min || plot.min === 0) {
+      c.min = plot.min
+    }
+    if (plot.max || plot.max === 0) {
+      c.max = plot.max
+      c.min = c.min || 0
+    }
+    chart.scale(_valfield, c)
 
-    if (!plot.legend || plot.legend === 'hidden') {
+    chart.axis(plot.Xaxis, plot.$xc)
+    chart.axis(_valfield, plot.$yc)
+
+    if (!plot.legend) {
       chart.legend(false)
     } else {
       chart.legend({
-        position: plot.legend
+        position: plot.legend,
+        itemName: { style: { fill: plot.color } }
       })
     }
 
@@ -947,8 +1582,44 @@
       })
     }
 
+    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()
+      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') {
@@ -962,7 +1633,6 @@
       let _chart = chart
         .interval()
         .position(`${plot.Xaxis}*${_valfield}`)
-        .color(_typefield)
         .adjust([
           {
             type: 'dodge',
@@ -971,77 +1641,317 @@
         ])
         .shape(plot.shape || 'rect')
         .tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+          let val = value
+          if (plot.show === 'percent') {
+            val = value + '%'
+          } else if (plot.show === 'thdSeparator') {
+            val = val + ''
+            val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+          }
           return {
             name: type,
-            value: percentFields.includes(type) || ispercent ? value + '%' : value
+            value: val
           }
         })
 
-      if (plot.label === 'true') {
-        _chart.label(_valfield)
+      if (plot.$colors) {
+        let limit = chartColors.length
+
+        if (barcolors) {
+          _chart.color(`${_typefield}*${plot.Xaxis}`, (key, label) => {
+            if (barcolors[label]) {
+              return barcolors[label]
+            } else if (plot.$colors.has(key)) {
+              return plot.$colors.get(key)
+            } else {
+              colorIndex++
+              return chartColors[(colorIndex - 1) % limit]
+            }
+          })
+        } else {
+          _chart.color(`${_typefield}`, (key) => {
+            if (plot.$colors.has(key)) {
+              return plot.$colors.get(key)
+            } else {
+              colorIndex++
+              return chartColors[(colorIndex - 1) % limit]
+            }
+          })
+        }
+      } else {
+        _chart.color(_typefield)
+      }
+      if (plot.label !== 'false') {
+        _chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+          if (plot.label !== 'true' && value === 0) {
+            return null
+          }
+
+          let val = value
+          if (plot.show === 'percent') {
+            val = value + '%'
+          } else if (plot.show === 'thdSeparator') {
+            val = val + ''
+            val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+          }
+
+          if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+            lablecfg.style.fill = plot.$colors.get(key)
+          }
+
+          return {
+            content: val,
+            ...lablecfg
+          }
+        })
+      }
+
+      if (plot.barSize) {
+        _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] })
       }
     } else if (plot.adjust === 'stack') {
       let _chart = chart
         .interval()
         .position(`${plot.Xaxis}*${_valfield}`)
-        .color(_typefield)
         .adjust('stack')
         .shape(plot.shape || 'rect')
         .tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+          let val = value
+          if (plot.show === 'percent') {
+            val = value + '%'
+          } else if (plot.show === 'thdSeparator') {
+            val = val + ''
+            val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+          }
           return {
             name: type,
-            value: percentFields.includes(type) || ispercent ? value + '%' : value
+            value: val
           }
         })
 
-      if (plot.label === 'true') {
-        _chart.label(_valfield)
+      if (plot.$colors) {
+        let limit = chartColors.length
+        if (barcolors) {
+          _chart.color(`${_typefield}*${plot.Xaxis}`, (key, label) => {
+            if (barcolors[label]) {
+              return barcolors[label]
+            } else if (plot.$colors.has(key)) {
+              return plot.$colors.get(key)
+            } else {
+              colorIndex++
+              return chartColors[(colorIndex - 1) % limit]
+            }
+          })
+        } else {
+          _chart.color(`${_typefield}`, (key) => {
+            if (plot.$colors.has(key)) {
+              return plot.$colors.get(key)
+            } else {
+              colorIndex++
+              return chartColors[(colorIndex - 1) % limit]
+            }
+          })
+        }
+      } else {
+        _chart.color(_typefield)
+      }
+      if (plot.label !== 'false') {
+        _chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+          if (plot.label !== 'true' && value === 0) {
+            return null
+          }
+
+          let val = value
+          if (plot.show === 'percent') {
+            val = value + '%'
+          } else if (plot.show === 'thdSeparator') {
+            val = val + ''
+            val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+          }
+
+          if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+            lablecfg.style.fill = plot.$colors.get(key)
+          }
+
+          return {
+            content: val,
+            ...lablecfg
+          }
+        })
+      }
+
+      if (plot.barSize) {
+        _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] })
       }
     }
 
+    chart.on('element:click', (ev) => {
+      let data = ev.data.data
+
+      if (plot.click === 'menus') {
+        let menu = null
+        
+        if (plot.menus && plot.menus.length > 0) {
+          let s = data[plot.menuType] + ''
+          plot.menus.forEach(m => {
+            if (s !== m.sign) return
+            menu = m
+          })
+        }
+        if (!menu || !menu.MenuID) return
+  
+        let newtab = {
+          MenuID: menu.MenuID,
+          MenuName: menu.MenuName,
+          MenuNo: menu.MenuNo || '',
+          type: menu.tabType,
+          param: {}
+        }
+  
+        if (plot.joint === 'true') {
+          newtab.param.$BID = data.$$uuid || ''
+
+          Object.keys(data).forEach(key => {
+            if (/^\$/.test(key)) return
+            newtab.param[key] = data[key]
+          })
+        }
+  
+        MKEmitter.emit('modifyTabs', newtab, true)
+      } else if (plot.click === 'menu') {
+        let menuId = plot.menu.slice(-1)[0]
+        let menu = null
+
+        if (window.GLOB.mkThdMenus.has(menuId)) {
+          menu = {...window.GLOB.mkThdMenus.get(menuId)}
+        } else if (plot.MenuID) {
+          menu = {
+            MenuID: plot.MenuID,
+            MenuName: plot.MenuName,
+            type: plot.tabType
+          }
+        }
+
+        if (!menu) return
+  
+        menu.param = {}
+  
+        if (plot.joint === 'true') {
+          menu.param.$BID = data.$$uuid || ''
+
+          Object.keys(data).forEach(key => {
+            if (/^\$/.test(key)) return
+            menu.param[key] = data[key]
+          })
+        }
+  
+        MKEmitter.emit('modifyTabs', menu, true)
+      } else {
+        MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data)
+      }
+    })
+
+    if (plot.interaction && plot.interaction.length) {
+      plot.interaction.forEach(t => {
+        chart.interaction(t)
+      })
+    }
+
     chart.render()
+
+    this.setState({chart})
   }
 
-  /**
-   * @description 缁熻鍥捐〃锛岀粺璁$被鍨嬪垏鎹�
-   */
-  handleChange = (val) => {
-    this.setState({selectFields: val}, () => {
-      let _element = document.getElementById(this.state.chartId)
-      if (_element) {
-        _element.innerHTML = ''
-      }
-      this.viewrender()
+  refreshSearch = (list) => {
+    this.setState({search: list}, () => {
+      this.loadData()
     })
   }
 
+  downloadImage = () => {
+    const { chart, config } = this.state
+    const link = document.createElement('a');
+    const filename = `${config.name}${moment().format('YYYY-MM-DD HH_mm_ss')}.png`;
+    const canvas = chart.getCanvas();
+    canvas.get('timeline').stopAllAnimations();
+  
+    setTimeout(() => {
+      const canvas = chart.getCanvas();
+      const canvasDom = canvas.get('el');
+      const dataURL = canvasDom.toDataURL('image/png');
+
+      if (window.Blob && window.URL) {
+        const arr = dataURL.split(',');
+        const mime = arr[0].match(/:(.*?);/)[1];
+        const bstr = atob(arr[1]);
+        let n = bstr.length;
+        const u8arr = new Uint8Array(n);
+        while (n--) {
+          u8arr[n] = bstr.charCodeAt(n);
+        }
+        const blobObj = new Blob([u8arr], { type: mime });
+        if (window.navigator.msSaveBlob) {
+          window.navigator.msSaveBlob(blobObj, filename);
+        } else {
+          link.addEventListener('click', () => {
+            link.download = filename;
+            link.href = window.URL.createObjectURL(blobObj);
+          });
+        }
+      }
+      const e = document.createEvent('MouseEvents');
+      e.initEvent('click', false, false);
+      link.dispatchEvent(e);
+    }, 16);
+  }
+
   render() {
-    const { BID } = this.props
-    const { config, loading, title, plot, empty, chartFields, selectFields } = this.state
+    const { config, loading, empty, BID } = this.state
+
+    let style = {...config.style}
+    if (empty && config.plot.empty === 'hidden') {
+      style.opacity = 0
+      style.position = 'absolute'
+      style.zIndex = -1
+      style.width = '100%'
+    }
 
     return (
-      <div className="custom-line-chart-plot-box">
-        {/* <searchLine /> */}
-        {title ? <p className="chart-title">{title}</p> : null}
+      <div className="custom-line-chart-plot-box" id={'anchor' + config.uuid} style={style}>
         {loading ?
           <div className="loading-mask">
             <div className="ant-spin-blur"></div>
             <Spin />
           </div> : null
         }
-        {plot.datatype === 'statistics' && chartFields.length > 0 ? <Select
-          mode="multiple"
-          showSearch
-          showArrow={true}
-          value={selectFields}
-          onChange={this.handleChange}
-          maxTagCount={0}
-          maxTagPlaceholder={(option) => <div className="type-label">{option.join('銆�')}</div>}
-        >
-          {chartFields.map((item, i) => <Select.Option key={i} value={item}>{item}</Select.Option>)}
-        </Select> : null}
+        <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
         <div className="canvas-wrap">
-          <div className={'chart-action ' + (plot.title ? 'with-title' : '')}>
+          {config.plot.download === 'enable' && this.state.chart && !empty ? <DownloadOutlined onClick={this.downloadImage} className="system-color download"/> : null}
+          <div className={'chart-action' + (config.plot.download === 'enable' ? ' downable' : '')}>
             {config.action.map(item => {
               if (item.OpenType === 'excelOut') {
                 return (
@@ -1051,8 +1961,6 @@
                     btn={item}
                     show="icon"
                     setting={config.setting}
-                    getexceloutparam={this.props.getexceloutparam}
-                    updateStatus={() => {}}
                   />
                 )
               } else {
@@ -1063,13 +1971,12 @@
                     btn={item}
                     show="icon"
                     setting={config.setting}
-                    updateStatus={() => {}}
                   />
                 )
               }
             })}
           </div>
-          <div className={'canvas' + (empty ? ' empty' : '')} style={{minHeight: plot.height ? plot.height : 400}} id={this.state.chartId}></div>
+          <div className={'canvas' + (empty ? ' empty' : '')} id={this.state.chartId}></div>
         </div>
         {empty ? <Empty description={false}/> : null}
       </div>

--
Gitblit v1.8.0