From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 02 八月 2022 11:42:43 +0800 Subject: [PATCH] Merge branch 'develop' --- src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 480 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 358 insertions(+), 122 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 fe56ea8..b2449054 100644 --- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx +++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx @@ -4,6 +4,7 @@ import { Chart } from '@antv/g2' import DataSet from '@antv/data-set' import { Spin, Empty, notification } from 'antd' +import { DownloadOutlined } from '@ant-design/icons' import moment from 'moment' import asyncComponent from './asyncButtonComponent' @@ -12,9 +13,10 @@ import Utils from '@/utils/utils.js' import UtilsDM from '@/utils/utils-datamanage.js' import MKEmitter from '@/utils/events.js' +import NormalHeader from '@/tabviews/custom/components/share/normalheader' import './index.scss' -const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader')) +// 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')) @@ -24,7 +26,6 @@ data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁 config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅 mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢 - menuType: PropTypes.any, // 鑿滃崟绫诲瀷 } state = { @@ -40,6 +41,7 @@ search: null, // 鎼滅储鏉′欢 vFields: [], // 鏁板�煎瓧娈� vstFields: null, // 缁熻鏁版嵁鍊煎瓧娈典俊鎭� + chart: null } UNSAFE_componentWillMount () { @@ -94,14 +96,7 @@ }) } - let height = config.plot.height || 400 - if (config.plot.title || config.search.length > 0) { - _config.plot.height = height - 70 - } else { - _config.plot.height = height - 25 - } - - _config.style.height = height + _config.style.height = config.plot.height || 400 let transfield = {} _config.columns.forEach(col => { @@ -130,7 +125,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 { @@ -202,13 +197,49 @@ _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) @@ -219,10 +250,38 @@ if (item.axis === 'true' && axisIndex < 2) { if (axisIndex === 0) { - item.axis = { title: { style: { fill: _config.plot.color } }, label: {style: { fill: _config.plot.color }} } + 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, title: {style: { fill: _config.plot.color }}, label: {style: { fill: _config.plot.color }} } + 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++ @@ -237,10 +296,23 @@ 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({ @@ -256,7 +328,9 @@ transfield }, () => { if (config.setting.sync !== 'true' && config.setting.onload === 'true') { - this.loadData() + setTimeout(() => { + this.loadData() + }, _config.setting.delay || 0) } else if (config.setting.sync === 'true' && _data) { this.handleData() } @@ -316,7 +390,7 @@ if (!config.timer) return - const _change = { '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 } + const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 } let timer = _change[config.timer] @@ -342,22 +416,30 @@ }) return } else if (result.run_type) { - this.setState({timer}) + let repeats = config.timerRepeats || 0 + this.setState({timer, repeats}) this.timer = setTimeout(() => { - this.timerTask() + this.timerTask(repeats) }, timer) } }) } - timerTask = () => { - const { timer } = this.state + timerTask = (times) => { + const { timer, repeats } = this.state if (!timer) return this.loadData(true) - + + if (repeats) { + times = times - 1 + if (times <= 0) { + clearTimeout(this.timer) + return + } + } this.timer = setTimeout(() => { - this.timerTask() + this.timerTask(times) }, timer) } @@ -372,16 +454,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) } } @@ -398,7 +477,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() }) @@ -436,7 +515,7 @@ * @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 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇� @@ -458,11 +537,8 @@ }) } - let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0)) + let requireFields = searches.filter(item => item.required && item.value === '') if (requireFields.length > 0) { - this.setState({ - loading: false - }) return } @@ -473,14 +549,21 @@ } 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) { + let reset = true + + if (hastimer && is(fromJS(result.data), fromJS(this.state.data))) { + reset = false + } + this.setState({ data: result.data, loading: false }, () => { + if (!reset) return this.handleData() }) } else { @@ -527,7 +610,7 @@ 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') { @@ -544,6 +627,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])) { @@ -572,7 +657,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') { @@ -588,6 +673,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])) { @@ -613,10 +700,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])) { @@ -840,11 +929,11 @@ _data = dv.rows } - + const chart = new Chart({ container: this.state.chartId, autoFit: true, - height: plot.height + height: this.wrap.offsetHeight - 25 }) chart.data(_data) @@ -854,24 +943,22 @@ range: [0, 1] }) } - chart.scale(_valfield, { + + let c = { nice: true, 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) + '...' - }, - style: { fill: plot.color } - }, - }) - chart.axis(_valfield, { label: { style: { fill: plot.color } } }) + } + + if (plot.min || plot.min === 0) { + c.min = plot.min + } + if (plot.max || plot.max === 0) { + c.max = plot.max + } + chart.scale(_valfield, c) + + chart.axis(plot.Xaxis, plot.$xc) + chart.axis(_valfield, plot.$yc) if (!plot.legend || plot.legend === 'hidden') { chart.legend(false) @@ -928,8 +1015,11 @@ } else { _chart.color(_typefield) } - if (plot.label === 'true') { + if (plot.label !== 'false') { _chart.label(_valfield, (value) => { + if (plot.labelValue === 'zero' && value === 0) { + return null + } if (plot.show === 'percent') { value = value + '%' } @@ -967,10 +1057,13 @@ if (plot.area === 'true') { let area = chart .area() - .shape(plot.shape || 'smooth') + // .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) => { @@ -993,6 +1086,8 @@ } chart.render() + + this.setState({chart}) } /** @@ -1016,31 +1111,17 @@ let padding = [10, 30, 30, 30] if (!plot.Bar_axis) { - if (plot.axisIndex === 2) { - padding = [10, 50, 30, 50] - } else if (plot.axisIndex === 1) { - padding = [10, 30, 30, 50] - } + padding = [10, plot.$paddingRight, 30, plot.$paddingLeft] } const chart = new Chart({ container: this.state.chartId, autoFit: true, - height: plot.height + height: this.wrap.offsetHeight - 25 }) // 鍧愭爣杞存牸寮忓寲 - 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) + '...' - }, - style: { fill: plot.color } - }, - }) + chart.axis(plot.Xaxis, plot.$xc) if (!plot.hasBar) { chart.scale(plot.Xaxis, { @@ -1120,10 +1201,19 @@ view1.data(dvt.rows) - view1.scale('value', { + let c = { nice: true, range: [0, 0.9] - }) + } + + if (plot.min || plot.min === 0) { + c.min = plot.min + } + if (plot.max || plot.max === 0) { + c.max = plot.max + } + view1.scale('value', c) + view1.axis('value', plot.$yc) view1.legend(false) @@ -1163,8 +1253,12 @@ } else { _chart.color('key') } - if (plot.label === 'true') { + if (plot.label !== 'false') { _chart.label('value*key', (value, key) => { + if (plot.labelValue === 'zero' && value === 0) { + return null + } + if (plot.show === 'percent') { value = value + '%' } @@ -1214,8 +1308,12 @@ } else { _chart.color('key') } - if (plot.label === 'true') { + if (plot.label !== 'false') { _chart.label('value*key', (value, key) => { + if (plot.labelValue === 'zero' && value === 0) { + return null + } + if (plot.show === 'percent') { value = value + '%' } @@ -1238,25 +1336,38 @@ } } - 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) - plot.customs.forEach((item, i) => { + plot.customs.forEach(item => { if (item.chartType === 'bar' && !plot.Bar_axis) { view2.axis(item.name, item.axis) - view2.scale(item.name, { + let c = { nice: true, range: [0, 0.9] - }) + } + + 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}`) @@ -1265,16 +1376,20 @@ .tooltip(`${item.name}`, (value) => { return { name: item.name, - value: plot.show === 'percent' ? value + '%' : value + value: item.show === 'percent' ? value + '%' : value } }) if (plot.barSize) { _chart.size(plot.barSize || 35) } - if (item.label === 'true') { + 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) { @@ -1295,10 +1410,19 @@ } else { view2.axis(item.name, { grid: null, title: null, label: null }) } - view2.scale(item.name, { + let c = { nice: true, range: [0, 0.9] - }) + } + + 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}`) @@ -1307,13 +1431,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 { @@ -1345,6 +1473,8 @@ } chart.render() + + this.setState({chart}) } /** @@ -1397,29 +1527,26 @@ const chart = new Chart({ container: this.state.chartId, autoFit: true, - height: plot.height + height: this.wrap.offsetHeight - 25 }) chart.data(_data) - chart.scale(_valfield, { + let c = { nice: true, 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) + '...' - }, - style: { fill: plot.color } - }, - }) - chart.axis(_valfield, { label: { style: { fill: plot.color } } }) + if (plot.min || plot.min === 0) { + c.min = plot.min + } + if (plot.max || plot.max === 0) { + c.max = plot.max + } + chart.scale(_valfield, c) + + chart.axis(plot.Xaxis, plot.$xc) + chart.axis(_valfield, plot.$yc) if (!plot.legend || plot.legend === 'hidden') { chart.legend(false) @@ -1517,8 +1644,12 @@ } else { _chart.color(_typefield) } - if (plot.label === 'true') { + if (plot.label !== 'false') { _chart.label(`${_valfield}*${_typefield}`, (value, key) => { + if (plot.labelValue === 'zero' && value === 0) { + return null + } + if (plot.show === 'percent') { value = value + '%' } @@ -1575,8 +1706,12 @@ } else { _chart.color(_typefield) } - if (plot.label === 'true') { + if (plot.label !== 'false') { _chart.label(`${_valfield}*${_typefield}`, (value, key) => { + if (plot.labelValue === 'zero' && value === 0) { + return null + } + if (plot.show === 'percent') { value = value + '%' } @@ -1611,7 +1746,60 @@ chart.on('element:click', (ev) => { let data = ev.data.data - MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), null) + + MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), 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 + + menu.type = menu.tabType + + let newtab = { + ...menu, + param: {} + } + + if (plot.joint === 'true') { + newtab.param.$BID = data.$$uuid || '' + } + + if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) { + MKEmitter.emit('modifyTabs', newtab, 'replace') + } else { + MKEmitter.emit('modifyTabs', newtab, 'plus', true) + } + } else if (plot.click === 'menu' && plot.MenuID) { + let menu = { + MenuID: plot.MenuID, + MenuName: plot.MenuName, + MenuNo: plot.MenuNo, + type: plot.tabType + } + + let newtab = { + ...menu, + param: {} + } + + if (plot.joint === 'true') { + newtab.param.$BID = data.$$uuid || '' + } + + if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) { + MKEmitter.emit('modifyTabs', newtab, 'replace') + } else { + MKEmitter.emit('modifyTabs', newtab, 'plus', true) + } + } }) if (plot.interaction && plot.interaction.length) { @@ -1621,6 +1809,8 @@ } chart.render() + + this.setState({chart}) } refreshSearch = (list) => { @@ -1629,20 +1819,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"> - <div className="chart-action"> + <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} /> + <div className="canvas-wrap" ref={ref => this.wrap = ref}> + {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 ( @@ -1667,7 +1903,7 @@ } })} </div> - <div className={'canvas' + (empty ? ' empty' : '')} style={{height: config.plot.height + 25}} 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