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 | 198 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 159 insertions(+), 39 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 1395851..b2449054 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -26,7 +26,6 @@
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -126,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 {
@@ -198,12 +197,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 }
}}
@@ -237,7 +238,8 @@
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)
@@ -294,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({
@@ -313,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()
}
@@ -399,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)
}
@@ -429,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)
}
}
@@ -493,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 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
@@ -527,7 +549,7 @@
}
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) {
@@ -588,7 +610,7 @@
if (plot.repeat === 'average') {
let _mdata = new Map()
_cdata.forEach(item => {
- if (!item[plot.Xaxis]) return
+ if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
@@ -605,6 +627,8 @@
// 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])) {
@@ -633,7 +657,7 @@
} else if (plot.repeat === 'cumsum') {
let _mdata = new Map()
_cdata.forEach(item => {
- if (!item[plot.Xaxis]) return
+ if (!item[plot.Xaxis] && item[plot.Xaxis] !== 0) return
vFields.forEach(col => {
if (typeof(item[col.field]) !== 'number') {
@@ -649,6 +673,8 @@
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])) {
@@ -674,10 +700,12 @@
} else { // plot.repeat === 'unrepeat'
let _mdata = new Map()
_cdata.forEach(item => {
- if (!item[plot.Xaxis]) return
+ 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])) {
@@ -989,6 +1017,9 @@
}
if (plot.label !== 'false') {
_chart.label(_valfield, (value) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1224,6 +1255,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 + '%'
}
@@ -1275,6 +1310,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 + '%'
}
@@ -1297,18 +1336,22 @@
}
}
- 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)
@@ -1333,7 +1376,7 @@
.tooltip(`${item.name}`, (value) => {
return {
name: item.name,
- value: plot.show === 'percent' ? value + '%' : value
+ value: item.show === 'percent' ? value + '%' : value
}
})
@@ -1342,7 +1385,11 @@
}
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) {
@@ -1384,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 {
@@ -1595,6 +1646,10 @@
}
if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1653,6 +1708,10 @@
}
if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
+ if (plot.labelValue === 'zero' && value === 0) {
+ return null
+ }
+
if (plot.show === 'percent') {
value = value + '%'
}
@@ -1687,7 +1746,60 @@
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
+
+ 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.interaction && plot.interaction.length) {
@@ -1747,15 +1859,23 @@
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} />
+ <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' : '')}>
--
Gitblit v1.8.0