From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 766 ++++++++++++++++++++++++++++------------------------------
1 files changed, 370 insertions(+), 396 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 48e1382..ae2dfce 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, Modal } from 'antd'
+import { Spin, Empty } from 'antd'
import { DownloadOutlined } from '@ant-design/icons'
import moment from 'moment'
@@ -100,6 +100,15 @@
_config.style.height = 'auto'
_config.style.minHeight = _config.plot.height + 30
+ if (_config.plot.correction) {
+ delete _config.plot.correction // 鏁版嵁淇锛堝凡寮冪敤锛�
+ _config.plot.barSize = 35
+ }
+
+ if (!_config.plot.legend || _config.plot.legend === 'hidden') {
+ _config.plot.legend = false
+ }
+
if (_config.plot.title) {
_config.style.minHeight = _config.style.minHeight + 45
}
@@ -133,6 +142,38 @@
if (_config.plot.mutilBar !== 'overlap' && Bar_axis.length > 1) {
_config.plot.Bar_axis = Bar_axis
+ }
+
+ if (_config.plot.Bar_axis && _config.plot.Bar_axis.length) {
+ let label = _config.plot.label
+
+ if (label === 'false') {
+ _config.plot.customs.forEach(item => {
+ if (!Bar_axis.includes(item.type)) return
+ if (item.label === 'true') {
+ label = 'true'
+ }
+ })
+ } else {
+ let reset = true
+ _config.plot.customs.forEach(item => {
+ if (!Bar_axis.includes(item.type)) return
+ if (item.label === 'true') {
+ reset = false
+ }
+ })
+ if (reset) {
+ label = 'false'
+ }
+ }
+
+ _config.plot.$label = label
+ }
+
+ if (_config.plot.zoomYaxis === 'adjust' && _config.plot.mutilBar === 'stack') {
+ if (_config.plot.Bar_axis) {
+ _config.plot.zoomFields = _config.plot.Yaxis.filter(cell => !_config.plot.Bar_axis.includes(cell))
+ }
}
} else {
_config.plot.enabled = 'false'
@@ -207,7 +248,7 @@
let xc = {label: {
formatter: (val) => {
- if (!val || /^\s*$/.test(val)) return val
+ if (!val || /^\s+$/.test(val)) return val
let _val = `${val}`
if (_val.length <= limit) return val
return _val.substring(0, limit) + '...'
@@ -215,15 +256,35 @@
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') {
+ if (_config.plot.tick === 'hidden') {
+ xc.tickLine = null
+ }
+ if (_config.plot.x_line === 'hidden') {
+ xc.line = null
+ }
+ if (_config.plot.y_line === 'hidden') {
+ yc.line = null
+ } else {
yc.line = {style: { stroke: '#D1D2CE' }}
}
+ if (_config.plot.x_label === 'hidden') {
+ xc.label = null
+ }
+ if (_config.plot.y_label === 'hidden') {
+ yc.label = null
+ }
+
if (_config.plot.lineColor) {
- xc.tickLine = {style: { stroke: _config.plot.lineColor }}
- xc.line = { style: { stroke: _config.plot.lineColor } }
+ if (xc.tickLine !== null) {
+ xc.tickLine = {style: { stroke: _config.plot.lineColor }}
+ }
+ if (xc.line !== null) {
+ xc.line = { style: { stroke: _config.plot.lineColor } }
+ }
if (yc.grid !== null) {
yc.grid = { line: { style: { stroke: _config.plot.lineColor } }}
}
@@ -328,7 +389,7 @@
this.data = window.GLOB.SyncData.get(_config.dataName) || []
if (_config.$cache) {
- Api.writeCacheConfig(_config.uuid, fromJS(this.data).toJS())
+ Api.writeCacheConfig(_config.uuid, fromJS(this.data).toJS(), BID)
}
_config.setting.sync = 'false'
@@ -344,7 +405,6 @@
BID: BID || '',
vFields: vFields,
vstFields: vstFields,
- arr_field: _config.columns.map(col => col.field).join(','),
plot: _config.plot,
search: _config.$searches,
transfield
@@ -374,7 +434,7 @@
if (config.timer) {
this.timer = new TimerTask()
this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
- this.loadData(true)
+ this.loadData('timer')
})
}
@@ -399,21 +459,21 @@
}
initExec = () => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.$cache) {
if (config.$time) {
if (!this.loaded) {
- Api.getLCacheConfig(config.uuid, config.$time).then(res => {
- if (!res && config.setting.onload === 'true') {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
setTimeout(() => {
- this.loadData()
+ this.loadData('init')
}, config.setting.delay || 0)
}
- if (!res || this.loaded) return
+ if (!res.data || this.loaded) return
- this.data = res
+ this.data = res.data
this.handleData()
})
} else {
@@ -421,17 +481,17 @@
}
} else {
if (!this.loaded) {
- Api.getLCacheConfig(config.uuid, 0).then(res => {
- if (!res || this.loaded) return
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
- this.data = res
+ this.data = res.data
this.handleData()
})
}
if (config.setting.onload === 'true') {
setTimeout(() => {
- this.loadData()
+ this.loadData('init')
}, config.setting.delay || 0)
} else if (this.loaded) {
this.handleData()
@@ -447,20 +507,18 @@
}
transferSyncData = (syncId) => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.$syncId !== syncId) return
let _data = window.GLOB.SyncData.get(config.dataName) || []
if (config.$cache) {
- Api.writeCacheConfig(config.uuid, fromJS(_data).toJS())
+ Api.writeCacheConfig(config.uuid, fromJS(_data).toJS(), BID)
}
- if (!is(fromJS(this.data), fromJS(_data))) {
- this.data = _data
- this.handleData()
- }
+ this.data = _data
+ this.handleData()
this.loaded = true
@@ -490,8 +548,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
@@ -520,7 +578,7 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { arr_field, config, search } = this.state
+ const { config, search } = this.state
if (config.uuid !== menuId) return
@@ -536,7 +594,6 @@
}
callback({
- arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
menuName: config.name
@@ -546,8 +603,8 @@
/**
* @description 鏁版嵁鍔犺浇
*/
- async loadData (hastimer) {
- const { config, arr_field, BID, search } = this.state
+ async loadData (type) {
+ const { config, BID, search } = this.state
if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
if (!is(fromJS(this.data), fromJS([]))) {
@@ -573,19 +630,19 @@
return
}
- if (!hastimer) {
+ if (type !== 'timer') {
this.setState({
loading: true
})
}
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, '', '', BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, '', '', BID)
let result = await Api.genericInterface(param)
if (result.status) {
- if (config.$cache && config.setting.onload !== 'false') {
- Api.writeCacheConfig(config.uuid, result.data || [])
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
this.loaded = true
@@ -605,37 +662,15 @@
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
- })
- }
- }
+
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
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
- })
- }
+ UtilsDM.queryFail(result)
}
}
@@ -652,149 +687,43 @@
}, 100)
}
- /**
- * @description 鍥捐〃鏁版嵁棰勫鐞�
- * 1銆侀�氳繃鏄剧ず鍒楄繘琛屾暟鎹被鍨嬭浆鎹�
- * 2銆侀噸澶嶆暟鎹細鍙栧钩鍧囧�笺�佺疮璁°�佸幓閲�
- * 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
- */
getdata = () => {
const { plot, vFields, config } = this.state
if (this.data.length === 0) {
this.setState({empty: true})
return []
+ } else {
+ this.setState({empty: false})
}
- let _data = []
- let _cdata = fromJS(this.data).toJS()
+ return fromJS(this.data).toJS().map(item => {
+ // 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 (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])
- if (isNaN(item[col.field])) {
- item[col.field] = 0
- }
+ vFields.forEach(col => {
+ if (typeof(item[col.field]) !== 'number') {
+ item[col.field] = parseFloat(item[col.field])
+ if (isNaN(item[col.field])) {
+ item[col.field] = 0
}
- if (col.show === 'percent') {
- item[col.field] = item[col.field] * 100
- }
- })
-
- // 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 (col.show === 'percent') {
+ item[col.field] = item[col.field] * 100
}
- if (!_mdata.has(item[plot.Xaxis])) {
- item.$count = 1
- _mdata.set(item[plot.Xaxis], item)
- } else {
- let _item = _mdata.get(item[plot.Xaxis])
- _item.$count++
- vFields.forEach(col => {
- _item[col.field] += item[col.field]
- })
- _mdata.set(item[plot.Xaxis], _item)
- }
+ item[col.field] = item[col.field].toFixed(col.decimal)
+ item[col.field] = +item[col.field]
})
- _data = [..._mdata.values()]
- _data = _data.map(item => {
- vFields.forEach(col => {
- item[col.field] = item[col.field] / item.$count
- 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] && item[plot.Xaxis] !== 0) return
+ item.$$uuid = item[config.setting.primaryKey] || ''
- vFields.forEach(col => {
- if (typeof(item[col.field]) !== 'number') {
- item[col.field] = parseFloat(item[col.field])
- if (isNaN(item[col.field])) {
- item[col.field] = 0
- }
- }
- if (col.show === 'percent') {
- item[col.field] = item[col.field] * 100
- }
- })
-
- 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 {
- let _item = _mdata.get(item[plot.Xaxis])
- vFields.forEach(col => {
- _item[col.field] += item[col.field]
- })
- _mdata.set(item[plot.Xaxis], _item)
- }
- })
-
- _data = [..._mdata.values()]
- _data = _data.map(item => {
- vFields.forEach(col => {
- 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] && 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])
- if (isNaN(item[col.field])) {
- item[col.field] = 0
- }
- }
- if (col.show === 'percent') {
- item[col.field] = item[col.field] * 100
- }
- 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)
- }
- })
-
- _data = [..._mdata.values()]
- }
-
- this.setState({empty: _data.length === 0})
- return _data
+ return item
+ })
}
/**
@@ -803,132 +732,36 @@
getStaticMsg = () => {
const { plot, vstFields } = this.state
- let percent = false
- let decimal = vstFields ? vstFields.decimal : 0
-
- if (plot.show === 'percent') {
- percent = true
- }
-
if (this.data.length === 0) {
this.setState({empty: true})
return []
+ } else {
+ this.setState({empty: false})
}
- let _data = []
- let _cdata = fromJS(this.data).toJS()
+ let decimal = vstFields ? vstFields.decimal : 0
- if (plot.repeat === 'average') {
- let _mdata = new Map()
- _cdata.forEach(item => {
- if (!item[plot.InfoType] || !item[plot.Xaxis]) return
+ return fromJS(this.data).toJS().map(item => {
+ 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 (/^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}:\d{2})?/.test(item[plot.Xaxis])) {
- item[plot.Xaxis] = ' ' + item[plot.Xaxis]
+ if (typeof(item[plot.InfoValue]) !== 'number') {
+ item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
+ if (isNaN(item[plot.InfoValue])) {
+ item[plot.InfoValue] = 0
}
+ }
- item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
- if (typeof(item[plot.InfoValue]) !== 'number') {
- item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
- if (isNaN(item[plot.InfoValue])) {
- item[plot.InfoValue] = 0
- }
- }
- if (percent) {
- item[plot.InfoValue] = item[plot.InfoValue] * 100
- }
+ if (plot.show === 'percent') {
+ item[plot.InfoValue] = item[plot.InfoValue] * 100
+ }
- if (!_mdata.has(item.$uuid)) {
- item.$count = 1
- _mdata.set(item.$uuid, item)
- } else {
- let _item = _mdata.get(item.$uuid)
- _item.$count++
- _item[plot.InfoValue] += item[plot.InfoValue]
- _mdata.set(item.$uuid, _item)
- }
- })
+ item[plot.InfoValue] = item[plot.InfoValue].toFixed(decimal)
+ item[plot.InfoValue] = +item[plot.InfoValue]
- _data = [..._mdata.values()]
- _data = _data.map(item => {
- item[plot.InfoValue] = item[plot.InfoValue] / item.$count
- item[plot.InfoValue] = item[plot.InfoValue].toFixed(decimal)
- item[plot.InfoValue] = +item[plot.InfoValue]
-
- return item
- })
- } else if (plot.repeat === 'cumsum') {
- 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]
-
- if (typeof(item[plot.InfoValue]) !== 'number') {
- item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
- if (isNaN(item[plot.InfoValue])) {
- item[plot.InfoValue] = 0
- }
- }
- if (percent) {
- item[plot.InfoValue] = item[plot.InfoValue] * 100
- }
-
- if (!_mdata.has(item.$uuid)) {
- _mdata.set(item.$uuid, item)
- } else {
- let _item = _mdata.get(item.$uuid)
- _item[plot.InfoValue] += item[plot.InfoValue]
- _mdata.set(item.$uuid, _item)
- }
- })
-
- _data = [..._mdata.values()]
- _data = _data.map(item => {
- item[plot.InfoValue] = item[plot.InfoValue].toFixed(decimal)
- item[plot.InfoValue] = +item[plot.InfoValue]
-
- return item
- })
- } else { // plot.repeat === 'unrepeat'
- 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]
-
- if (!_mdata.has(item.$uuid)) {
- if (typeof(item[plot.InfoValue]) !== 'number') {
- item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
- if (isNaN(item[plot.InfoValue])) {
- item[plot.InfoValue] = 0
- }
- }
- if (percent) {
- item[plot.InfoValue] = item[plot.InfoValue] * 100
- }
-
- item[plot.InfoValue] = item[plot.InfoValue].toFixed(decimal)
- item[plot.InfoValue] = +item[plot.InfoValue]
-
- _mdata.set(item.$uuid, item)
- }
- })
-
- _data = [..._mdata.values()]
- }
-
- this.setState({empty: _data.length === 0})
-
- return _data
+ return item
+ })
}
/**
@@ -1022,7 +855,7 @@
chart.axis(plot.Xaxis, plot.$xc)
chart.axis(_valfield, plot.$yc)
- if (!plot.legend || plot.legend === 'hidden') {
+ if (!plot.legend) {
chart.legend(false)
} else {
chart.legend({
@@ -1055,9 +888,17 @@
.position(`${plot.Xaxis}*${_valfield}`)
.shape(plot.shape || 'smooth')
.tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+ let val = value
+ if (plot.show === 'percent') {
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+
return {
name: type,
- value: plot.show === 'percent' ? value + '%' : value
+ value: val
}
})
@@ -1079,14 +920,18 @@
}
if (plot.label !== 'false') {
_chart.label(_valfield, (value) => {
- if (plot.labelValue === 'zero' && value === 0) {
- return null
- }
+ let val = value
if (plot.show === 'percent') {
- value = value + '%'
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+ if (plot.labelUnit) {
+ val = val + plot.labelUnit
}
return {
- content: value,
+ content: val,
style: {
fill: plot.color
}
@@ -1157,6 +1002,41 @@
*/
customrender = (data) => {
const { plot, transfield } = this.state
+
+ let max = 0
+ if (plot.zoomYaxis === 'adjust') {
+ data.forEach(item => {
+ if (plot.zoomFields) {
+ plot.zoomFields.forEach(f => {
+ if (item[f] > max) {
+ max = item[f]
+ }
+ })
+ let sum = 0
+ plot.Bar_axis.forEach(f => {
+ sum += item[f]
+ })
+ if (sum > max) {
+ max = sum
+ }
+ } else {
+ plot.Yaxis.forEach(f => {
+ if (item[f] > max) {
+ max = item[f]
+ }
+ })
+ }
+ })
+
+ if (!isNaN(max)) {
+ max = Math.ceil(max)
+ let s = max > 10 ? Math.pow(10, (max + '').length - 2) : 1
+ max = Math.ceil(max / s) * s
+ } else {
+ max = 0
+ }
+ }
+
const ds = new DataSet()
const dv = ds.createView().source(data)
@@ -1191,7 +1071,7 @@
})
}
- if (!plot.legend || plot.legend === 'hidden') {
+ if (!plot.legend) {
chart.legend(false)
} else {
chart.legend({
@@ -1268,20 +1148,30 @@
range: [0, 0.9]
}
- if (plot.min || plot.min === 0) {
- c.min = plot.min
- }
- if (plot.max || plot.max === 0) {
- c.max = plot.max
+ if (plot.zoomYaxis === 'adjust') {
+ if (max) {
+ c.min = 0
+ c.max = max
+ }
+ } else {
+ if (plot.min || plot.min === 0) {
+ c.min = plot.min
+ }
+ if (plot.max || plot.max === 0) {
+ c.max = plot.max
+ c.min = c.min || 0
+ }
}
view1.scale('value', c)
view1.axis('value', plot.$yc)
- // view1.legend(false)
+ if (plot.legend) {
+ view1.legend(false)
+ }
let colorIndex = 0
- if (plot.adjust !== 'stack') {
+ if (plot.mutilBar !== 'stack') {
let _chart = view1
.interval()
.position(`${plot.Xaxis}*value`)
@@ -1293,12 +1183,16 @@
])
.shape(plot.shape || 'rect')
.tooltip(`${plot.Xaxis}*value*key`, (name, value, key) => {
+ let val = value
if (plot.show === 'percent') {
- value = value + '%'
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
}
return {
name: key,
- value: value
+ value: val
}
})
@@ -1315,45 +1209,56 @@
} else {
_chart.color('key')
}
- if (plot.label !== 'false') {
+ if (plot.$label !== 'false') {
_chart.label('value*key', (value, key) => {
- if (plot.labelValue === 'zero' && value === 0) {
+ if (plot.$label !== 'true' && value === 0) {
return null
}
+ let val = value
if (plot.show === 'percent') {
- value = value + '%'
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+ if (plot.labelUnit) {
+ val = val + plot.labelUnit
}
- if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+ if (plot.$label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
lablecfg.style.fill = plot.$colors.get(key)
}
return {
- content: value,
+ content: val,
...lablecfg
}
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.barRadius) {
_chart.style({ radius: [plot.barRadius, plot.barRadius, 0, 0] })
}
- } else if (plot.adjust === 'stack') {
+ } else if (plot.mutilBar === 'stack') {
let _chart = view1
.interval()
.position(`${plot.Xaxis}*value`)
.adjust('stack')
.shape(plot.shape || 'rect')
.tooltip(`${plot.Xaxis}*value*key`, (name, value, type) => {
+ let val = value
if (plot.show === 'percent') {
- value = value + '%'
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
}
return {
name: type,
- value: value
+ value: val
}
})
@@ -1370,26 +1275,33 @@
} else {
_chart.color('key')
}
- if (plot.label !== 'false') {
+ if (plot.$label !== 'false') {
_chart.label('value*key', (value, key) => {
- if (plot.labelValue === 'zero' && value === 0) {
+ if (plot.$label !== 'true' && value === 0) {
return null
}
+ let val = value
if (plot.show === 'percent') {
- value = value + '%'
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
}
- if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
+ if (plot.labelUnit) {
+ val = val + plot.labelUnit
+ }
+ if (plot.$label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
lablecfg.style.fill = plot.$colors.get(key)
}
return {
- content: value,
+ content: val,
...lablecfg
}
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.barRadius) {
@@ -1411,7 +1323,10 @@
}
view2.data(dv.rows)
- // view2.legend(false)
+
+ if (plot.legend && plot.Bar_axis) {
+ view2.legend(false)
+ }
plot.customs.forEach(item => {
if (item.chartType === 'bar' && !plot.Bar_axis) {
@@ -1422,11 +1337,18 @@
range: [0, 0.9]
}
- if (item.min || item.min === 0) {
- c.min = item.min
- }
- if (item.max || item.max === 0) {
- c.max = item.max
+ if (plot.zoomYaxis === 'adjust') {
+ if (max) {
+ c.min = 0
+ c.max = max
+ }
+ } else {
+ 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)
@@ -1436,9 +1358,16 @@
.color(item.color)
.shape(item.shape)
.tooltip(`${item.name}`, (value) => {
+ let val = value
+ if (item.show === 'percent') {
+ val = value + '%'
+ } else if (item.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
return {
name: item.name,
- value: item.show === 'percent' ? value + '%' : value
+ value: val
}
})
@@ -1447,18 +1376,25 @@
}
if (item.label !== 'false') {
_chart.label(item.name, (value) => {
- if (plot.labelValue === 'zero' && value === 0) {
+ if (plot.label !== 'true' && value === 0) {
return null
}
+ let val = value
if (item.show === 'percent') {
- value = value + '%'
+ val = value + '%'
+ } else if (item.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+ if (plot.labelUnit) {
+ val = val + plot.labelUnit
}
if (plot.label === 'true' && plot.labelColor === 'custom' && item.color) {
lablecfg.style.fill = item.color
}
return {
- content: value,
+ content: val,
...lablecfg
}
})
@@ -1477,11 +1413,18 @@
range: [0, 0.9]
}
- if (item.min || item.min === 0) {
- c.min = item.min
- }
- if (item.max || item.max === 0) {
- c.max = item.max
+ if (plot.zoomYaxis === 'adjust') {
+ if (max) {
+ c.min = 0
+ c.max = max
+ }
+ } else {
+ 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)
@@ -1491,23 +1434,35 @@
.color(item.color)
.shape(item.shape)
.tooltip(`${item.name}`, (value) => {
+ let val = value
+ if (item.show === 'percent') {
+ val = value + '%'
+ } else if (item.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+
return {
name: item.name,
- value: item.show === 'percent' ? value + '%' : value
+ value: val
}
})
if (item.label === 'true') {
_chart.label(item.name, (value) => {
- if (plot.labelValue === 'zero' && value === 0) {
- return null
+ let val = value
+ if (item.show === 'percent') {
+ val = value + '%'
+ } else if (item.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+ if (plot.labelUnit) {
+ val = val + plot.labelUnit
}
- if (item.show === 'percent') {
- value = value + '%'
- }
return {
- content: value,
+ content: val,
style: {
fill: plot.color
}
@@ -1615,13 +1570,14 @@
}
if (plot.max || plot.max === 0) {
c.max = plot.max
+ c.min = c.min || 0
}
chart.scale(_valfield, c)
chart.axis(plot.Xaxis, plot.$xc)
chart.axis(_valfield, plot.$yc)
- if (!plot.legend || plot.legend === 'hidden') {
+ if (!plot.legend) {
chart.legend(false)
} else {
chart.legend({
@@ -1698,9 +1654,16 @@
])
.shape(plot.shape || 'rect')
.tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+ let val = value
+ if (plot.show === 'percent') {
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
return {
name: type,
- value: plot.show === 'percent' ? value + '%' : value
+ value: val
}
})
@@ -1733,12 +1696,19 @@
}
if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
- if (plot.labelValue === 'zero' && value === 0) {
+ if (plot.label !== 'true' && value === 0) {
return null
}
+ let val = value
if (plot.show === 'percent') {
- value = value + '%'
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+ if (plot.labelUnit) {
+ val = val + plot.labelUnit
}
if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
@@ -1746,13 +1716,13 @@
}
return {
- content: value,
+ content: val,
...lablecfg
}
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.selectColor) {
@@ -1774,9 +1744,16 @@
.adjust('stack')
.shape(plot.shape || 'rect')
.tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+ let val = value
+ if (plot.show === 'percent') {
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
return {
name: type,
- value: plot.show === 'percent' ? value + '%' : value
+ value: val
}
})
@@ -1808,12 +1785,19 @@
}
if (plot.label !== 'false') {
_chart.label(`${_valfield}*${_typefield}`, (value, key) => {
- if (plot.labelValue === 'zero' && value === 0) {
+ if (plot.label !== 'true' && value === 0) {
return null
}
+ let val = value
if (plot.show === 'percent') {
- value = value + '%'
+ val = value + '%'
+ } else if (plot.show === 'thdSeparator') {
+ val = val + ''
+ val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+ if (plot.labelUnit) {
+ val = val + plot.labelUnit
}
if (plot.label === 'true' && plot.labelColor === 'custom' && plot.$colors && plot.$colors.has(key)) {
@@ -1821,13 +1805,13 @@
}
return {
- content: value,
+ content: val,
...lablecfg
}
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.selectColor) {
@@ -1864,49 +1848,39 @@
MenuName: menu.MenuName,
MenuNo: menu.MenuNo || '',
type: menu.tabType,
- param: {}
+ param: {$BID: data.$$uuid || ''}
}
- if (plot.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
-
- Object.keys(data).forEach(key => {
- if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
- })
- }
+ 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]
+ let menu = null
- if (!newtab && plot.MenuID) {
- newtab = {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (plot.MenuID) {
+ menu = {
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]
- })
- }
+ if (!menu) return
- MKEmitter.emit('modifyTabs', newtab, true)
+ menu.param = {$BID: data.$$uuid || ''}
+
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ menu.param[key] = data[key]
+ })
+
+ MKEmitter.emit('modifyTabs', menu, true)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data)
}
--
Gitblit v1.8.0