From f267d04e0561a0a20d1f2a9f558a273558ece90d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 24 五月 2021 17:50:19 +0800
Subject: [PATCH] 2021-05-24
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 994 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 665 insertions(+), 329 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 0257e24..faacd7a 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,97 +25,176 @@
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, // 鎼滅储鏉′欢
- chartData: [], // 鍥捐〃鏁版嵁
- chartFields: [], // 缁熻鍥捐〃鐢熸垚瀛楁闆�
- selectFields: [], // 缁熻鍥捐〃閫夋嫨瀛楁
- percentFields: [] // 璁剧疆涓虹櫨鍒嗘瘮鐨勫瓧娈碉紝tooltip鏃跺鍔�%
+ vFields: [], // 鏁板�煎瓧娈�
+ vstFields: null, // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
}
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 vstFields = null
+
+ if (_config.plot.datatype === 'statistics') {
+ let _column = _config.columns.filter(col => _config.plot.InfoValue === col.field)[0]
+ if (_column) {
+ let decimal = 0
+
+ if (/Decimal/ig.test(_column.datatype)) {
+ decimal = +_column.datatype.replace(/^Decimal\(18,/ig, '').replace(/\)/ig, '')
+ }
+
+ vstFields = {
+ label: _column.label,
+ field: _column.field,
+ show: _config.plot.show,
+ decimal
+ }
+ }
+ } else {
+ let _vFields = _config.plot.Yaxis && typeof(_config.plot.Yaxis) === 'string' ? [_config.plot.Yaxis] : _config.plot.Yaxis
+ _config.columns.forEach(col => {
+ if (_vFields.includes(col.field)) {
+ let decimal = 0
+ if (/Decimal/ig.test(col.datatype)) {
+ decimal = +col.datatype.replace(/^Decimal\(18,/ig, '').replace(/\)/ig, '')
+ }
+ vFields.push({
+ label: col.label,
+ field: col.field,
+ show: _config.plot.show,
+ decimal
+ })
+ }
+ })
+ }
+
+ if (config.plot.title || config.search.length > 0) {
+ _config.plot.height = _config.plot.height - 80
+ } else {
+ _config.plot.height = _config.plot.height - 30
+ }
+
+ _config.style.height = config.plot.height || 400
+
+ 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)'
+
+ if (_config.plot.enabled === 'true' && _config.plot.customs && _config.plot.customs.length > 0) {
+ let colors = new Map()
+ let colorIndex = 0
+ let limit = chartColors.length
+
+ if (_config.plot.colors && _config.plot.colors.length > 0) {
+ _config.plot.colors.forEach(item => {
+ if (!colors.has(item.type)) {
+ colors.set(item.type, item.color)
+ }
+ })
+ }
+
+ let axisIndex = 0
+ let hasBar = false
+ let fields = []
+ let legends = []
+
+ _config.plot.customs.forEach(item => {
+ item.name = transfield[item.type] || item.type
+ item.chartType = item.shape ? (item.shape[0] || 'bar') : 'bar'
+ item.shape = item.shape ? (item.shape[1] || '') : ''
+
+ if (colors.get(item.type)) {
+ item.color = colors.get(item.type)
+ } else {
+ item.color = chartColors[colorIndex % limit]
+ colorIndex++
+ }
+
+ if (item.chartType === 'bar' && !hasBar) {
+ hasBar = true
+ } else if (item.chartType === 'bar') {
+ item.chartType = 'line'
+ item.shape = 'smooth'
+ }
+
+ 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.hasBar = hasBar
+ } else {
+ _config.plot.enabled = 'false'
}
this.setState({
config: _config,
data: _data,
+ BID: BID || '',
+ vFields: vFields,
+ vstFields: vstFields,
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' && _data) {
this.handleData()
}
})
- }
-
- /**
- * @description 鏍￠獙鍥捐〃鐨勬寜閽粍锛屽鏋滀负缁熻鍥捐〃锛岃绠楀浘琛ㄥ瓧娈�
- */
- componentDidMount () {
- // const { plot, data, config } = this.props
- // let _state = {}
- // let percentFields = []
-
- // if (plot.datatype === 'statistics' && (plot.chartType === 'line' || plot.chartType === 'bar')) {
- // let result = this.getStaticMsg(data)
- // _state.chartData = result.data
- // _state.chartFields = result.chartFields
- // _state.selectFields = result.selectFields
-
- // let _column = config.columns.filter(col => plot.InfoValue === col.field)[0]
-
- // if (_column && _column.format === 'percent') {
- // percentFields.push(plot.InfoValue)
- // _state.percentFields = percentFields
- // }
-
- // this.setState(_state, () => {
- // this.viewrender()
- // })
- // } else {
- // if (plot.chartType === 'line' || plot.chartType === 'bar') {
- // try {
- // plot.Yaxis.forEach(yaxis => {
- // let _column = config.columns.filter(col => yaxis === col.field)[0]
- // if (_column && _column.format === 'percent') {
- // percentFields.push(_column.label)
- // }
- // })
- // } catch {
- // console.warn('Incorrect percentage setting')
- // }
- // }
- // this.setState({ percentFields }, () => {
- // this.viewrender()
- // })
- // }
}
/**
@@ -130,6 +212,12 @@
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()
+ })
+ }
}
}
@@ -137,54 +225,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('getexceloutparam', this.getexceloutparam)
+ 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()
+ /**
+ * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+ */
+ componentWillUnmount () {
+ clearTimeout(this.timer)
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('getexceloutparam', this.getexceloutparam)
+ 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)
+ }
+
+ /**
+ * @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)
+ }
+ }
+
+ 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()
})
}
}
- async loadData () {
- const { mainSearch, BID, menuType, dataManager } = this.props
- const { config, arr_field, search } = this.state
-
- let searches = fromJS(search).toJS()
+ /**
+ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+ */
+ getexceloutparam = (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('execExcelout', 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, config.customScript, 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,
@@ -195,17 +433,26 @@
}
/**
+ * @description 鏁版嵁棰勫鐞嗭紝缁熻鏁版嵁闇�瑕侀噸缃�
+ */
+ handleData = () => {
+ let _element = document.getElementById(this.state.chartId)
+ if (_element) {
+ _element.innerHTML = ''
+ }
+ this.viewrender()
+ }
+
+ /**
* @description 鍥捐〃鏁版嵁棰勫鐞�
* 1銆侀�氳繃鏄剧ず鍒楄繘琛屾暟鎹被鍨嬭浆鎹�
* 2銆侀噸澶嶆暟鎹細鍙栧钩鍧囧�笺�佺疮璁°�佸幓閲�
* 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
*/
getdata = () => {
- const { data, plot, config } = this.props
- let vFields = plot.Yaxis && typeof(plot.Yaxis) === 'string' ? [plot.Yaxis] : plot.Yaxis
- let _columns = config.columns.filter(col => vFields.includes(col.field))
+ const { data, plot, vFields } = this.state
- if (!data) {
+ if (!data || data.length === 0) {
this.setState({empty: true})
return []
}
@@ -216,14 +463,14 @@
if (plot.repeat === 'average') {
let _mdata = new Map()
_cdata.forEach(item => {
- _columns.forEach(col => {
+ 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.format === 'percent') {
+ if (col.show === 'percent') {
item[col.field] = item[col.field] * 100
}
})
@@ -234,8 +481,8 @@
} else if (item[plot.Xaxis]) {
let _item = _mdata.get(item[plot.Xaxis])
_item.$count++
- vFields.forEach(field => {
- _item[field] += item[field]
+ vFields.forEach(col => {
+ _item[col.field] += item[col.field]
})
_mdata.set(item[plot.Xaxis], _item)
}
@@ -243,7 +490,7 @@
_data = [..._mdata.values()]
_data = _data.map(item => {
- _columns.forEach(col => {
+ 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]
@@ -253,14 +500,14 @@
} else if (plot.repeat === 'cumsum') {
let _mdata = new Map()
_cdata.forEach(item => {
- _columns.forEach(col => {
+ 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.format === 'percent') {
+ if (col.show === 'percent') {
item[col.field] = item[col.field] * 100
}
})
@@ -269,8 +516,8 @@
_mdata.set(item[plot.Xaxis], item)
} else if (item[plot.Xaxis]) {
let _item = _mdata.get(item[plot.Xaxis])
- vFields.forEach(field => {
- _item[field] += item[field]
+ vFields.forEach(col => {
+ _item[col.field] += item[col.field]
})
_mdata.set(item[plot.Xaxis], _item)
}
@@ -278,7 +525,7 @@
_data = [..._mdata.values()]
_data = _data.map(item => {
- _columns.forEach(col => {
+ vFields.forEach(col => {
item[col.field] = item[col.field].toFixed(col.decimal)
item[col.field] = +item[col.field]
})
@@ -288,14 +535,14 @@
let _mdata = new Map()
_cdata.forEach(item => {
if (item[plot.Xaxis] && !_mdata.has(item[plot.Xaxis])) {
- _columns.forEach(col => {
+ 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.format === 'percent') {
+ if (col.show === 'percent') {
item[col.field] = item[col.field] * 100
}
item[col.field] = item[col.field].toFixed(col.decimal)
@@ -308,57 +555,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
- _columns.forEach(col => {
- _cell[col.field] = ''
- })
-
- _data.push(_cell)
- }
- }
- }
-
this.setState({empty: _data.length === 0})
return _data
}
/**
- * @description 缁熻鏁版嵁棰勫鐞嗭紝鍔ㄦ�佺敓鎴愮粺璁″瓧娈靛苟杩涜鏁版嵁杞崲
+ * @description 缁熻鏁版嵁棰勫鐞�
*/
- getStaticMsg = (data) => {
- const { plot, config } = this.props
+ getStaticMsg = () => {
+ const { plot, vstFields, data } = this.state
- let _column = config.columns.filter(col => plot.InfoValue === col.field)[0]
let percent = false
- let decimal = 0
- if (_column && _column.format === 'percent') {
+ let decimal = vstFields ? vstFields.decimal : 0
+
+ if (plot.show === 'percent') {
percent = true
}
- if (_column) {
- decimal = _column.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') {
@@ -394,7 +619,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]
@@ -428,7 +652,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]
@@ -453,32 +676,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 } = this.props
- const { 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
}
@@ -486,7 +685,7 @@
* @description 鍥捐〃娓叉煋鍒嗙粍
*/
viewrender = () => {
- const { plot } = this.props
+ const { plot } = this.state
if (plot.chartType === 'line') {
this.linerender()
@@ -499,36 +698,42 @@
* @description 鎶樼嚎鍥炬覆鏌�
*/
linerender = () => {
- const { plot, config } = this.props
- const { percentFields } = this.state
+ const { plot, transfield } = this.state
let _data = []
let _valfield = 'value'
let _typefield = 'key'
- let ispercent = false
+
+ let colors = new Map()
+ let colorIndex = 0
if (plot.datatype === 'statistics') {
_valfield = plot.InfoValue
_typefield = plot.InfoType
- if (percentFields.length > 0) {
- ispercent = true
+ if (plot.colors && plot.colors.length > 0) { // 棰滆壊璁剧疆
+ plot.colors.forEach(item => {
+ if (!colors.has(item.type)) {
+ colors.set(item.type, item.color)
+ }
+ })
}
- _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.colors && plot.colors.length > 0) { // 棰滆壊璁剧疆
+ plot.colors.forEach(item => {
+ if (!colors.has(transfield[item.type])) {
+ colors.set(transfield[item.type], item.color)
+ }
+ })
}
const ds = new DataSet()
@@ -572,24 +777,27 @@
nice: true,
range: [0, 0.93]
})
-
+
// 鍧愭爣杞存牸寮忓寲
chart.axis(plot.Xaxis, {
label: {
formatter: (val) => {
if (!val || /^\s*$/.test(val)) return val
let _val = `${val}`
- if (_val.length <= 10) return val
- return _val.substring(0, 7) + '...'
- }
- }
+ 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 } }
})
}
@@ -615,20 +823,57 @@
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 && plot.colors.length > 0) {
+ let limit = chartColors.length
+ _chart.color(_typefield, (key) => {
+ if (colors.get(key)) {
+ return colors.get(key)
+ } else {
+ colors.set(key, chartColors[colorIndex % limit])
+ colorIndex++
+ }
+ })
+ } 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') {
+ if (plot.point === 'true' && plot.colors && plot.colors.length > 0) {
+ let limit = chartColors.length
+ chart
+ .point()
+ .position(`${plot.Xaxis}*${_valfield}`)
+ .color(_typefield, (key) => {
+ if (colors.get(key)) {
+ return colors.get(key)
+ } else {
+ colors.set(key, chartColors[colorIndex % limit])
+ colorIndex++
+ }
+ })
+ .size(3)
+ .shape('circle')
+ } else if (plot.point === 'true') {
chart
.point()
.position(`${plot.Xaxis}*${_valfield}`)
@@ -643,47 +888,15 @@
/**
* @description 鑷畾涔夋覆鏌�
*/
- customrender = (data, transfield) => {
- const { plot } = this.props
- const { 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 } = this.state
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
}
@@ -695,15 +908,24 @@
height: plot.height || 400
})
- chart.data(dv.rows)
+ let _data = dv.rows
+ // 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] += ' '
+ }
- if (plot.coordinate !== 'polar' && barfields.length === 0) {
+ chart.data(_data)
+
+ if (!plot.hasBar) {
chart.scale(plot.Xaxis, {
range: [0, 1]
- })
- } else {
- chart.scale(plot.Xaxis, {
- range: [0.05, 0.95]
})
}
@@ -713,10 +935,11 @@
formatter: (val) => {
if (!val || /^\s*$/.test(val)) return val
let _val = `${val}`
- if (_val.length <= 10) return val
- return _val.substring(0, 7) + '...'
- }
- }
+ if (_val.length <= 11) return val
+ return _val.substring(0, 8) + '...'
+ },
+ style: { fill: plot.color }
+ },
})
if (!plot.legend || plot.legend === 'hidden') {
@@ -725,7 +948,8 @@
chart.legend({
custom: true,
position: plot.legend,
- items: legends,
+ items: plot.legends,
+ itemName: { style: { fill: plot.color } }
})
}
@@ -737,37 +961,13 @@
})
}
- if (plot.transpose === 'true') {
- chart.coordinate().transpose()
- }
-
- if (plot.coordinate === 'polar') {
- chart.coordinate('polar', {
- innerRadius: 0.1,
- radius: 0.8
+ plot.customs.forEach((item, i) => {
+ chart.axis(item.name, item.axis)
+
+ chart.scale(item.name, {
+ nice: true,
+ range: [0, 0.93]
})
- }
-
- 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
- })
- }
if (item.chartType === 'bar') {
let _chart = chart
@@ -778,12 +978,28 @@
.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 + '%'
+ }
+ return {
+ content: value,
+ style: {
+ fill: plot.color
+ }
+ }
+ })
+ }
+ if (plot.barRadius) {
+ _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
}
} else if (item.chartType === 'line') {
let _chart = chart
@@ -794,12 +1010,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') {
@@ -820,36 +1046,42 @@
* @description 鏌辩姸鍥炬覆鏌�
*/
barrender = () => {
- const { plot, config } = this.props
- const { percentFields } = this.state
+ const { plot, transfield } = this.state
let _data = []
let _valfield = 'value'
let _typefield = 'key'
- let ispercent = false
+
+ let colors = new Map()
+ let colorIndex = 0
if (plot.datatype === 'statistics') {
_valfield = plot.InfoValue
_typefield = plot.InfoType
- if (percentFields.length > 0) {
- ispercent = true
+ if (plot.colors && plot.colors.length > 0) { // 棰滆壊璁剧疆
+ plot.colors.forEach(item => {
+ if (!colors.has(item.type)) {
+ colors.set(item.type, item.color)
+ }
+ })
}
- _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.colors && plot.colors.length > 0) { // 棰滆壊璁剧疆
+ plot.colors.forEach(item => {
+ if (!colors.has(transfield[item.type])) {
+ colors.set(transfield[item.type], item.color)
+ }
+ })
}
const ds = new DataSet()
@@ -883,6 +1115,13 @@
// 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] += ' '
}
@@ -899,17 +1138,20 @@
formatter: (val) => {
if (!val || /^\s*$/.test(val)) return val
let _val = `${val}`
- if (_val.length <= 10) return val
- return _val.substring(0, 7) + '...'
- }
- }
+ 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 } }
})
}
@@ -937,7 +1179,6 @@
let _chart = chart
.interval()
.position(`${plot.Xaxis}*${_valfield}`)
- .color(_typefield)
.adjust([
{
type: 'dodge',
@@ -948,87 +1189,171 @@
.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 && plot.colors.length > 0) {
+ let limit = chartColors.length
+ _chart.color(_typefield, (key) => {
+ if (colors.get(key)) {
+ return colors.get(key)
+ } else {
+ colors.set(key, chartColors[colorIndex % limit])
+ colorIndex++
+ }
+ })
+ } 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.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 = 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 && plot.colors.length > 0) {
+ let limit = chartColors.length
+ _chart.color(_typefield, (key) => {
+ if (colors.get(key)) {
+ return colors.get(key)
+ } else {
+ colors.set(key, chartColors[colorIndex % limit])
+ colorIndex++
+ }
+ })
+ } else {
+ _chart.color(_typefield)
}
+ if (plot.label === 'true') {
+ _chart.label(_valfield, (value) => {
+ if (plot.show === 'percent') {
+ value = value + '%'
+ }
+ return {
+ content: value,
+ style: {
+ fill: plot.color
+ }
+ }
+ })
+ }
+
+ if (plot.barSize || plot.correction) {
+ _chart.size(plot.barSize || 35)
+ }
+ if (plot.barRadius) {
+ _chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
+ }
+ }
+
+ if (plot.linkmenu && plot.linkmenu.length > 0) {
+ let menu_id = plot.linkmenu.slice(-1)[0]
+ let menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
+
+ chart.on('element: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('鑿滃崟鎵撳紑澶辫触锛�')
+ }
+ })
}
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 { loading, config, BID, Tab } = this.props
- const { 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 (
<ExcelOutButton
key={item.uuid}
BID={BID}
- Tab={Tab}
btn={item}
show="icon"
setting={config.setting}
- getexceloutparam={this.props.getexceloutparam}
- updateStatus={() => {}}
/>
)
} else {
@@ -1036,17 +1361,15 @@
<ExcelInButton
key={item.uuid}
BID={BID}
- Tab={Tab}
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>
@@ -1054,4 +1377,17 @@
}
}
-export default LineChart
\ No newline at end of file
+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)
\ No newline at end of file
--
Gitblit v1.8.0