From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 630 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 404 insertions(+), 226 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 2f30000..b2449054 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 DataSet from '@antv/data-set'
import { Spin, Empty, notification } from 'antd'
+import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
import asyncComponent from './asyncButtonComponent'
@@ -12,11 +12,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'))
@@ -26,7 +26,6 @@
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -42,6 +41,7 @@
search: null, // 鎼滅储鏉′欢
vFields: [], // 鏁板�煎瓧娈�
vstFields: null, // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
+ chart: null
}
UNSAFE_componentWillMount () {
@@ -96,14 +96,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 => {
@@ -132,7 +125,7 @@
_config.plot.hasBar = Bar_axis.length > 0
- if (_config.plot.mutilBar !== 'overlap') {
+ if (_config.plot.mutilBar !== 'overlap' && Bar_axis.length > 1) {
_config.plot.Bar_axis = Bar_axis
}
} else {
@@ -145,7 +138,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 +176,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,13 +197,49 @@
_config.plot.$colors = colors
}
+ let limit = _config.plot.XLimit || 11
+
+ let xc = {label: {
+ formatter: (val) => {
+ if (!val || /^\s*$/.test(val)) return val
+ let _val = `${val}`
+ if (_val.length <= limit) return val
+ return _val.substring(0, limit) + '...'
+ },
+ 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
let axisIndex = 0
let fields = []
let legends = []
-
+ let vFieldsShow = {}
+
_config.plot.customs.forEach(item => {
if (colors.has(item.name)) {
item.color = colors.get(item.name)
@@ -221,10 +250,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++
@@ -239,10 +296,23 @@
name: item.name,
marker: { symbol: item.chartType === 'bar' ? 'square' : 'hyphen', style: { stroke: item.color,fill: item.color, r: 5, lineWidth: 2 } }
})
+
+ if (!_config.plot.Bar_axis || item.chartType !== 'bar') { // 鎶樼嚎鍥炬垨閲嶅彔涓嬬殑鏌辩姸鍥惧彲鍗曠嫭璁剧疆鏄剧ず绫诲瀷
+ if (item.show) {
+ vFieldsShow[item.type] = item.show
+ } else {
+ item.show = _config.plot.show
+ }
+ }
})
_config.plot.customs = fields
_config.plot.legends = legends
_config.plot.axisIndex = axisIndex
+ vFields.forEach(item => {
+ if (vFieldsShow[item.field]) {
+ item.show = vFieldsShow[item.field]
+ }
+ })
}
this.setState({
@@ -258,7 +328,9 @@
transfield
}, () => {
if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
- this.loadData()
+ setTimeout(() => {
+ this.loadData()
+ }, _config.setting.delay || 0)
} else if (config.setting.sync === 'true' && _data) {
this.handleData()
}
@@ -280,12 +352,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()
+ })
}
}
@@ -320,7 +390,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 = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
@@ -346,22 +416,30 @@
})
return
} else if (result.run_type) {
- this.setState({timer})
+ let repeats = config.timerRepeats || 0
+ this.setState({timer, repeats})
this.timer = setTimeout(() => {
- this.timerTask()
+ this.timerTask(repeats)
}, timer)
}
})
}
- timerTask = () => {
- const { timer } = this.state
+ timerTask = (times) => {
+ const { timer, repeats } = this.state
if (!timer) return
this.loadData(true)
-
+
+ if (repeats) {
+ times = times - 1
+ if (times <= 0) {
+ clearTimeout(this.timer)
+ return
+ }
+ }
this.timer = setTimeout(() => {
- this.timerTask()
+ this.timerTask(times)
}, timer)
}
@@ -376,16 +454,13 @@
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' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else {
+ this.loadData()
}
- 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'))
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -402,7 +477,7 @@
const { config } = this.state
if (!config.setting.supModule || config.setting.supModule !== MenuID) return
- if (id !== this.state.BID) {
+ if (id !== this.state.BID || id !== '') {
this.setState({ BID: id }, () => {
this.loadData()
})
@@ -419,7 +494,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())) {
@@ -440,7 +515,7 @@
* @description 鏁版嵁鍔犺浇
*/
async loadData (hastimer) {
- const { mainSearch, menuType } = this.props
+ const { mainSearch } = this.props
const { config, arr_field, BID, search } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -453,7 +528,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 +537,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
}
@@ -477,14 +549,21 @@
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID)
let result = await Api.genericInterface(param)
if (result.status) {
+ let reset = true
+
+ if (hastimer && is(fromJS(result.data), fromJS(this.state.data))) {
+ reset = false
+ }
+
this.setState({
data: result.data,
loading: false
}, () => {
+ if (!reset) return
this.handleData()
})
} else {
@@ -531,6 +610,8 @@
if (plot.repeat === 'average') {
let _mdata = new Map()
_cdata.forEach(item => {
+ if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
+
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
item[col.field] = parseFloat(item[col.field])
@@ -543,10 +624,17 @@
}
})
- 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]
+ } else {
+ 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 => {
@@ -569,6 +657,8 @@
} else if (plot.repeat === 'cumsum') {
let _mdata = new Map()
_cdata.forEach(item => {
+ if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
+
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
item[col.field] = parseFloat(item[col.field])
@@ -581,9 +671,15 @@
}
})
- 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]
+ } else {
+ 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]
@@ -604,7 +700,15 @@
} else { // plot.repeat === 'unrepeat'
let _mdata = new Map()
_cdata.forEach(item => {
- if (item[plot.Xaxis] && !_mdata.has(item[plot.Xaxis])) {
+ if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) 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]
+ } else {
+ 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])
@@ -657,6 +761,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])
@@ -692,6 +800,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') {
@@ -724,6 +836,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]
@@ -813,11 +929,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)
@@ -827,24 +943,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)
@@ -889,6 +1003,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++
@@ -898,8 +1015,11 @@
} else {
_chart.color(_typefield)
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label(_valfield, (value) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
if (plot.show === 'percent') {
value = value + '%'
}
@@ -937,10 +1057,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) => {
@@ -963,6 +1086,8 @@
}
chart.render()
+
+ this.setState({chart})
}
/**
@@ -971,21 +1096,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) {
@@ -999,31 +1111,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, {
@@ -1084,7 +1182,7 @@
padding
})
const dst = new DataSet()
- const dvt = dst.createView().source(_copydata)
+ const dvt = dst.createView().source(data)
dvt.transform({
type: 'fold',
@@ -1103,10 +1201,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)
@@ -1146,8 +1253,12 @@
} else {
_chart.color('key')
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label('value*key', (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1197,8 +1308,12 @@
} else {
_chart.color('key')
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label('value*key', (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1221,25 +1336,38 @@
}
}
- const view2 = chart.createView({
- region: {
- start: { x: 0, y: 0 },
- end: { x: 1, y: 1 }
- },
- padding
- })
+ let view2 = chart
+
+ if (plot.Bar_axis) {
+ 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) => {
+ plot.customs.forEach(item => {
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}`)
@@ -1248,16 +1376,20 @@
.tooltip(`${item.name}`, (value) => {
return {
name: item.name,
- value: plot.show === 'percent' ? value + '%' : value
+ value: item.show === 'percent' ? value + '%' : value
}
})
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') {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
+ if (item.show === 'percent') {
value = value + '%'
}
if (plot.label === 'true' && plot.labelColor === 'custom' && item.color) {
@@ -1278,10 +1410,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}`)
@@ -1290,13 +1431,17 @@
.tooltip(`${item.name}`, (value) => {
return {
name: item.name,
- value: plot.show === 'percent' ? value + '%' : value
+ value: item.show === 'percent' ? value + '%' : value
}
})
if (item.label === 'true') {
_chart.label(item.name, (value) => {
- if (plot.show === 'percent') {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
+ if (item.show === 'percent') {
value = value + '%'
}
return {
@@ -1328,6 +1473,8 @@
}
chart.render()
+
+ this.setState({chart})
}
/**
@@ -1339,7 +1486,6 @@
let _data = []
let _valfield = 'value'
let _typefield = 'key'
-
let colorIndex = 0
if (plot.datatype === 'statistics') {
@@ -1381,41 +1527,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)
@@ -1513,8 +1644,12 @@
} else {
_chart.color(_typefield)
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1571,8 +1706,12 @@
} else {
_chart.color(_typefield)
}
- if (plot.label === 'true') {
+ if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1607,56 +1746,61 @@
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.click === 'menus') {
+ let menu = null
+
+ if (plot.menus && plot.menus.length > 0) {
+ let s = data[plot.menuType] || ''
+ plot.menus.forEach(m => {
+ if (s !== m.sign) return
+ menu = m
+ })
+ }
+ if (!menu || !menu.MenuID) return
+
+ menu.type = menu.tabType
+
+ let newtab = {
+ ...menu,
+ param: {}
+ }
+
+ if (plot.joint === 'true') {
+ newtab.param.$BID = data.$$uuid || ''
+ }
+
+ if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
+ MKEmitter.emit('modifyTabs', newtab, 'replace')
+ } else {
+ MKEmitter.emit('modifyTabs', newtab, 'plus', true)
+ }
+ } else if (plot.click === 'menu' && plot.MenuID) {
+ let menu = {
+ MenuID: plot.MenuID,
+ MenuName: plot.MenuName,
+ MenuNo: plot.MenuNo,
+ type: plot.tabType
+ }
+
+ let newtab = {
+ ...menu,
+ param: {}
+ }
+
+ if (plot.joint === 'true') {
+ newtab.param.$BID = data.$$uuid || ''
+ }
+
+ if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
+ MKEmitter.emit('modifyTabs', newtab, 'replace')
+ } else {
+ MKEmitter.emit('modifyTabs', newtab, 'plus', true)
+ }
+ }
})
-
- // if (plot.linkmenu && plot.linkmenu.length > 0) {
- // let menu_id = plot.linkmenu.slice(-1)[0]
- // let menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
-
- // chart.on('element:dblclick', (ev) => {
- // if (!menu) {
- // notification.warning({
- // top: 92,
- // message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
- // duration: 5
- // })
- // return
- // }
-
- // try {
- // let data = ev.data.data
- // let primaryId = ''
- // if (this.state.config.setting.primaryKey && data) {
- // primaryId = data[this.state.config.setting.primaryKey] || ''
- // }
-
- // let newtab = {
- // ...menu,
- // selected: true,
- // param: {
- // $BID: primaryId
- // }
- // }
-
- // let tabs = this.props.tabviews.filter(tab => {
- // tab.selected = false
- // return tab.MenuID !== newtab.MenuID
- // })
-
- // if (this.props.tabviews.length > tabs.length) {
- // this.props.modifyTabview(fromJS(tabs).toJS())
- // }
-
- // this.setState({}, () => {
- // tabs.push(newtab)
- // this.props.modifyTabview(tabs)
- // })
- // } catch {
- // console.warn('鑿滃崟鎵撳紑澶辫触锛�')
- // }
- // })
- // }
if (plot.interaction && plot.interaction.length) {
plot.interaction.forEach(t => {
@@ -1665,6 +1809,8 @@
}
chart.render()
+
+ this.setState({chart})
}
refreshSearch = (list) => {
@@ -1673,20 +1819,66 @@
})
}
+ downloadImage = () => {
+ const { chart, config } = this.state
+ const link = document.createElement('a');
+ const filename = `${config.name}${moment().format('YYYY-MM-DD HH_mm_ss')}.png`;
+ const canvas = chart.getCanvas();
+ canvas.get('timeline').stopAllAnimations();
+
+ setTimeout(() => {
+ const canvas = chart.getCanvas();
+ const canvasDom = canvas.get('el');
+ const dataURL = canvasDom.toDataURL('image/png');
+
+ if (window.Blob && window.URL) {
+ const arr = dataURL.split(',');
+ const mime = arr[0].match(/:(.*?);/)[1];
+ const bstr = atob(arr[1]);
+ let n = bstr.length;
+ const u8arr = new Uint8Array(n);
+ while (n--) {
+ u8arr[n] = bstr.charCodeAt(n);
+ }
+ const blobObj = new Blob([u8arr], { type: mime });
+ if (window.navigator.msSaveBlob) {
+ window.navigator.msSaveBlob(blobObj, filename);
+ } else {
+ link.addEventListener('click', () => {
+ link.download = filename;
+ link.href = window.URL.createObjectURL(blobObj);
+ });
+ }
+ }
+ const e = document.createEvent('MouseEvents');
+ e.initEvent('click', false, false);
+ link.dispatchEvent(e);
+ }, 16);
+ }
+
render() {
const { config, loading, empty, BID } = this.state
+ let style = {...config.style}
+ if (empty && config.plot.empty === 'hidden') {
+ style.opacity = 0
+ style.position = 'absolute'
+ style.zIndex = -1
+ style.width = '100%'
+ }
+
return (
- <div className="custom-line-chart-plot-box" style={config.style}>
+ <div className="custom-line-chart-plot-box" id={'anchor' + config.uuid} style={style}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
<Spin />
</div> : null
}
- <NormalHeader config={config} BID={BID} menuType={this.props.menuType} refresh={this.refreshSearch} />
- <div className="canvas-wrap">
- <div className="chart-action">
+ <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
+ <div className="canvas-wrap" ref={ref => this.wrap = ref}>
+ {config.plot.download === 'enable' && this.state.chart && !empty ? <DownloadOutlined onClick={this.downloadImage} className="system-color download"/> : null}
+ <div className={'chart-action' + (config.plot.download === 'enable' ? ' downable' : '')}>
{config.action.map(item => {
if (item.OpenType === 'excelOut') {
return (
@@ -1711,7 +1903,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>
@@ -1719,18 +1911,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)
export default LineChart
\ No newline at end of file
--
Gitblit v1.8.0