From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 565 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 341 insertions(+), 224 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 21ce0d1..9f522fb 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -2,7 +2,6 @@
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, notification } from 'antd'
import moment from 'moment'
@@ -12,11 +11,11 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
-import { modifyTabview } from '@/store/action'
import MKEmitter from '@/utils/events.js'
+import NormalHeader from '@/tabviews/custom/components/share/normalheader'
import './index.scss'
-const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
+// const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
const ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
const ExcelInButton = asyncComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
@@ -96,14 +95,7 @@
})
}
- let height = config.plot.height || 400
- if (config.plot.title || config.search.length > 0) {
- _config.plot.height = height - 70
- } else {
- _config.plot.height = height - 25
- }
-
- _config.style.height = height
+ _config.style.height = config.plot.height || 400
let transfield = {}
_config.columns.forEach(col => {
@@ -145,7 +137,7 @@
if (_config.plot.datatype === 'statistics') {
if (_config.plot.ramp === 'true') {
let _s = 'l(0) '
- if (_config.plot.chartType === 'bar') {
+ if (_config.plot.chartType === 'bar' || (_config.plot.chartType === 'line' && _config.plot.rampDirection === 'vertical')) {
_s = 'l(90) '
}
_config.plot.colors.forEach(item => {
@@ -183,7 +175,7 @@
} else {
if (_config.plot.ramp === 'true') {
let _s = 'l(0) '
- if (_config.plot.chartType === 'bar') {
+ if (_config.plot.chartType === 'bar' || (_config.plot.chartType === 'line' && _config.plot.rampDirection === 'vertical')) {
_s = 'l(90) '
}
_config.plot.colors.forEach(item => {
@@ -204,6 +196,39 @@
_config.plot.$colors = colors
}
+ let xc = {label: {
+ formatter: (val) => {
+ if (!val || /^\s*$/.test(val)) return val
+ let _val = `${val}`
+ if (_val.length <= 11) return val
+ return _val.substring(0, 8) + '...'
+ },
+ style: { fill: _config.plot.color }
+ }}
+ let yc = {label: { style: { fill: _config.plot.color } }}
+ if (_config.plot.grid === 'hidden') {
+ yc.grid = null
+ }
+ if (_config.plot.y_line === 'show') {
+ yc.line = {style: { stroke: '#D1D2CE' }}
+ }
+ if (_config.plot.lineColor) {
+ xc.tickLine = {style: { stroke: _config.plot.lineColor }}
+ xc.line = { style: { stroke: _config.plot.lineColor } }
+ if (yc.grid !== null) {
+ yc.grid = { line: { style: { stroke: _config.plot.lineColor } }}
+ }
+ if (yc.line) {
+ yc.line = { style: { stroke: _config.plot.lineColor } }
+ }
+ }
+
+ _config.plot.$xc = xc
+ _config.plot.$yc = yc
+
+ _config.plot.$paddingLeft = 30
+ _config.plot.$paddingRight = 30
+
if (_config.plot.enabled === 'true') {
let colorIndex = 0
let limit = chartColors.length
@@ -221,10 +246,38 @@
if (item.axis === 'true' && axisIndex < 2) {
if (axisIndex === 0) {
- item.axis = { title: { style: { fill: _config.plot.color } }, label: {style: { fill: _config.plot.color }} }
+ item.axis = { label: {style: { fill: _config.plot.color }} }
+ if (item.title !== 'false') {
+ item.axis.title = { style: { fill: _config.plot.color } }
+ _config.plot.$paddingLeft = 50
+ }
+ if (_config.plot.grid === 'hidden') {
+ item.axis.grid = null
+ }
+ if (_config.plot.y_line === 'show') {
+ item.axis.line = {style: { stroke: '#D1D2CE' }}
+ }
+ if (_config.plot.lineColor) {
+ if (item.axis.grid !== null) {
+ item.axis.grid = { line: { style: { stroke: _config.plot.lineColor } }}
+ }
+ if (item.axis.line) {
+ item.axis.line = { style: { stroke: _config.plot.lineColor } }
+ }
+ }
fields.unshift(item)
} else {
- item.axis = { grid: null, title: {style: { fill: _config.plot.color }}, label: {style: { fill: _config.plot.color }} }
+ item.axis = { grid: null, label: {style: { fill: _config.plot.color }} }
+ if (item.title !== 'false') {
+ item.axis.title = { style: { fill: _config.plot.color } }
+ _config.plot.$paddingRight = 60
+ }
+ if (_config.plot.y_line === 'show') {
+ item.axis.line = {style: { stroke: '#D1D2CE' }}
+ }
+ if (_config.plot.lineColor && item.axis.line) {
+ item.axis.line = { style: { stroke: _config.plot.lineColor } }
+ }
fields.splice(1, 0, item)
}
axisIndex++
@@ -280,12 +333,10 @@
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()
- })
- }
+ } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ this.setState({}, () => {
+ this.loadData()
+ })
}
}
@@ -419,7 +470,7 @@
if (config.uuid !== menuId) return
let searches = search ? fromJS(search).toJS() : []
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
let keys = searches.map(item => item.key.toLowerCase())
mainSearch.forEach(item => {
if (!keys.includes(item.key.toLowerCase())) {
@@ -453,7 +504,7 @@
}
let searches = search ? fromJS(search).toJS() : []
- if (mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
+ if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
let keys = searches.map(item => item.key)
mainSearch.forEach(item => {
if (!keys.includes(item.key)) {
@@ -462,11 +513,8 @@
})
}
- let requireFields = searches.filter(item => item.required && (!item.value || item.value.length === 0))
+ let requireFields = searches.filter(item => item.required && item.value === '')
if (requireFields.length > 0) {
- this.setState({
- loading: false
- })
return
}
@@ -518,7 +566,7 @@
* 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
*/
getdata = () => {
- const { data, plot, vFields } = this.state
+ const { data, plot, vFields, config } = this.state
if (!data || data.length === 0) {
this.setState({empty: true})
@@ -531,6 +579,8 @@
if (plot.repeat === 'average') {
let _mdata = new Map()
_cdata.forEach(item => {
+ if (!item[plot.Xaxis]) return
+
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
item[col.field] = parseFloat(item[col.field])
@@ -543,10 +593,15 @@
}
})
- if (item[plot.Xaxis] && !_mdata.has(item[plot.Xaxis])) {
+ // dodge is not support linear attribute, please use category attribute! 鏃堕棿鏍煎紡
+ if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
+ item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ }
+
+ if (!_mdata.has(item[plot.Xaxis])) {
item.$count = 1
_mdata.set(item[plot.Xaxis], item)
- } else if (item[plot.Xaxis]) {
+ } else {
let _item = _mdata.get(item[plot.Xaxis])
_item.$count++
vFields.forEach(col => {
@@ -563,11 +618,14 @@
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') {
let _mdata = new Map()
_cdata.forEach(item => {
+ if (!item[plot.Xaxis]) return
+
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
item[col.field] = parseFloat(item[col.field])
@@ -580,9 +638,13 @@
}
})
- if (item[plot.Xaxis] && !_mdata.has(item[plot.Xaxis])) {
+ if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
+ item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ }
+
+ if (!_mdata.has(item[plot.Xaxis])) {
_mdata.set(item[plot.Xaxis], item)
- } else if (item[plot.Xaxis]) {
+ } else {
let _item = _mdata.get(item[plot.Xaxis])
vFields.forEach(col => {
_item[col.field] += item[col.field]
@@ -597,12 +659,19 @@
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'
let _mdata = new Map()
_cdata.forEach(item => {
- if (item[plot.Xaxis] && !_mdata.has(item[plot.Xaxis])) {
+ if (!item[plot.Xaxis]) return
+
+ if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
+ item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ }
+
+ if (!_mdata.has(item[plot.Xaxis])) {
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
item[col.field] = parseFloat(item[col.field])
@@ -616,6 +685,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)
}
})
@@ -653,6 +724,10 @@
_cdata.forEach(item => {
if (!item[plot.InfoType] || !item[plot.Xaxis]) return
+ if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
+ item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ }
+
item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
if (typeof(item[plot.InfoValue]) !== 'number') {
item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
@@ -688,6 +763,10 @@
_cdata.forEach(item => {
if (!item[plot.InfoType] || !item[plot.Xaxis]) return
+ if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
+ item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ }
+
item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
if (typeof(item[plot.InfoValue]) !== 'number') {
@@ -720,6 +799,10 @@
let _mdata = new Map()
_cdata.forEach(item => {
if (!item[plot.InfoType] || !item[plot.Xaxis]) return
+
+ if (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
+ item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ }
item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
@@ -809,11 +892,11 @@
_data = dv.rows
}
-
+
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: plot.height
+ height: this.wrap.offsetHeight - 25
})
chart.data(_data)
@@ -823,24 +906,22 @@
range: [0, 1]
})
}
- chart.scale(_valfield, {
+
+ let c = {
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 <= 11) return val
- return _val.substring(0, 8) + '...'
- },
- style: { fill: plot.color }
- },
- })
- chart.axis(_valfield, { label: { style: { fill: plot.color } } })
+ range: [0, 0.9]
+ }
+
+ if (plot.min || plot.min === 0) {
+ c.min = plot.min
+ }
+ if (plot.max || plot.max === 0) {
+ c.max = plot.max
+ }
+ chart.scale(_valfield, c)
+
+ chart.axis(plot.Xaxis, plot.$xc)
+ chart.axis(_valfield, plot.$yc)
if (!plot.legend || plot.legend === 'hidden') {
chart.legend(false)
@@ -885,6 +966,9 @@
let limit = chartColors.length
_chart.color(_typefield, (key) => {
if (plot.$colors.has(key)) {
+ if (plot.area === 'true' && plot.rampDirection === 'vertical') {
+ return plot.$colors.get(key).replace(/l\(9?0\) 0:|\s1:.*/ig, '')
+ }
return plot.$colors.get(key)
} else {
colorIndex++
@@ -894,7 +978,7 @@
} else {
_chart.color(_typefield)
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label(_valfield, (value) => {
if (plot.show === 'percent') {
value = value + '%'
@@ -908,12 +992,16 @@
})
}
- if (plot.point === 'true' && plot.$colors) {
- let limit = chartColors.length
- chart
+ if (plot.point === 'true') {
+ let _chart = chart
.point()
.position(`${plot.Xaxis}*${_valfield}`)
- .color(_typefield, (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 {
@@ -921,15 +1009,34 @@
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.shape === 'smooth') {
+ area.shape('smooth')
+ }
+ 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) {
@@ -947,21 +1054,8 @@
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) {
@@ -975,31 +1069,17 @@
let padding = [10, 30, 30, 30]
if (!plot.Bar_axis) {
- if (plot.axisIndex === 2) {
- padding = [10, 50, 30, 50]
- } else if (plot.axisIndex === 1) {
- padding = [10, 30, 30, 50]
- }
+ padding = [10, plot.$paddingRight, 30, plot.$paddingLeft]
}
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: plot.height
+ height: this.wrap.offsetHeight - 25
})
// 鍧愭爣杞存牸寮忓寲
- chart.axis(plot.Xaxis, {
- label: {
- formatter: (val) => {
- if (!val || /^\s*$/.test(val)) return val
- let _val = `${val}`
- if (_val.length <= 11) return val
- return _val.substring(0, 8) + '...'
- },
- style: { fill: plot.color }
- },
- })
+ chart.axis(plot.Xaxis, plot.$xc)
if (!plot.hasBar) {
chart.scale(plot.Xaxis, {
@@ -1030,6 +1110,27 @@
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: {
@@ -1039,7 +1140,7 @@
padding
})
const dst = new DataSet()
- const dvt = dst.createView().source(_copydata)
+ const dvt = dst.createView().source(data)
dvt.transform({
type: 'fold',
@@ -1058,10 +1159,19 @@
view1.data(dvt.rows)
- view1.scale('value', {
+ let c = {
nice: true,
range: [0, 0.9]
- })
+ }
+
+ if (plot.min || plot.min === 0) {
+ c.min = plot.min
+ }
+ if (plot.max || plot.max === 0) {
+ c.max = plot.max
+ }
+ view1.scale('value', c)
+ view1.axis('value', plot.$yc)
view1.legend(false)
@@ -1101,16 +1211,18 @@
} else {
_chart.color('key')
}
- if (plot.label === 'true') {
- _chart.label('value', (value) => {
+ if (plot.label !== 'false') {
+ _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,
- style: {
- fill: plot.color
- }
+ ...lablecfg
}
})
}
@@ -1150,16 +1262,17 @@
} else {
_chart.color('key')
}
- if (plot.label === 'true') {
- _chart.label('value', (value) => {
+ if (plot.label !== 'false') {
+ _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,
- style: {
- fill: plot.color
- }
+ ...lablecfg
}
})
}
@@ -1188,10 +1301,19 @@
if (item.chartType === 'bar' && !plot.Bar_axis) {
view2.axis(item.name, item.axis)
- view2.scale(item.name, {
+ let c = {
nice: true,
- range: [0, 0.93]
- })
+ range: [0, 0.9]
+ }
+
+ if (item.min || item.min === 0) {
+ c.min = item.min
+ }
+ if (item.max || item.max === 0) {
+ c.max = item.max
+ }
+
+ view2.scale(item.name, c)
let _chart = view2
.interval()
.position(`${plot.Xaxis}*${item.name}`)
@@ -1207,16 +1329,17 @@
if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
- if (item.label === 'true') {
+ if (item.label !== 'false') {
_chart.label(item.name, (value) => {
if (plot.show === 'percent') {
value = value + '%'
}
+ if (plot.label === 'true' && plot.labelColor === 'custom' && item.color) {
+ lablecfg.style.fill = item.color
+ }
return {
content: value,
- style: {
- fill: plot.color
- }
+ ...lablecfg
}
})
}
@@ -1229,10 +1352,19 @@
} else {
view2.axis(item.name, { grid: null, title: null, label: null })
}
- view2.scale(item.name, {
+ let c = {
nice: true,
range: [0, 0.9]
- })
+ }
+
+ if (item.min || item.min === 0) {
+ c.min = item.min
+ }
+ if (item.max || item.max === 0) {
+ c.max = item.max
+ }
+
+ view2.scale(item.name, c)
let _chart = view2
.line()
.position(`${plot.Xaxis}*${item.name}`)
@@ -1285,12 +1417,11 @@
* @description 鏌辩姸鍥炬覆鏌�
*/
barrender = () => {
- const { plot, transfield } = this.state
+ const { plot, transfield, config } = this.state
let _data = []
let _valfield = 'value'
let _typefield = 'key'
-
let colorIndex = 0
if (plot.datatype === 'statistics') {
@@ -1332,41 +1463,26 @@
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: plot.height
+ height: this.wrap.offsetHeight - 25
})
-
- // 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)
- chart.scale(_valfield, {
+ let c = {
nice: true,
range: [0, 0.9]
- })
+ }
- // 鍧愭爣杞存牸寮忓寲
- chart.axis(plot.Xaxis, {
- label: {
- formatter: (val) => {
- if (!val || /^\s*$/.test(val)) return val
- let _val = `${val}`
- if (_val.length <= 11) return val
- return _val.substring(0, 8) + '...'
- },
- style: { fill: plot.color }
- },
- })
- chart.axis(_valfield, { label: { style: { fill: plot.color } } })
+ if (plot.min || plot.min === 0) {
+ c.min = plot.min
+ }
+ if (plot.max || plot.max === 0) {
+ c.max = plot.max
+ }
+ chart.scale(_valfield, c)
+
+ chart.axis(plot.Xaxis, plot.$xc)
+ chart.axis(_valfield, plot.$yc)
if (!plot.legend || plot.legend === 'hidden') {
chart.legend(false)
@@ -1386,10 +1502,44 @@
})
}
- let offset = {offsetY: 5}
+ 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()
- offset = {offsetY: 0, offsetX: -10}
+ 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') {
@@ -1430,23 +1580,34 @@
} else {
_chart.color(_typefield)
}
- if (plot.label === 'true') {
- _chart.label(_valfield, (value) => {
+ if (plot.label !== 'false') {
+ _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
- },
- ...offset
+ ...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] })
@@ -1477,16 +1638,19 @@
} else {
_chart.color(_typefield)
}
- if (plot.label === 'true') {
- _chart.label(_valfield, (value) => {
+ if (plot.label !== 'false') {
+ _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
}
})
}
@@ -1494,58 +1658,24 @@
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: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.on('element:click', (ev) => {
+ let data = ev.data.data
+ MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data)
+ })
if (plot.interaction && plot.interaction.length) {
plot.interaction.forEach(t => {
@@ -1574,7 +1704,7 @@
</div> : null
}
<NormalHeader config={config} BID={BID} menuType={this.props.menuType} refresh={this.refreshSearch} />
- <div className="canvas-wrap">
+ <div className="canvas-wrap" ref={ref => this.wrap = ref}>
<div className="chart-action">
{config.action.map(item => {
if (item.OpenType === 'excelOut') {
@@ -1600,7 +1730,7 @@
}
})}
</div>
- <div className={'canvas' + (empty ? ' empty' : '')} style={{height: config.plot.height + 25}} id={this.state.chartId}></div>
+ <div className={'canvas' + (empty ? ' empty' : '')} id={this.state.chartId}></div>
</div>
{empty ? <Empty description={false}/> : null}
</div>
@@ -1608,17 +1738,4 @@
}
}
-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
+export default LineChart
\ No newline at end of file
--
Gitblit v1.8.0