From f07c42a322f41e14ef5b1bf8f2fd66fc5d338cdd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 六月 2023 18:17:09 +0800
Subject: [PATCH] 2023-06-28
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 444 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 295 insertions(+), 149 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 2184ac3..68651c3 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -3,7 +3,7 @@
import { is, fromJS } from 'immutable'
import { Chart } from '@antv/g2'
import DataSet from '@antv/data-set'
-import { Spin, Empty, notification } from 'antd'
+import { Spin, Empty, notification, Modal } from 'antd'
import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -13,20 +13,18 @@
import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
+import TimerTask from '@/utils/timer-task.js'
import NormalHeader from '@/tabviews/custom/components/share/normalheader'
import './index.scss'
-// const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
const ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
const ExcelInButton = asyncComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
class LineChart extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -38,24 +36,36 @@
transfield: {}, // 瀛楁鍚嶇О缈昏瘧
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
plot: null, // 鍥捐〃璁剧疆
- data: null, // 鏁版嵁
search: null, // 鎼滅储鏉′欢
vFields: [], // 鏁板�煎瓧娈�
vstFields: null, // 缁熻鏁版嵁鍊煎瓧娈典俊鎭�
chart: null
}
+ data = []
+
UNSAFE_componentWillMount () {
- const { config, data, initdata, BID } = this.props
+ const { config, data, initdata } = this.props
let _config = fromJS(config).toJS()
- let _data = null
let _sync = config.setting.sync === 'true'
- if (config.setting.sync === 'true' && data) {
- _data = data[config.dataName] || []
+ let BID = ''
+ let BData = ''
+
+ if (config.setting.supModule) {
+ BData = window.GLOB.CacheData.get(config.setting.supModule)
+ } else {
+ BData = window.GLOB.CacheData.get(config.$pageId)
+ }
+ if (BData) {
+ BID = BData.$BID || ''
+ }
+
+ if (_sync && data) {
+ this.data = data[config.dataName] || []
_sync = false
- } else if (config.setting.sync === 'true' && initdata) {
- _data = initdata || []
+ } else if (_sync && initdata) {
+ this.data = initdata || []
_sync = false
}
@@ -97,7 +107,13 @@
})
}
- _config.style.height = config.plot.height || 400
+ _config.plot.height = Utils.getHeight(_config.plot.height)
+ _config.style.height = 'auto'
+ _config.style.minHeight = _config.plot.height + 30
+
+ if (_config.plot.title) {
+ _config.style.minHeight = _config.style.minHeight + 45
+ }
let transfield = {}
_config.columns.forEach(col => {
@@ -198,12 +214,14 @@
_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 <= 11) return val
- return _val.substring(0, 8) + '...'
+ if (_val.length <= limit) return val
+ return _val.substring(0, limit) + '...'
},
style: { fill: _config.plot.color }
}}
@@ -296,8 +314,12 @@
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') && item.show) { // 鎶樼嚎鍥炬垨閲嶅彔涓嬬殑鏌辩姸鍥惧彲鍗曠嫭璁剧疆鏄剧ず绫诲瀷
- vFieldsShow[item.type] = item.show
+ 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
@@ -312,7 +334,6 @@
this.setState({
config: _config,
- data: _data,
BID: BID || '',
vFields: vFields,
vstFields: vstFields,
@@ -326,10 +347,12 @@
setTimeout(() => {
this.loadData()
}, _config.setting.delay || 0)
- } else if (config.setting.sync === 'true' && _data) {
- this.handleData()
}
})
+
+ if (this.data.length > 0) {
+ this.handleData()
+ }
}
/**
@@ -344,10 +367,13 @@
_data = nextProps.data[config.dataName] || []
}
- this.setState({sync: false, data: _data}, () => {
+ if (!is(fromJS(this.data), fromJS(_data))) {
+ this.data = _data
this.handleData()
- })
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ }
+
+ this.setState({sync: false})
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -359,18 +385,36 @@
}
componentDidMount () {
+ const { config, sync } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
- this.handleTimer()
+
+ if (config.timer) {
+ this.timer = new TimerTask()
+ this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
+ this.loadData(true)
+ })
+ }
+
+ if (config.$cache && (config.setting.sync !== 'true' || sync)) {
+ Api.getLCacheConfig(config.uuid).then(res => {
+ if (!res || this.data.length > 0) return
+
+ if (!is(fromJS(this.data), fromJS(res))) {
+ this.data = res
+ this.handleData()
+ }
+ })
+ }
}
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
*/
componentWillUnmount () {
- clearTimeout(this.timer)
this.setState = () => {
return
}
@@ -378,56 +422,8 @@
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
- }
- handleTimer = () => {
- const { config } = this.state
-
- if (!config.timer) return
-
- 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]
-
- if (!timer) return
-
- let _param = {
- func: 's_get_timers_role',
- LText: `select '${window.GLOB.appkey || ''}','${config.uuid}'`,
- timer_type: config.timer,
- component_id: config.uuid
- }
-
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
-
- Api.getSystemConfig(_param).then(result => {
- if (!result.status) {
- notification.warning({
- top: 92,
- message: result.message,
- duration: 5
- })
- return
- } else if (result.run_type) {
- this.setState({timer})
- this.timer = setTimeout(() => {
- this.timerTask()
- }, timer)
- }
- })
- }
-
- timerTask = () => {
- const { timer } = this.state
- if (!timer) return
-
- this.loadData(true)
-
- this.timer = setTimeout(() => {
- this.timerTask()
- }, timer)
+ this.timer && this.timer.stop()
}
/**
@@ -441,20 +437,10 @@
if (config.uuid !== menuId) return
- let supModule = config.setting.supModule
-
- btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
-
- if (!btn.syncComponentId || btn.syncComponentId !== supModule) {
- if (position === 'mainline' || position === 'popclose') { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- if (supModule && BID) {
- MKEmitter.emit('reloadData', supModule, BID)
- } else {
- this.loadData()
- }
- } else {
- this.loadData()
- }
+ if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else {
+ this.loadData()
}
if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
@@ -484,7 +470,7 @@
/**
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
- queryModuleParam = (menuId, btnId) => {
+ queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
const { arr_field, config, search } = this.state
@@ -500,7 +486,7 @@
})
}
- MKEmitter.emit('returnModuleParam', config.uuid, btnId, {
+ callback({
arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
@@ -512,15 +498,14 @@
* @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 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
- this.setState({
- data: []
- }, () => {
+ if (!is(fromJS(this.data), fromJS([]))) {
+ this.data = []
this.handleData()
- })
+ }
return
}
@@ -546,33 +531,60 @@
}
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
+ if (config.$cache && config.setting.onload !== 'false') {
+ Api.writeCacheConfig(config.uuid, result.data || '')
}
this.setState({
- data: result.data,
loading: false
- }, () => {
- if (!reset) return
- this.handleData()
})
+
+ if (!is(fromJS(this.data), fromJS(result.data || []))) {
+ this.data = result.data || []
+ this.handleData()
+ }
+
+ if (config.timer && config.clearField && result.data && result.data[0]) {
+ let vals = (config.clearValue || '').split(',')
+ if (vals.includes(result.data[0][config.clearField])) {
+ this.timer && this.timer.stop()
+ }
+ }
+ if (result.message) {
+ if (result.ErrCode === 'Y') {
+ Modal.success({
+ title: result.message
+ })
+ } else if (result.ErrCode === 'S') {
+ notification.success({
+ top: 92,
+ message: result.message,
+ duration: 2
+ })
+ }
+ }
} else {
this.setState({
- loading: false,
- timer: null
+ loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+ this.timer && this.timer.stop()
+
+ if (!result.message) return
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
+ })
+ } else if (result.ErrCode !== '-2') {
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
+ })
+ }
}
}
@@ -584,7 +596,9 @@
if (_element) {
_element.innerHTML = ''
}
- this.viewrender()
+ setTimeout(() => {
+ this.viewrender()
+ }, 100)
}
/**
@@ -594,15 +608,15 @@
* 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
*/
getdata = () => {
- const { data, plot, vFields, config } = this.state
+ const { plot, vFields, config } = this.state
- if (!data || data.length === 0) {
+ if (this.data.length === 0) {
this.setState({empty: true})
return []
}
let _data = []
- let _cdata = fromJS(data).toJS()
+ let _cdata = fromJS(this.data).toJS()
if (plot.repeat === 'average') {
let _mdata = new Map()
@@ -736,7 +750,7 @@
* @description 缁熻鏁版嵁棰勫鐞�
*/
getStaticMsg = () => {
- const { plot, vstFields, data } = this.state
+ const { plot, vstFields } = this.state
let percent = false
let decimal = vstFields ? vstFields.decimal : 0
@@ -745,13 +759,13 @@
percent = true
}
- if (!data || data.length === 0) {
+ if (this.data.length === 0) {
this.setState({empty: true})
return []
}
let _data = []
- let _cdata = fromJS(data).toJS()
+ let _cdata = fromJS(this.data).toJS()
if (plot.repeat === 'average') {
let _mdata = new Map()
@@ -930,7 +944,7 @@
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 25
+ height: plot.height
})
chart.data(_data)
@@ -1014,6 +1028,9 @@
}
if (plot.label !== 'false') {
_chart.label(_valfield, (value) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1111,7 +1128,7 @@
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 25
+ height: plot.height
})
// 鍧愭爣杞存牸寮忓寲
@@ -1209,7 +1226,7 @@
view1.scale('value', c)
view1.axis('value', plot.$yc)
- view1.legend(false)
+ // view1.legend(false)
let colorIndex = 0
@@ -1249,6 +1266,10 @@
}
if (plot.label !== 'false') {
_chart.label('value*key', (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1300,6 +1321,10 @@
}
if (plot.label !== 'false') {
_chart.label('value*key', (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1322,16 +1347,20 @@
}
}
- 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)
+ // view2.legend(false)
plot.customs.forEach(item => {
if (item.chartType === 'bar' && !plot.Bar_axis) {
@@ -1367,6 +1396,10 @@
}
if (item.label !== 'false') {
_chart.label(item.name, (value) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (item.show === 'percent') {
value = value + '%'
}
@@ -1415,6 +1448,10 @@
if (item.label === 'true') {
_chart.label(item.name, (value) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (item.show === 'percent') {
value = value + '%'
}
@@ -1461,6 +1498,7 @@
let _valfield = 'value'
let _typefield = 'key'
let colorIndex = 0
+ let barcolors = {}
if (plot.datatype === 'statistics') {
_valfield = plot.InfoValue
@@ -1473,6 +1511,16 @@
if (plot.enabled === 'true') {
this.customrender(data)
return
+ }
+
+ if (plot.barcolors && plot.barcolors.length > 0 && plot.Yaxis.length === 1) {
+ data.forEach((item, i) => {
+ if (plot.barcolors[i]) {
+ barcolors[item[plot.Xaxis]] = plot.barcolors[i].color
+ }
+ })
+ } else {
+ barcolors = null
}
const ds = new DataSet()
@@ -1501,7 +1549,7 @@
const chart = new Chart({
container: this.state.chartId,
autoFit: true,
- height: this.wrap.offsetHeight - 25
+ height: plot.height
})
chart.data(_data)
@@ -1607,19 +1655,37 @@
if (plot.$colors) {
let limit = chartColors.length
- _chart.color(_typefield, (key) => {
- if (plot.$colors.has(key)) {
- return plot.$colors.get(key)
- } else {
- colorIndex++
- return chartColors[(colorIndex - 1) % limit]
- }
- })
+
+ if (barcolors) {
+ _chart.color(`${_typefield}*${plot.Xaxis}`, (key, label) => {
+ if (barcolors[label]) {
+ return barcolors[label]
+ } else if (plot.$colors.has(key)) {
+ return plot.$colors.get(key)
+ } else {
+ colorIndex++
+ return chartColors[(colorIndex - 1) % limit]
+ }
+ })
+ } else {
+ _chart.color(`${_typefield}`, (key) => {
+ if (plot.$colors.has(key)) {
+ return plot.$colors.get(key)
+ } else {
+ colorIndex++
+ return chartColors[(colorIndex - 1) % limit]
+ }
+ })
+ }
} else {
_chart.color(_typefield)
}
if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1665,19 +1731,36 @@
if (plot.$colors) {
let limit = chartColors.length
- _chart.color(_typefield, (key) => {
- if (plot.$colors.has(key)) {
- return plot.$colors.get(key)
- } else {
- colorIndex++
- return chartColors[(colorIndex - 1) % limit]
- }
- })
+ if (barcolors) {
+ _chart.color(`${_typefield}*${plot.Xaxis}`, (key, label) => {
+ if (barcolors[label]) {
+ return barcolors[label]
+ } else if (plot.$colors.has(key)) {
+ return plot.$colors.get(key)
+ } else {
+ colorIndex++
+ return chartColors[(colorIndex - 1) % limit]
+ }
+ })
+ } else {
+ _chart.color(`${_typefield}`, (key) => {
+ if (plot.$colors.has(key)) {
+ return plot.$colors.get(key)
+ } else {
+ colorIndex++
+ return chartColors[(colorIndex - 1) % limit]
+ }
+ })
+ }
} else {
_chart.color(_typefield)
}
if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1712,7 +1795,70 @@
chart.on('element:click', (ev) => {
let data = ev.data.data
- 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
+
+ let newtab = {
+ MenuID: menu.MenuID,
+ MenuName: menu.MenuName,
+ MenuNo: menu.MenuNo || '',
+ type: menu.tabType,
+ param: {}
+ }
+
+ if (plot.joint === 'true') {
+ newtab.param.$BID = data.$$uuid || ''
+
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ newtab.param[key] = data[key]
+ })
+ }
+
+ MKEmitter.emit('modifyTabs', newtab, true)
+ } else if (plot.click === 'menu') {
+ let menuId = plot.menu.slice(-1)[0]
+ let newtab = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+
+ if (!newtab && plot.MenuID) {
+ newtab = {
+ MenuID: plot.MenuID,
+ MenuName: plot.MenuName,
+ MenuNo: plot.MenuNo,
+ type: plot.tabType
+ }
+ } else if (!newtab) {
+ return
+ }
+
+ newtab = {
+ ...newtab,
+ param: {}
+ }
+
+ if (plot.joint === 'true') {
+ newtab.param.$BID = data.$$uuid || ''
+
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ newtab.param[key] = data[key]
+ })
+ }
+
+ MKEmitter.emit('modifyTabs', newtab, true)
+ } else {
+ MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data)
+ }
})
if (plot.interaction && plot.interaction.length) {
@@ -1781,15 +1927,15 @@
}
return (
- <div className="custom-line-chart-plot-box" style={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" ref={ref => this.wrap = ref}>
+ <NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
+ <div className="canvas-wrap">
{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 => {
--
Gitblit v1.8.0