From 7b952b64a2b7273c6d2af68200a6ae790d9b59b1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 六月 2021 16:33:00 +0800
Subject: [PATCH] 2021-06-10
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 1262 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 959 insertions(+), 303 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..2f30000 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -2,18 +2,21 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Chart } from '@antv/g2'
+// import { connect } from 'react-redux'
import DataSet from '@antv/data-set'
-import { Spin, Empty, Select, notification } from 'antd'
+import { Spin, Empty, notification } from 'antd'
+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 { modifyTabview } from '@/store/action'
+import MKEmitter from '@/utils/events.js'
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'))
@@ -22,47 +25,44 @@
BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 鍏ㄥ眬鎼滅储鏉′欢
+ 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: '', // 缁勪欢鏍囬
+ transfield: {}, // 瀛楁鍚嶇О缈昏瘧
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
plot: null, // 鍥捐〃璁剧疆
data: null, // 鏁版嵁
search: null, // 鎼滅储鏉′欢
vFields: [], // 鏁板�煎瓧娈�
vstFields: null, // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
- chartData: [], // 鍥捐〃鏁版嵁
- chartFields: [], // 缁熻鍥捐〃鐢熸垚瀛楁闆�
- selectFields: [], // 缁熻鍥捐〃閫夋嫨瀛楁
- percentFields: [] // 璁剧疆涓虹櫨鍒嗘瘮鐨勫瓧娈碉紝tooltip鏃跺鍔�%
}
UNSAFE_componentWillMount () {
- const { config, data } = this.props
+ const { config, data, initdata, BID } = 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] || []
_sync = false
+ } else if (config.setting.sync === 'true' && initdata) {
+ _data = initdata || []
+ _sync = false
}
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,45 +92,177 @@
show: _config.plot.show,
decimal
})
-
- if (_config.plot.show === 'percent') {
- percentFields.push(col.label)
- }
}
})
+ }
+
+ 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
+
+ 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') {
+ _config.plot.Bar_axis = Bar_axis
+ }
+ } else {
+ _config.plot.enabled = 'false'
+ }
+
+ let colors = new Map()
+
+ if (_config.plot.colors && _config.plot.colors.length > 0) { // 棰滆壊璁剧疆
+ if (_config.plot.datatype === 'statistics') {
+ if (_config.plot.ramp === 'true') {
+ let _s = 'l(0) '
+ if (_config.plot.chartType === 'bar') {
+ _s = 'l(90) '
+ }
+ _config.plot.colors.forEach(item => {
+ if (!colors.has(item.type)) {
+ colors.set(item.type, _s + `0:${item.color} 1:${item.color1}`)
+ }
+ })
+ } else {
+ _config.plot.colors.forEach(item => {
+ if (!colors.has(item.type)) {
+ colors.set(item.type, item.color)
+ }
+ })
+ }
+ } else if (_config.plot.enabled === 'true') {
+ if (_config.plot.ramp === 'true') {
+ _config.plot.colors.forEach(item => {
+ let _type = transfield[item.type] || item.type
+ if (!colors.has(_type)) {
+ if (bars[item.type]) {
+ colors.set(_type, `l(90) 0:${item.color} 1:${item.color1}` )
+ } else {
+ colors.set(_type, `l(0) 0:${item.color} 1:${item.color1}` )
+ }
+ }
+ })
+ } else {
+ _config.plot.colors.forEach(item => {
+ let _type = transfield[item.type] || item.type
+ if (!colors.has(_type)) {
+ colors.set(_type, item.color)
+ }
+ })
+ }
+ } else {
+ if (_config.plot.ramp === 'true') {
+ let _s = 'l(0) '
+ if (_config.plot.chartType === 'bar') {
+ _s = 'l(90) '
+ }
+ _config.plot.colors.forEach(item => {
+ if (!transfield[item.type]) return
+ if (!colors.has(transfield[item.type])) {
+ colors.set(transfield[item.type], _s + `0:${item.color} 1:${item.color1}` )
+ }
+ })
+ } else {
+ _config.plot.colors.forEach(item => {
+ if (!transfield[item.type]) return
+ if (!colors.has(transfield[item.type])) {
+ colors.set(transfield[item.type], item.color)
+ }
+ })
+ }
+ }
+ _config.plot.$colors = colors
+ }
+
+ if (_config.plot.enabled === 'true') {
+ let colorIndex = 0
+ let limit = chartColors.length
+ let axisIndex = 0
+ let fields = []
+ let legends = []
+
+ _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 = { title: { style: { fill: _config.plot.color } }, label: {style: { fill: _config.plot.color }} }
+ fields.unshift(item)
+ } else {
+ item.axis = { grid: null, title: {style: { fill: _config.plot.color }}, label: {style: { fill: _config.plot.color }} }
+ 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 } }
+ })
+ })
+ _config.plot.customs = fields
+ _config.plot.legends = legends
+ _config.plot.axisIndex = axisIndex
}
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)
+ search: Utils.initMainSearch(config.search),
+ transfield
}, () => {
- if (config.setting.sync !== 'true') {
+ if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
this.loadData()
- } else if (config.setting.sync === 'true') {
- if (!_data) {
- this.setState({
- loading: true
- })
- } else {
- this.handleData()
- }
+ } else if (config.setting.sync === 'true' && _data) {
+ this.handleData()
}
})
- }
-
- /**
- * @description 鏍￠獙鍥捐〃鐨勬寜閽粍锛屽鏋滀负缁熻鍥捐〃锛岃绠楀浘琛ㄥ瓧娈�
- */
- componentDidMount () {
-
}
/**
@@ -145,9 +277,15 @@
_data = nextProps.data[config.dataName] || []
}
- this.setState({sync: false, loading: false, data: _data}, () => {
+ this.setState({sync: false, data: _data}, () => {
this.handleData()
})
+ } else if (nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ if (config.setting.syncRefresh === 'true') {
+ this.setState({}, () => {
+ this.loadData()
+ })
+ }
}
}
@@ -155,60 +293,204 @@
return !is(fromJS(this.state), fromJS(nextState))
}
- handleData = () => {
- const { data, plot } = this.state
+ componentDidMount () {
+ MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+ this.handleTimer()
+ }
- 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()
- })
- } else {
- let _element = document.getElementById(this.state.chartId)
- if (_element) {
- _element.innerHTML = ''
+ /**
+ * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+ */
+ componentWillUnmount () {
+ clearTimeout(this.timer)
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('reloadData', this.reloadData)
+ 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)
}
- this.viewrender()
+ })
+ }
+
+ timerTask = () => {
+ const { timer } = this.state
+ if (!timer) return
+
+ this.loadData(true)
+
+ this.timer = setTimeout(() => {
+ this.timerTask()
+ }, timer)
+ }
+
+ /**
+ * @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
+ * @param {*} menuId // 鑿滃崟Id
+ * @param {*} position // 鍒锋柊浣嶇疆
+ * @param {*} btn // 鎵ц鐨勬寜閽�
+ */
+ refreshByButtonResult = (menuId, position, btn) => {
+ const { config, BID } = this.state
+
+ 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' && 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'))
+ btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
- async loadData () {
- const { mainSearch, BID, menuType, dataManager } = this.props
- const { config, arr_field, search } = this.state
-
- let searches = fromJS(search).toJS()
+ 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) {
+ this.setState({ BID: id }, () => {
+ this.loadData()
+ })
+ }
+ }
+
+ /**
+ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+ */
+ queryModuleParam = (menuId, btnId) => {
+ const { mainSearch } = this.props
+ const { arr_field, config, search } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = search ? fromJS(search).toJS() : []
if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- searches = [...mainSearch, ...searches]
+ let keys = searches.map(item => item.key.toLowerCase())
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key.toLowerCase())) {
+ searches.push(item)
+ }
+ })
}
- this.setState({
- loading: true
+ MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ arr_field: arr_field,
+ orderBy: config.setting.order || '',
+ search: searches,
+ menuName: config.name
})
+ }
+
+ /**
+ * @description 鏁版嵁鍔犺浇
+ */
+ async loadData (hastimer) {
+ const { mainSearch, menuType } = this.props
+ const { config, arr_field, BID, search } = this.state
+
+ if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
+ this.setState({
+ data: []
+ }, () => {
+ this.handleData()
+ })
+ return
+ }
+
+ let searches = search ? fromJS(search).toJS() : []
+ if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ let keys = searches.map(item => item.key)
+ mainSearch.forEach(item => {
+ if (!keys.includes(item.key)) {
+ searches.push(item)
+ }
+ })
+ }
+
+ let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
+ if (requireFields.length > 0) {
+ this.setState({
+ loading: false
+ })
+ return
+ }
+
+ if (!hastimer) {
+ 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, arr_field, searches, _orderBy, '', '', BID, menuType)
let result = await Api.genericInterface(param)
if (result.status) {
this.setState({
- data: result.data.map((item, index) => {
- item.key = index
- return item
- }),
+ data: result.data,
loading: false
+ }, () => {
+ this.handleData()
})
} else {
this.setState({
- loading: false
+ loading: false,
+ timer: null
})
notification.error({
top: 92,
@@ -219,15 +501,26 @@
}
/**
+ * @description 鏁版嵁棰勫鐞嗭紝缁熻鏁版嵁闇�瑕侀噸缃�
+ */
+ handleData = () => {
+ let _element = document.getElementById(this.state.chartId)
+ if (_element) {
+ _element.innerHTML = ''
+ }
+ this.viewrender()
+ }
+
+ /**
* @description 鍥捐〃鏁版嵁棰勫鐞�
* 1銆侀�氳繃鏄剧ず鍒楄繘琛屾暟鎹被鍨嬭浆鎹�
* 2銆侀噸澶嶆暟鎹細鍙栧钩鍧囧�笺�佺疮璁°�佸幓閲�
* 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
*/
getdata = () => {
- const { data, plot, vFields } = this.state
+ const { data, plot, vFields, config } = this.state
- if (!data) {
+ if (!data || data.length === 0) {
this.setState({empty: true})
return []
}
@@ -270,6 +563,7 @@
item[col.field] = item[col.field].toFixed(col.decimal)
item[col.field] = +item[col.field]
})
+ item.$$uuid = item[config.setting.primaryKey] || ''
return item
})
} else if (plot.repeat === 'cumsum') {
@@ -304,6 +598,7 @@
item[col.field] = item[col.field].toFixed(col.decimal)
item[col.field] = +item[col.field]
})
+ item.$$uuid = item[config.setting.primaryKey] || ''
return item
})
} else { // plot.repeat === 'unrepeat'
@@ -323,6 +618,8 @@
item[col.field] = item[col.field].toFixed(col.decimal)
item[col.field] = +item[col.field]
})
+
+ item.$$uuid = item[config.setting.primaryKey] || ''
_mdata.set(item[plot.Xaxis], item)
}
})
@@ -330,57 +627,35 @@
_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)
- }
- }
- }
-
this.setState({empty: _data.length === 0})
return _data
}
/**
- * @description 缁熻鏁版嵁棰勫鐞嗭紝鍔ㄦ�佺敓鎴愮粺璁″瓧娈靛苟杩涜鏁版嵁杞崲
+ * @description 缁熻鏁版嵁棰勫鐞�
*/
- getStaticMsg = (data) => {
- const { plot, vstFields } = this.state
+ getStaticMsg = () => {
+ const { plot, vstFields, data } = this.state
let percent = false
- let decimal = 0
+ let decimal = vstFields ? vstFields.decimal : 0
if (plot.show === 'percent') {
percent = true
}
- if (vstFields) {
- decimal = vstFields.decimal
- }
- if (!data) {
+ if (!data || data.length === 0) {
this.setState({empty: true})
- return {data: [], chartFields: [], selectFields: []}
+ return []
}
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') {
@@ -416,7 +691,6 @@
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]
@@ -450,7 +724,6 @@
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]
@@ -475,31 +748,8 @@
_data = [..._mdata.values()]
}
- _chartFields = Array.from(new Set(_chartFields))
-
- if (plot.InfoDefNumber >= _chartFields.length) {
- _selectFields = _chartFields
- } else {
- _selectFields = _chartFields.slice(0, plot.InfoDefNumber)
- }
-
- return {data: _data, chartFields: _chartFields, selectFields: _selectFields}
- }
-
- /**
- * @description 鑾峰彇缁熻鍥捐〃灞曠ず鏁版嵁锛岄�氳繃閫夋嫨绫诲瀷绛涢��
- */
- getStaticData = () => {
- const { plot, chartData, chartFields, selectFields } = this.state
-
- let _data = []
- if (selectFields.length === chartFields.length) {
- _data = chartData
- } else {
- _data = chartData.filter(item => selectFields.includes(item[plot.InfoType]))
- }
-
this.setState({empty: _data.length === 0})
+
return _data
}
@@ -520,34 +770,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
}
@@ -578,7 +817,7 @@
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: plot.height || 400
+ height: plot.height
})
chart.data(_data)
@@ -590,9 +829,9 @@
}
chart.scale(_valfield, {
nice: true,
- range: [0, 0.93]
+ range: [0, 0.9]
})
-
+
// 鍧愭爣杞存牸寮忓寲
chart.axis(plot.Xaxis, {
label: {
@@ -601,15 +840,18 @@
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.legend || plot.legend === 'hidden') {
chart.legend(false)
} else {
chart.legend({
- position: plot.legend
+ position: plot.legend,
+ itemName: { style: { fill: plot.color } }
})
}
@@ -635,26 +877,89 @@
let _chart = chart
.line()
.position(`${plot.Xaxis}*${_valfield}`)
- .color(_typefield)
.shape(plot.shape || 'smooth')
.tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
return {
name: type,
- value: percentFields.includes(type) || ispercent ? value + '%' : value
+ value: plot.show === 'percent' ? value + '%' : value
}
})
+ 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.label === 'true') {
- _chart.label(_valfield)
+ _chart.label(_valfield, (value) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+ return {
+ content: value,
+ 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.$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()
@@ -663,68 +968,49 @@
/**
* @description 鑷畾涔夋覆鏌�
*/
- customrender = (data, transfield) => {
- const { plot, percentFields } = 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 } }
- })
- })
-
- fields.sort((a, b) => a.index - b.index)
-
+ customrender = (data) => {
+ const { plot, transfield } = this.state
const ds = new DataSet()
- const dv = ds.createView().source(data)
+
+ let _copydata = data
+ // dodge is not support linear attribute, please use category attribute! 鏃堕棿鏍煎紡
+ if (_copydata[0] && _copydata[0][plot.Xaxis] && /^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(_copydata[0][plot.Xaxis])) {
+ for (let i = 1; i < 12; i++) {
+ if (_copydata[i] && _copydata[i][plot.Xaxis] === _copydata[0][plot.Xaxis]) {
+ _copydata[i][plot.Xaxis] += ' '
+ } else {
+ break;
+ }
+ }
+ _copydata[0][plot.Xaxis] += ' '
+ }
+
+ const dv = ds.createView().source(_copydata)
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) {
+ if (plot.axisIndex === 2) {
+ padding = [10, 50, 30, 50]
+ } else if (plot.axisIndex === 1) {
+ padding = [10, 30, 30, 50]
+ }
+ }
+
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: plot.height || 400
+ height: plot.height
})
-
- chart.data(dv.rows)
-
- if (plot.coordinate !== 'polar' && barfields.length === 0) {
- chart.scale(plot.Xaxis, {
- range: [0, 1]
- })
- } else {
- chart.scale(plot.Xaxis, {
- range: [0.05, 0.95]
- })
- }
// 鍧愭爣杞存牸寮忓寲
chart.axis(plot.Xaxis, {
@@ -734,9 +1020,16 @@
let _val = `${val}`
if (_val.length <= 11) return val
return _val.substring(0, 8) + '...'
- }
- }
+ },
+ style: { fill: plot.color }
+ },
})
+
+ if (!plot.hasBar) {
+ chart.scale(plot.Xaxis, {
+ range: [0, 1]
+ })
+ }
if (!plot.legend || plot.legend === 'hidden') {
chart.legend(false)
@@ -744,7 +1037,8 @@
chart.legend({
custom: true,
position: plot.legend,
- items: legends,
+ items: plot.legends,
+ itemName: { style: { fill: plot.color } }
})
}
@@ -756,40 +1050,197 @@
})
}
- if (plot.transpose === 'true') {
- chart.coordinate().transpose()
- }
+ chart.scale({
+ nice: true
+ })
- if (plot.coordinate === 'polar') {
- chart.coordinate('polar', {
- innerRadius: 0.1,
- radius: 0.8
- })
- }
-
- 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
- })
+ let lablecfg = {
+ position: 'top',
+ offset: 2,
+ style: {
+ fill: '#fff'
}
+ }
- if (item.chartType === 'bar') {
- let _chart = chart
+ 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(_copydata)
+
+ 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)
+
+ view1.scale('value', {
+ nice: true,
+ range: [0, 0.9]
+ })
+
+ view1.legend(false)
+
+ let colorIndex = 0
+
+ if (plot.adjust !== '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) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+ return {
+ name: key,
+ value: value
+ }
+ })
+
+ 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 === 'true') {
+ _chart.label('value*key', (value, key) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+
+ if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+ lablecfg.style.fill = plot.$colors.get(key)
+ }
+ return {
+ content: value,
+ ...lablecfg
+ }
+ })
+ }
+
+ if (plot.barSize || plot.correction) {
+ _chart.size(plot.barSize || 35)
+ }
+ if (plot.barRadius) {
+ _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
+ }
+ } else if (plot.adjust === 'stack') {
+ let _chart = view1
+ .interval()
+ .position(`${plot.Xaxis}*value`)
+ .adjust('stack')
+ .shape(plot.shape || 'rect')
+ .tooltip(`${plot.Xaxis}*value*key`, (name, value, type) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+ return {
+ name: type,
+ value: value
+ }
+ })
+
+ 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 === 'true') {
+ _chart.label('value*key', (value, key) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+ if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+ lablecfg.style.fill = plot.$colors.get(key)
+ }
+ return {
+ content: value,
+ ...lablecfg
+ }
+ })
+ }
+
+ if (plot.barSize || plot.correction) {
+ _chart.size(plot.barSize || 35)
+ }
+ if (plot.barRadius) {
+ _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
+ }
+ }
+ }
+
+ const 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) => {
+ if (item.chartType === 'bar' && !plot.Bar_axis) {
+ view2.axis(item.name, item.axis)
+
+ view2.scale(item.name, {
+ nice: true,
+ range: [0, 0.9]
+ })
+ let _chart = view2
.interval()
.position(`${plot.Xaxis}*${item.name}`)
.color(item.color)
@@ -797,15 +1248,41 @@
.tooltip(`${item.name}`, (value) => {
return {
name: item.name,
- value: percentFields.includes(item.name) ? value + '%' : value
+ value: plot.show === 'percent' ? value + '%' : value
}
})
+ if (plot.barSize) {
+ _chart.size(plot.barSize || 35)
+ }
if (item.label === 'true') {
- _chart.label(item.name)
+ _chart.label(item.name, (value) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+ if (plot.label === 'true' && plot.labelColor === 'custom' && item.color) {
+ lablecfg.style.fill = item.color
+ }
+ return {
+ content: value,
+ ...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 })
+ }
+ view2.scale(item.name, {
+ nice: true,
+ range: [0, 0.9]
+ })
+ let _chart = view2
.line()
.position(`${plot.Xaxis}*${item.name}`)
.color(item.color)
@@ -813,12 +1290,22 @@
.tooltip(`${item.name}`, (value) => {
return {
name: item.name,
- value: percentFields.includes(item.name) ? value + '%' : value
+ value: plot.show === 'percent' ? value + '%' : value
}
})
if (item.label === 'true') {
- _chart.label(item.name)
+ _chart.label(item.name, (value) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+ return {
+ content: value,
+ style: {
+ fill: plot.color
+ }
+ }
+ })
}
if (plot.point === 'true') {
@@ -832,6 +1319,14 @@
}
})
+ if (plot.interaction && plot.interaction.length) {
+ plot.interaction.forEach(t => {
+ if (t === 'element-active' || t === 'element-highlight') {
+ chart.interaction(t)
+ }
+ })
+ }
+
chart.render()
}
@@ -839,34 +1334,24 @@
* @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
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
}
@@ -896,7 +1381,7 @@
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! 鏃堕棿鏍煎紡
@@ -915,7 +1400,7 @@
chart.scale(_valfield, {
nice: true,
- range: [0, 0.93]
+ range: [0, 0.9]
})
// 鍧愭爣杞存牸寮忓寲
@@ -926,15 +1411,18 @@
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.legend || plot.legend === 'hidden') {
chart.legend(false)
} else {
chart.legend({
- position: plot.legend
+ position: plot.legend,
+ itemName: { style: { fill: plot.color } }
})
}
@@ -947,8 +1435,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 +1486,6 @@
let _chart = chart
.interval()
.position(`${plot.Xaxis}*${_valfield}`)
- .color(_typefield)
.adjust([
{
type: 'dodge',
@@ -973,75 +1496,197 @@
.tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
return {
name: type,
- value: percentFields.includes(type) || ispercent ? value + '%' : value
+ value: plot.show === 'percent' ? value + '%' : value
}
})
+ 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.label === 'true') {
- _chart.label(_valfield)
+ _chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+
+ if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+ lablecfg.style.fill = plot.$colors.get(key)
+ }
+
+ return {
+ content: value,
+ ...lablecfg
+ }
+ })
+ }
+
+ if (plot.barSize || plot.correction) {
+ _chart.size(plot.barSize || 35)
+ }
+ if (plot.selectColor) {
+ _chart.state({
+ selected: {
+ style: {
+ fill: plot.selectColor,
+ }
+ }
+ })
+ }
+ if (plot.barRadius) {
+ _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
}
} 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) => {
return {
name: type,
- value: percentFields.includes(type) || ispercent ? value + '%' : value
+ value: plot.show === 'percent' ? value + '%' : value
}
})
- if (plot.label === 'true') {
- _chart.label(_valfield)
+ 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.label === 'true') {
+ _chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+
+ if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+ lablecfg.style.fill = plot.$colors.get(key)
+ }
+
+ return {
+ content: value,
+ ...lablecfg
+ }
+ })
+ }
+
+ if (plot.barSize || plot.correction) {
+ _chart.size(plot.barSize || 35)
+ }
+ if (plot.selectColor) {
+ _chart.state({
+ selected: {
+ style: {
+ fill: plot.selectColor,
+ }
+ }
+ })
+ }
+ if (plot.barRadius) {
+ _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
+ }
+ }
+
+ chart.on('element:click', (ev) => {
+ let data = ev.data.data
+ MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), null)
+ })
+
+ // if (plot.linkmenu && plot.linkmenu.length > 0) {
+ // let menu_id = plot.linkmenu.slice(-1)[0]
+ // let menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
+
+ // chart.on('element:dblclick', (ev) => {
+ // if (!menu) {
+ // notification.warning({
+ // top: 92,
+ // message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
+ // duration: 5
+ // })
+ // return
+ // }
+
+ // try {
+ // let data = ev.data.data
+ // let primaryId = ''
+ // if (this.state.config.setting.primaryKey && data) {
+ // primaryId = data[this.state.config.setting.primaryKey] || ''
+ // }
+
+ // let newtab = {
+ // ...menu,
+ // selected: true,
+ // param: {
+ // $BID: primaryId
+ // }
+ // }
+
+ // let tabs = this.props.tabviews.filter(tab => {
+ // tab.selected = false
+ // return tab.MenuID !== newtab.MenuID
+ // })
+
+ // if (this.props.tabviews.length > tabs.length) {
+ // this.props.modifyTabview(fromJS(tabs).toJS())
+ // }
+
+ // this.setState({}, () => {
+ // tabs.push(newtab)
+ // this.props.modifyTabview(tabs)
+ // })
+ // } catch {
+ // console.warn('鑿滃崟鎵撳紑澶辫触锛�')
+ // }
+ // })
+ // }
+
+ if (plot.interaction && plot.interaction.length) {
+ plot.interaction.forEach(t => {
+ chart.interaction(t)
+ })
}
chart.render()
}
- /**
- * @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()
})
}
render() {
- const { BID } = this.props
- const { config, loading, title, plot, empty, chartFields, selectFields } = this.state
+ const { config, loading, empty, BID } = this.state
return (
- <div className="custom-line-chart-plot-box">
- {/* <searchLine /> */}
- {title ? <p className="chart-title">{title}</p> : null}
+ <div className="custom-line-chart-plot-box" style={config.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} menuType={this.props.menuType} refresh={this.refreshSearch} />
<div className="canvas-wrap">
- <div className={'chart-action ' + (plot.title ? 'with-title' : '')}>
+ <div className="chart-action">
{config.action.map(item => {
if (item.OpenType === 'excelOut') {
return (
@@ -1051,8 +1696,6 @@
btn={item}
show="icon"
setting={config.setting}
- getexceloutparam={this.props.getexceloutparam}
- updateStatus={() => {}}
/>
)
} else {
@@ -1063,13 +1706,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' : '')} style={{height: config.plot.height + 25}} id={this.state.chartId}></div>
</div>
{empty ? <Empty description={false}/> : null}
</div>
@@ -1077,4 +1719,18 @@
}
}
+// const mapStateToProps = (state) => {
+// return {
+// tabviews: state.tabviews,
+// permMenus: state.permMenus,
+// }
+// }
+
+// const mapDispatchToProps = (dispatch) => {
+// return {
+// modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
+// }
+// }
+
+// export default connect(mapStateToProps, mapDispatchToProps)(LineChart)
export default LineChart
\ No newline at end of file
--
Gitblit v1.8.0