From f07c42a322f41e14ef5b1bf8f2fd66fc5d338cdd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 六月 2023 18:17:09 +0800
Subject: [PATCH] 2023-06-28

---
 src/tabviews/custom/components/chart/antv-bar-line/index.jsx |  530 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 381 insertions(+), 149 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 febdcc4..68651c3 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -3,7 +3,8 @@
 import { is, fromJS } from 'immutable'
 import { Chart } from '@antv/g2'
 import DataSet from '@antv/data-set'
-import { Spin, Empty, notification } from 'antd'
+import { Spin, Empty, notification, Modal } from 'antd'
+import { DownloadOutlined } from '@ant-design/icons'
 import moment from 'moment'
 
 import asyncComponent from './asyncButtonComponent'
@@ -12,20 +13,18 @@
 import Utils from '@/utils/utils.js'
 import UtilsDM from '@/utils/utils-datamanage.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 NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
 const ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
 const ExcelInButton = asyncComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
 
 class LineChart extends Component {
   static propTpyes = {
-    BID: PropTypes.any,              // 鐖剁骇Id
     data: PropTypes.array,           // 缁熶竴鏌ヨ鏁版嵁
     config: PropTypes.object,        // 缁勪欢閰嶇疆淇℃伅
     mainSearch: PropTypes.any,       // 澶栧眰鎼滅储鏉′欢
-    menuType: PropTypes.any,         // 鑿滃崟绫诲瀷
   }
 
   state = {
@@ -37,23 +36,36 @@
     transfield: {},            // 瀛楁鍚嶇О缈昏瘧
     sync: false,               // 鏄惁缁熶竴璇锋眰鏁版嵁
     plot: null,                // 鍥捐〃璁剧疆
-    data: null,                // 鏁版嵁
     search: null,              // 鎼滅储鏉′欢
     vFields: [],               // 鏁板�煎瓧娈�
     vstFields: null,           // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
+    chart: null
   }
 
+  data = []
+
   UNSAFE_componentWillMount () {
-    const { config, data, initdata, BID } = this.props
+    const { config, data, initdata } = this.props
     let _config = fromJS(config).toJS()
-    let _data = null
     let _sync = config.setting.sync === 'true'
 
-    if (config.setting.sync === 'true' && data) {
-      _data = data[config.dataName] || []
+    let BID = ''
+    let BData = ''
+
+    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 || ''
+    }
+
+    if (_sync && data) {
+      this.data = data[config.dataName] || []
       _sync = false
-    } else if (config.setting.sync === 'true' && initdata) {
-      _data = initdata || []
+    } else if (_sync && initdata) {
+      this.data = initdata || []
       _sync = false
     }
 
@@ -95,7 +107,13 @@
       })
     }
 
-    _config.style.height = config.plot.height || 400
+    _config.plot.height = Utils.getHeight(_config.plot.height)
+    _config.style.height = 'auto'
+    _config.style.minHeight = _config.plot.height + 30
+
+    if (_config.plot.title) {
+      _config.style.minHeight = _config.style.minHeight + 45
+    }
 
     let transfield = {}
     _config.columns.forEach(col => {
@@ -124,7 +142,7 @@
 
       _config.plot.hasBar = Bar_axis.length > 0
 
-      if (_config.plot.mutilBar !== 'overlap') {
+      if (_config.plot.mutilBar !== 'overlap' && Bar_axis.length > 1) {
         _config.plot.Bar_axis = Bar_axis
       }
     } else {
@@ -196,12 +214,14 @@
       _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 <= 11) return val
-        return _val.substring(0, 8) + '...'
+        if (_val.length <= limit) return val
+        return _val.substring(0, limit) + '...'
       },
       style: { fill: _config.plot.color }
     }}
@@ -235,7 +255,8 @@
       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)
@@ -292,15 +313,27 @@
           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]
+        }
+      })
     }
 
     this.setState({
       config: _config,
-      data: _data,
       BID: BID || '',
       vFields: vFields,
       vstFields: vstFields,
@@ -311,11 +344,15 @@
       transfield
     }, () => {
       if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
-        this.loadData()
-      } else if (config.setting.sync === 'true' && _data) {
-        this.handleData()
+        setTimeout(() => {
+          this.loadData()
+        }, _config.setting.delay || 0)
       }
     })
+
+    if (this.data.length > 0) {
+      this.handleData()
+    }
   }
 
   /**
@@ -330,10 +367,13 @@
         _data = nextProps.data[config.dataName] || []
       }
 
-      this.setState({sync: false, data: _data}, () => {
+      if (!is(fromJS(this.data), fromJS(_data))) {
+        this.data = _data
         this.handleData()
-      })
-    } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+      }
+
+      this.setState({sync: false})
+    } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
       this.setState({}, () => {
         this.loadData()
       })
@@ -345,18 +385,36 @@
   }
 
   componentDidMount () {
+    const { config, sync } = this.state
+
     MKEmitter.addListener('reloadData', this.reloadData)
     MKEmitter.addListener('resetSelectLine', this.resetParentParam)
     MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
     MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
-    this.handleTimer()
+    
+    if (config.timer) {
+      this.timer = new TimerTask()
+      this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
+        this.loadData(true)
+      })
+    }
+
+    if (config.$cache && (config.setting.sync !== 'true' || sync)) {
+      Api.getLCacheConfig(config.uuid).then(res => {
+        if (!res || this.data.length > 0) return
+
+        if (!is(fromJS(this.data), fromJS(res))) {
+          this.data = res
+          this.handleData()
+        }
+      })
+    }
   }
 
   /**
    * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
    */
   componentWillUnmount () {
-    clearTimeout(this.timer)
     this.setState = () => {
       return
     }
@@ -364,56 +422,8 @@
     MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
     MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
     MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
-  }
 
-  handleTimer = () => {
-    const { config } = this.state
-
-    if (!config.timer) return
-
-    const _change = { '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
-
-    let timer = _change[config.timer]
-
-    if (!timer) return
-
-    let _param = {
-      func: 's_get_timers_role',
-      LText: `select '${window.GLOB.appkey || ''}','${config.uuid}'`,
-      timer_type: config.timer,
-      component_id: config.uuid
-    }
-    
-    _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')          // 鏃堕棿鎴�
-    _param.LText = Utils.formatOptions(_param.LText)                   // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
-    _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp)   // md5瀵嗛挜
-
-    Api.getSystemConfig(_param).then(result => {
-      if (!result.status) {
-        notification.warning({
-          top: 92,
-          message: result.message,
-          duration: 5
-        })
-        return
-      } else if (result.run_type) {
-        this.setState({timer})
-        this.timer = setTimeout(() => {
-          this.timerTask()
-        }, timer)
-      }
-    })
-  }
-
-  timerTask = () => {
-    const { timer } = this.state
-    if (!timer) return
-    
-    this.loadData(true)
-    
-    this.timer = setTimeout(() => {
-      this.timerTask()
-    }, timer)
+    this.timer && this.timer.stop()
   }
 
   /**
@@ -427,16 +437,13 @@
 
     if (config.uuid !== menuId) return
 
-    this.loadData()                                                            // 鏁版嵁鍒锋柊
-
-    if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
-      MKEmitter.emit('reloadData', btn.syncComponentId)                        // 鍚岀骇鏍囩鍒锋柊
+    if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+      MKEmitter.emit('reloadData', config.setting.supModule, BID)
+    } else {
+      this.loadData()
     }
 
-    if (position === 'mainline' && config.setting.supModule) {                 // 涓昏〃琛屽埛鏂�
-      MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
-    } else if (position === 'popclose') {                                      // 鏍囩鍏抽棴鍒锋柊
-      config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+    if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
       btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
     }
   }
@@ -453,7 +460,7 @@
     const { config } = this.state
 
     if (!config.setting.supModule || config.setting.supModule !== MenuID) return
-    if (id !== this.state.BID) {
+    if (id !== this.state.BID || id !== '') {
       this.setState({ BID: id }, () => {
         this.loadData()
       })
@@ -463,7 +470,7 @@
   /**
    * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
    */
-  queryModuleParam = (menuId, btnId) => {
+  queryModuleParam = (menuId, callback) => {
     const { mainSearch } = this.props
     const { arr_field, config, search } = this.state
 
@@ -479,7 +486,7 @@
       })
     }
 
-    MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+    callback({
       arr_field: arr_field,
       orderBy: config.setting.order || '',
       search: searches,
@@ -491,15 +498,14 @@
    * @description 鏁版嵁鍔犺浇
    */
   async loadData (hastimer) {
-    const { mainSearch, menuType } = this.props
+    const { mainSearch } = this.props
     const { config, arr_field, BID, search } = this.state
 
     if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
-      this.setState({
-        data: []
-      }, () => {
+      if (!is(fromJS(this.data), fromJS([]))) {
+        this.data = []
         this.handleData()
-      })
+      }
       return
     }
 
@@ -525,26 +531,60 @@
     }
 
     let _orderBy = config.setting.order || ''
-    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID, menuType)
+    let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID)
 
     let result = await Api.genericInterface(param)
     if (result.status) {
+      if (config.$cache && config.setting.onload !== 'false') {
+        Api.writeCacheConfig(config.uuid, result.data || '')
+      }
+
       this.setState({
-        data: result.data,
         loading: false
-      }, () => {
-        this.handleData()
       })
+
+      if (!is(fromJS(this.data), fromJS(result.data || []))) {
+        this.data = result.data || []
+        this.handleData()
+      }
+
+      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,
-        timer: null
+        loading: false
       })
-      notification.error({
-        top: 92,
-        message: result.message,
-        duration: 10
-      })
+      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
+        })
+      }
     }
   }
 
@@ -556,7 +596,9 @@
     if (_element) {
       _element.innerHTML = ''
     }
-    this.viewrender()
+    setTimeout(() => {
+      this.viewrender()
+    }, 100)
   }
 
   /**
@@ -566,20 +608,20 @@
    * 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
    */
   getdata = () => {
-    const { data, plot, vFields, config } = this.state
+    const { plot, vFields, config } = this.state
 
-    if (!data || data.length === 0) {
+    if (this.data.length === 0) {
       this.setState({empty: true})
       return []
     }
 
     let _data = []
-    let _cdata = fromJS(data).toJS()
+    let _cdata = fromJS(this.data).toJS()
 
     if (plot.repeat === 'average') {
       let _mdata = new Map()
       _cdata.forEach(item => {
-        if (!item[plot.Xaxis]) return
+        if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
 
         vFields.forEach(col => {
           if (typeof(item[col.field]) !== 'number') {
@@ -596,6 +638,8 @@
         // 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]
         }
 
         if (!_mdata.has(item[plot.Xaxis])) {
@@ -624,7 +668,7 @@
     } else if (plot.repeat === 'cumsum') {
       let _mdata = new Map()
       _cdata.forEach(item => {
-        if (!item[plot.Xaxis]) return
+        if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
 
         vFields.forEach(col => {
           if (typeof(item[col.field]) !== 'number') {
@@ -640,6 +684,8 @@
 
         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]
         }
 
         if (!_mdata.has(item[plot.Xaxis])) {
@@ -665,10 +711,12 @@
     } else { // plot.repeat === 'unrepeat'
       let _mdata = new Map()
       _cdata.forEach(item => {
-        if (!item[plot.Xaxis]) return
+        if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
 
         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]
         }
 
         if (!_mdata.has(item[plot.Xaxis])) {
@@ -702,7 +750,7 @@
    * @description 缁熻鏁版嵁棰勫鐞�
    */
   getStaticMsg = () => {
-    const { plot, vstFields, data } = this.state
+    const { plot, vstFields } = this.state
 
     let percent = false
     let decimal = vstFields ? vstFields.decimal : 0
@@ -711,13 +759,13 @@
       percent = true
     }
 
-    if (!data || data.length === 0) {
+    if (this.data.length === 0) {
       this.setState({empty: true})
       return []
     }
 
     let _data = []
-    let _cdata = fromJS(data).toJS()
+    let _cdata = fromJS(this.data).toJS()
 
     if (plot.repeat === 'average') {
       let _mdata = new Map()
@@ -896,7 +944,7 @@
     const chart = new Chart({
       container: this.state.chartId,
       autoFit: true,
-      height: this.wrap.offsetHeight - 25
+      height: plot.height
     })
 
     chart.data(_data)
@@ -980,6 +1028,9 @@
     }
     if (plot.label !== 'false') {
       _chart.label(_valfield, (value) => {
+        if (plot.labelValue === 'zero' && value === 0) {
+          return null
+        }
         if (plot.show === 'percent') {
           value = value + '%'
         }
@@ -1046,6 +1097,8 @@
     }
     
     chart.render()
+
+    this.setState({chart})
   }
 
   /**
@@ -1075,7 +1128,7 @@
     const chart = new Chart({
       container: this.state.chartId,
       autoFit: true,
-      height: this.wrap.offsetHeight - 25
+      height: plot.height
     })
     
     // 鍧愭爣杞存牸寮忓寲
@@ -1173,7 +1226,7 @@
       view1.scale('value', c)
       view1.axis('value', plot.$yc)
   
-      view1.legend(false)
+      // view1.legend(false)
 
       let colorIndex = 0
   
@@ -1213,6 +1266,10 @@
         }
         if (plot.label !== 'false') {
           _chart.label('value*key', (value, key) => {
+            if (plot.labelValue === 'zero' && value === 0) {
+              return null
+            }
+
             if (plot.show === 'percent') {
               value = value + '%'
             }
@@ -1264,6 +1321,10 @@
         }
         if (plot.label !== 'false') {
           _chart.label('value*key', (value, key) => {
+            if (plot.labelValue === 'zero' && value === 0) {
+              return null
+            }
+
             if (plot.show === 'percent') {
               value = value + '%'
             }
@@ -1286,18 +1347,22 @@
       }
     }
 
-    const view2 = chart.createView({
-      region: {
-        start: { x: 0, y: 0 },
-        end: { x: 1, y: 1 }
-      },
-      padding
-    })
+    let view2 = chart
+
+    if (plot.Bar_axis) {
+      view2 = chart.createView({
+        region: {
+          start: { x: 0, y: 0 },
+          end: { x: 1, y: 1 }
+        },
+        padding
+      })
+    }
 
     view2.data(dv.rows)
-    view2.legend(false)
+    // view2.legend(false)
 
-    plot.customs.forEach((item, i) => {
+    plot.customs.forEach(item => {
       if (item.chartType === 'bar' && !plot.Bar_axis) {
         view2.axis(item.name, item.axis)
       
@@ -1322,7 +1387,7 @@
           .tooltip(`${item.name}`, (value) => {
             return {
               name: item.name,
-              value: plot.show === 'percent' ? value + '%' : value
+              value: item.show === 'percent' ? value + '%' : value
             }
           })
 
@@ -1331,7 +1396,11 @@
         }
         if (item.label !== 'false') {
           _chart.label(item.name, (value) => {
-            if (plot.show === 'percent') {
+            if (plot.labelValue === 'zero' && value === 0) {
+              return null
+            }
+
+            if (item.show === 'percent') {
               value = value + '%'
             }
             if (plot.label === 'true' && plot.labelColor === 'custom' && item.color) {
@@ -1373,13 +1442,17 @@
           .tooltip(`${item.name}`, (value) => {
             return {
               name: item.name,
-              value: plot.show === 'percent' ? value + '%' : value
+              value: item.show === 'percent' ? value + '%' : value
             }
           })
 
         if (item.label === 'true') {
           _chart.label(item.name, (value) => {
-            if (plot.show === 'percent') {
+            if (plot.labelValue === 'zero' && value === 0) {
+              return null
+            }
+
+            if (item.show === 'percent') {
               value = value + '%'
             }
             return {
@@ -1411,6 +1484,8 @@
     }
 
     chart.render()
+
+    this.setState({chart})
   }
 
   /**
@@ -1423,6 +1498,7 @@
     let _valfield = 'value'
     let _typefield = 'key'
     let colorIndex = 0
+    let barcolors = {}
 
     if (plot.datatype === 'statistics') {
       _valfield = plot.InfoValue
@@ -1435,6 +1511,16 @@
       if (plot.enabled === 'true') {
         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()
@@ -1463,7 +1549,7 @@
     const chart = new Chart({
       container: this.state.chartId,
       autoFit: true,
-      height: this.wrap.offsetHeight - 25
+      height: plot.height
     })
 
     chart.data(_data)
@@ -1569,19 +1655,37 @@
 
       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]
-          }
-        })
+
+        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.labelValue === 'zero' && value === 0) {
+            return null
+          }
+
           if (plot.show === 'percent') {
             value = value + '%'
           }
@@ -1627,19 +1731,36 @@
 
       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]
-          }
-        })
+        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.labelValue === 'zero' && value === 0) {
+            return null
+          }
+
           if (plot.show === 'percent') {
             value = value + '%'
           }
@@ -1674,7 +1795,70 @@
 
     chart.on('element:click', (ev) => {
       let data = ev.data.data
-      MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), null)
+
+      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 newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+
+        if (!newtab && plot.MenuID) {
+          newtab = {
+            MenuID: plot.MenuID,
+            MenuName: plot.MenuName,
+            MenuNo: plot.MenuNo,
+            type: plot.tabType
+          }
+        } else if (!newtab) {
+          return
+        }
+  
+        newtab = {
+          ...newtab,
+          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 {
+        MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data)
+      }
     })
 
     if (plot.interaction && plot.interaction.length) {
@@ -1684,6 +1868,8 @@
     }
 
     chart.render()
+
+    this.setState({chart})
   }
 
   refreshSearch = (list) => {
@@ -1692,20 +1878,66 @@
     })
   }
 
+  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 { 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" style={config.style}>
+      <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
         }
-        <NormalHeader config={config} BID={BID} menuType={this.props.menuType} refresh={this.refreshSearch} />
-        <div className="canvas-wrap" ref={ref => this.wrap = ref}>
-          <div className="chart-action">
+        <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
+        <div className="canvas-wrap">
+          {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 (

--
Gitblit v1.8.0