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 | 862 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 560 insertions(+), 302 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 cdafdf7..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,9 +2,9 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Chart } from '@antv/g2'
-import { connect } from 'react-redux'
+// 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'
@@ -12,7 +12,7 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
-import { modifyTabview } from '@/store/action'
+// import { modifyTabview } from '@/store/action'
import MKEmitter from '@/utils/events.js'
import './index.scss'
@@ -42,9 +42,6 @@
search: null, // 鎼滅储鏉′欢
vFields: [], // 鏁板�煎瓧娈�
vstFields: null, // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
- chartData: [], // 鍥捐〃鏁版嵁
- chartFields: [], // 缁熻鍥捐〃鐢熸垚瀛楁闆�
- selectFields: [], // 缁熻鍥捐〃閫夋嫨瀛楁
}
UNSAFE_componentWillMount () {
@@ -65,6 +62,7 @@
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
@@ -98,13 +96,14 @@
})
}
+ let height = config.plot.height || 400
if (config.plot.title || config.search.length > 0) {
- _config.plot.height = _config.plot.height - 80
+ _config.plot.height = height - 70
} else {
- _config.plot.height = _config.plot.height - 30
+ _config.plot.height = height - 25
}
- _config.style.height = config.plot.height || 400
+ _config.style.height = height
let transfield = {}
_config.columns.forEach(col => {
@@ -115,41 +114,109 @@
_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 colors = new Map()
+ 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
-
- 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)
+ if (colors.has(item.name)) {
+ item.color = colors.get(item.name)
} 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) {
@@ -175,9 +242,7 @@
})
_config.plot.customs = fields
_config.plot.legends = legends
- _config.plot.hasBar = hasBar
- } else {
- _config.plot.enabled = 'false'
+ _config.plot.axisIndex = axisIndex
}
this.setState({
@@ -231,7 +296,7 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
- MKEmitter.addListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
this.handleTimer()
}
@@ -246,7 +311,7 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
- MKEmitter.removeListener('getexceloutparam', this.getexceloutparam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
}
@@ -255,16 +320,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 = { '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
@@ -356,7 +412,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- getexceloutparam = (menuId, btnId) => {
+ queryModuleParam = (menuId, btnId) => {
const { mainSearch } = this.props
const { arr_field, config, search } = this.state
@@ -372,7 +428,7 @@
})
}
- MKEmitter.emit('execExcelout', config.uuid, btnId, {
+ MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
@@ -448,29 +504,11 @@
* @description 鏁版嵁棰勫鐞嗭紝缁熻鏁版嵁闇�瑕侀噸缃�
*/
handleData = () => {
- const { data, plot } = this.state
-
- if (plot.datatype === 'statistics') {
- let result = this.getStaticMsg(data)
-
- this.setState({
- chartData: result.data,
- chartFields: result.chartFields,
- selectFields: result.selectFields
- }, () => {
- let _element = document.getElementById(this.state.chartId)
- if (_element) {
- _element.innerHTML = ''
- }
- this.viewrender()
- })
- } else {
- let _element = document.getElementById(this.state.chartId)
- if (_element) {
- _element.innerHTML = ''
- }
- this.viewrender()
+ let _element = document.getElementById(this.state.chartId)
+ if (_element) {
+ _element.innerHTML = ''
}
+ this.viewrender()
}
/**
@@ -480,9 +518,9 @@
* 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 []
}
@@ -525,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') {
@@ -559,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'
@@ -578,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)
}
})
@@ -590,36 +632,30 @@
}
/**
- * @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') {
@@ -655,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]
@@ -689,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]
@@ -714,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
}
@@ -764,37 +775,19 @@
let _data = []
let _valfield = 'value'
let _typefield = 'key'
-
- let colors = new Map()
let colorIndex = 0
if (plot.datatype === 'statistics') {
_valfield = plot.InfoValue
_typefield = plot.InfoType
- 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 data = this.getdata()
if (plot.enabled === 'true') {
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()
@@ -824,7 +817,7 @@
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: plot.height || 400
+ height: plot.height
})
chart.data(_data)
@@ -836,7 +829,7 @@
}
chart.scale(_valfield, {
nice: true,
- range: [0, 0.93]
+ range: [0, 0.9]
})
// 鍧愭爣杞存牸寮忓寲
@@ -892,14 +885,14 @@
}
})
- if (plot.colors && plot.colors.length > 0) {
+ if (plot.$colors) {
let limit = chartColors.length
_chart.color(_typefield, (key) => {
- if (colors.get(key)) {
- return colors.get(key)
+ if (plot.$colors.has(key)) {
+ return plot.$colors.get(key)
} else {
- colors.set(key, chartColors[colorIndex % limit])
colorIndex++
+ return chartColors[(colorIndex - 1) % limit]
}
})
} else {
@@ -919,28 +912,54 @@
})
}
- if (plot.point === 'true' && plot.colors && plot.colors.length > 0) {
- let limit = chartColors.length
- chart
+ if (plot.point === 'true') {
+ let _chart = chart
.point()
.position(`${plot.Xaxis}*${_valfield}`)
- .color(_typefield, (key) => {
- if (colors.get(key)) {
- return colors.get(key)
+ .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 {
- colors.set(key, chartColors[colorIndex % limit])
colorIndex++
+ return chartColors[(colorIndex - 1) % limit]
}
})
- .size(3)
- .shape('circle')
- } else if (plot.point === 'true') {
- chart
- .point()
+ } else {
+ _chart.color(_typefield)
+ }
+ }
+
+ if (plot.area === 'true') {
+ let area = chart
+ .area()
+ .shape(plot.shape || 'smooth')
.position(`${plot.Xaxis}*${_valfield}`)
- .color(_typefield)
- .size(3)
- .shape('circle')
+ .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()
@@ -950,9 +969,23 @@
* @description 鑷畾涔夋覆鏌�
*/
customrender = (data) => {
- const { plot } = this.state
+ 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) {
@@ -963,32 +996,21 @@
}
})
+ 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
})
-
- 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] += ' '
- }
-
- chart.data(_data)
-
- if (!plot.hasBar) {
- chart.scale(plot.Xaxis, {
- range: [0, 1]
- })
- }
// 鍧愭爣杞存牸寮忓寲
chart.axis(plot.Xaxis, {
@@ -1002,6 +1024,12 @@
style: { fill: plot.color }
},
})
+
+ if (!plot.hasBar) {
+ chart.scale(plot.Xaxis, {
+ range: [0, 1]
+ })
+ }
if (!plot.legend || plot.legend === 'hidden') {
chart.legend(false)
@@ -1022,16 +1050,197 @@
})
}
- plot.customs.forEach((item, i) => {
- chart.axis(item.name, item.axis)
-
- chart.scale(item.name, {
- nice: true,
- range: [0, 0.93]
+ chart.scale({
+ nice: true
+ })
+
+ 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.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
+ },
})
- if (item.chartType === 'bar') {
- let _chart = chart
+ 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)
@@ -1051,11 +1260,12 @@
if (plot.show === 'percent') {
value = value + '%'
}
+ if (plot.label === 'true' && plot.labelColor === 'custom' && item.color) {
+ lablecfg.style.fill = item.color
+ }
return {
content: value,
- style: {
- fill: plot.color
- }
+ ...lablecfg
}
})
}
@@ -1063,7 +1273,16 @@
_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)
@@ -1100,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()
}
@@ -1107,42 +1334,25 @@
* @description 鏌辩姸鍥炬覆鏌�
*/
barrender = () => {
- const { plot, transfield } = this.state
+ const { plot, transfield, config } = this.state
let _data = []
let _valfield = 'value'
let _typefield = 'key'
- let colors = new Map()
let colorIndex = 0
if (plot.datatype === 'statistics') {
_valfield = plot.InfoValue
_typefield = plot.InfoType
- 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 data = this.getdata()
if (plot.enabled === 'true') {
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()
@@ -1171,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! 鏃堕棿鏍煎紡
@@ -1190,7 +1400,7 @@
chart.scale(_valfield, {
nice: true,
- range: [0, 0.93]
+ range: [0, 0.9]
})
// 鍧愭爣杞存牸寮忓寲
@@ -1225,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') {
@@ -1254,35 +1500,47 @@
}
})
- if (plot.colors && plot.colors.length > 0) {
+ if (plot.$colors) {
let limit = chartColors.length
_chart.color(_typefield, (key) => {
- if (colors.get(key)) {
- return colors.get(key)
+ if (plot.$colors.has(key)) {
+ return plot.$colors.get(key)
} else {
- colors.set(key, chartColors[colorIndex % limit])
colorIndex++
+ return chartColors[(colorIndex - 1) % limit]
}
})
} else {
_chart.color(_typefield)
}
if (plot.label === 'true') {
- _chart.label(_valfield, (value) => {
+ _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,
- style: {
- fill: plot.color
- }
+ ...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] })
@@ -1300,29 +1558,32 @@
}
})
- if (plot.colors && plot.colors.length > 0) {
+ if (plot.$colors) {
let limit = chartColors.length
_chart.color(_typefield, (key) => {
- if (colors.get(key)) {
- return colors.get(key)
+ if (plot.$colors.has(key)) {
+ return plot.$colors.get(key)
} else {
- colors.set(key, chartColors[colorIndex % limit])
colorIndex++
+ return chartColors[(colorIndex - 1) % limit]
}
})
} else {
_chart.color(_typefield)
}
if (plot.label === 'true') {
- _chart.label(_valfield, (value) => {
+ _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,
- style: {
- fill: plot.color
- }
+ ...lablecfg
}
})
}
@@ -1330,73 +1591,80 @@
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] })
}
}
- 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:click', (ev) => {
+ let data = ev.data.data
+ MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), null)
+ })
- chart.on('element:dblclick', (ev) => {
- if (!menu) {
- notification.warning({
- top: 92,
- message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
- duration: 5
- })
- return
- }
+ // 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] || ''
- try {
- let data = ev.data.data
- let primaryId = ''
- if (this.state.config.setting.primaryKey && data) {
- primaryId = data[this.state.config.setting.primaryKey] || ''
- }
+ // chart.on('element:dblclick', (ev) => {
+ // if (!menu) {
+ // notification.warning({
+ // top: 92,
+ // message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
+ // duration: 5
+ // })
+ // return
+ // }
- let newtab = {
- ...menu,
- selected: true,
- param: {
- $BID: primaryId
- }
- }
+ // 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
- })
+ // 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())
- }
+ // 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('鑿滃崟鎵撳紑澶辫触锛�')
- }
+ // 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) => {
@@ -1406,7 +1674,7 @@
}
render() {
- const { config, loading, plot, empty, chartFields, selectFields, BID } = this.state
+ const { config, loading, empty, BID } = this.state
return (
<div className="custom-line-chart-plot-box" style={config.style}>
@@ -1442,19 +1710,8 @@
)
}
})}
- {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}
</div>
- <div className={'canvas' + (empty ? ' empty' : '')} 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>
@@ -1462,17 +1719,18 @@
}
}
-const mapStateToProps = (state) => {
- return {
- tabviews: state.tabviews,
- permMenus: state.permMenus,
- }
-}
+// const mapStateToProps = (state) => {
+// return {
+// tabviews: state.tabviews,
+// permMenus: state.permMenus,
+// }
+// }
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
- }
-}
+// const mapDispatchToProps = (dispatch) => {
+// return {
+// modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
+// }
+// }
-export default connect(mapStateToProps, mapDispatchToProps)(LineChart)
\ No newline at end of file
+// export default connect(mapStateToProps, mapDispatchToProps)(LineChart)
+export default LineChart
\ No newline at end of file
--
Gitblit v1.8.0