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 | 222 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 144 insertions(+), 78 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 2a6777a..9f522fb 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -12,9 +12,10 @@
import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
+import NormalHeader from '@/tabviews/custom/components/share/normalheader'
import './index.scss'
-const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
+// const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
const ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
const ExcelInButton = asyncComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
@@ -94,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 => {
@@ -202,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
@@ -219,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++
@@ -837,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)
@@ -851,24 +906,22 @@
range: [0, 1]
})
}
- chart.scale(_valfield, {
+
+ let c = {
nice: true,
range: [0, 0.9]
- })
-
- // 鍧愭爣杞存牸寮忓寲
- chart.axis(plot.Xaxis, {
- label: {
- formatter: (val) => {
- if (!val || /^\s*$/.test(val)) return val
- let _val = `${val}`
- if (_val.length <= 11) return val
- return _val.substring(0, 8) + '...'
- },
- style: { fill: plot.color }
- },
- })
- chart.axis(_valfield, { label: { style: { fill: plot.color } } })
+ }
+
+ if (plot.min || plot.min === 0) {
+ c.min = plot.min
+ }
+ if (plot.max || plot.max === 0) {
+ c.max = plot.max
+ }
+ chart.scale(_valfield, c)
+
+ chart.axis(plot.Xaxis, plot.$xc)
+ chart.axis(_valfield, plot.$yc)
if (!plot.legend || plot.legend === 'hidden') {
chart.legend(false)
@@ -925,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 + '%'
@@ -964,10 +1017,13 @@
if (plot.area === 'true') {
let area = chart
.area()
- .shape(plot.shape || 'smooth')
+ // .shape(plot.shape || 'smooth')
.position(`${plot.Xaxis}*${_valfield}`)
.tooltip(false)
+ if (plot.shape === 'smooth') {
+ area.shape('smooth')
+ }
if (plot.$colors) {
let limit = chartColors.length
area.color(_typefield, (key) => {
@@ -1013,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, {
@@ -1117,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)
@@ -1160,7 +1211,7 @@
} else {
_chart.color('key')
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label('value*key', (value, key) => {
if (plot.show === 'percent') {
value = value + '%'
@@ -1211,7 +1262,7 @@
} else {
_chart.color('key')
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label('value*key', (value, key) => {
if (plot.show === 'percent') {
value = value + '%'
@@ -1250,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.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}`)
@@ -1269,7 +1329,7 @@
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 + '%'
@@ -1292,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}`)
@@ -1394,29 +1463,26 @@
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: plot.height
+ height: this.wrap.offsetHeight - 25
})
chart.data(_data)
- chart.scale(_valfield, {
+ let c = {
nice: true,
range: [0, 0.9]
- })
+ }
- // 鍧愭爣杞存牸寮忓寲
- chart.axis(plot.Xaxis, {
- label: {
- formatter: (val) => {
- if (!val || /^\s*$/.test(val)) return val
- let _val = `${val}`
- if (_val.length <= 11) return val
- return _val.substring(0, 8) + '...'
- },
- style: { fill: plot.color }
- },
- })
- chart.axis(_valfield, { label: { style: { fill: plot.color } } })
+ if (plot.min || plot.min === 0) {
+ c.min = plot.min
+ }
+ if (plot.max || plot.max === 0) {
+ c.max = plot.max
+ }
+ chart.scale(_valfield, c)
+
+ chart.axis(plot.Xaxis, plot.$xc)
+ chart.axis(_valfield, plot.$yc)
if (!plot.legend || plot.legend === 'hidden') {
chart.legend(false)
@@ -1514,7 +1580,7 @@
} else {
_chart.color(_typefield)
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
if (plot.show === 'percent') {
value = value + '%'
@@ -1572,7 +1638,7 @@
} else {
_chart.color(_typefield)
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
if (plot.show === 'percent') {
value = value + '%'
@@ -1608,7 +1674,7 @@
chart.on('element:click', (ev) => {
let data = ev.data.data
- MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), null)
+ MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data)
})
if (plot.interaction && plot.interaction.length) {
@@ -1638,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') {
@@ -1664,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>
--
Gitblit v1.8.0