From bdfec77e57c90ad4750e08ee822818ce991b019f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 26 十一月 2023 14:11:58 +0800
Subject: [PATCH] 2023-11-26
---
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 537 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 380 insertions(+), 157 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 68651c3..bb1006e 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -22,9 +22,7 @@
class LineChart extends Component {
static propTpyes = {
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
}
state = {
@@ -34,7 +32,6 @@
loading: false, // 鏁版嵁鍔犺浇鐘舵��
chartId: Utils.getuuid(), // 鍥捐〃Id
transfield: {}, // 瀛楁鍚嶇О缈昏瘧
- sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
plot: null, // 鍥捐〃璁剧疆
search: null, // 鎼滅储鏉′欢
vFields: [], // 鏁板�煎瓧娈�
@@ -43,12 +40,12 @@
}
data = []
+ loaded = false
UNSAFE_componentWillMount () {
- const { config, data, initdata } = this.props
- let _config = fromJS(config).toJS()
- let _sync = config.setting.sync === 'true'
+ const { config } = this.props
+ let _config = fromJS(config).toJS()
let BID = ''
let BData = ''
@@ -59,14 +56,6 @@
}
if (BData) {
BID = BData.$BID || ''
- }
-
- if (_sync && data) {
- this.data = data[config.dataName] || []
- _sync = false
- } else if (_sync && initdata) {
- this.data = initdata || []
- _sync = false
}
let vFields = []
@@ -111,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
}
@@ -144,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'
@@ -218,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) + '...'
@@ -332,52 +362,33 @@
})
}
+ if (_config.setting.sync === 'true') {
+ _config.setting.onload = 'false'
+
+ if (window.GLOB.SyncData.has(_config.dataName)) {
+ this.data = window.GLOB.SyncData.get(_config.dataName) || []
+
+ if (_config.$cache) {
+ Api.writeCacheConfig(_config.uuid, fromJS(this.data).toJS(), BID)
+ }
+
+ _config.setting.sync = 'false'
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(_config.dataName)
+ }
+ }
+
this.setState({
config: _config,
BID: BID || '',
vFields: vFields,
vstFields: vstFields,
- arr_field: _config.columns.map(col => col.field).join(','),
plot: _config.plot,
- sync: _sync,
- search: Utils.initMainSearch(config.search),
+ search: _config.$searches,
transfield
- }, () => {
- if (config.setting.sync !== 'true' && config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
})
-
- if (this.data.length > 0) {
- this.handleData()
- }
- }
-
- /**
- * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
- */
- UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config } = this.state
-
- if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = []
- if (nextProps.data && nextProps.data[config.dataName]) {
- _data = nextProps.data[config.dataName] || []
- }
-
- if (!is(fromJS(this.data), fromJS(_data))) {
- this.data = _data
- this.handleData()
- }
-
- this.setState({sync: false})
- } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({}, () => {
- this.loadData()
- })
- }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -385,30 +396,29 @@
}
componentDidMount () {
- const { config, sync } = this.state
+ const { config } = this.state
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
+ if (config.setting.sync === 'true') {
+ MKEmitter.addListener('transferSyncData', this.transferSyncData)
+ }
+
if (config.timer) {
this.timer = new TimerTask()
this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
- this.loadData(true)
+ this.loadData('timer')
})
}
- 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()
- }
- })
- }
+ this.initExec()
}
/**
@@ -419,11 +429,92 @@
return
}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
this.timer && this.timer.stop()
+ }
+
+ initExec = () => {
+ const { config, BID } = this.state
+
+ if (config.$cache) {
+ if (config.$time) {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid && config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ }
+
+ if (!res.data || this.loaded) return
+
+ this.data = res.data
+ this.handleData()
+ })
+ } else {
+ this.handleData()
+ }
+ } else {
+ if (!this.loaded) {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
+
+ this.data = res.data
+ this.handleData()
+ })
+ }
+
+ if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData('init')
+ }, config.setting.delay || 0)
+ } else if (this.loaded) {
+ this.handleData()
+ }
+ }
+ } else if (config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
+ } else if (this.loaded) {
+ this.handleData()
+ }
+ }
+
+ transferSyncData = (syncId) => {
+ 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(), BID)
+ }
+
+ this.data = _data
+ this.handleData()
+
+ this.loaded = true
+
+ window.GLOB.SyncData.delete(config.dataName)
+
+ MKEmitter.removeListener('transferSyncData', this.transferSyncData)
+ }
+
+ searchRefresh = (searchId) => {
+ const { config } = this.state
+
+ if (config.$searchId !== searchId) return
+
+ this.setState({}, () => {
+ this.loadData()
+ })
}
/**
@@ -441,10 +532,6 @@
MKEmitter.emit('reloadData', config.setting.supModule, BID)
} else {
this.loadData()
- }
-
- if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -471,23 +558,22 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { mainSearch } = this.props
- const { arr_field, config, search } = this.state
+ const { config, search } = this.state
if (config.uuid !== menuId) return
let searches = search ? fromJS(search).toJS() : []
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
callback({
- arr_field: arr_field,
orderBy: config.setting.order || '',
search: searches,
menuName: config.name
@@ -497,47 +583,49 @@
/**
* @description 鏁版嵁鍔犺浇
*/
- async loadData (hastimer) {
- const { mainSearch } = this.props
- 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([]))) {
this.data = []
this.handleData()
}
+ this.loaded = true
return
}
let searches = search ? fromJS(search).toJS() : []
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key)
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key)) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
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
this.setState({
loading: false
@@ -971,7 +1059,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({
@@ -1004,9 +1092,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
}
})
@@ -1031,11 +1127,15 @@
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, '$&,')
}
return {
- content: value,
+ content: val,
style: {
fill: plot.color
}
@@ -1106,6 +1206,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)
@@ -1140,7 +1275,7 @@
})
}
- if (!plot.legend || plot.legend === 'hidden') {
+ if (!plot.legend) {
chart.legend(false)
} else {
chart.legend({
@@ -1217,20 +1352,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`)
@@ -1242,12 +1387,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
}
})
@@ -1264,45 +1413,53 @@
} else {
_chart.color('key')
}
- if (plot.label !== 'false') {
+ if (plot.$label !== 'false') {
_chart.label('value*key', (value, key) => {
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.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
}
})
@@ -1319,26 +1476,30 @@
} else {
_chart.color('key')
}
- if (plot.label !== 'false') {
+ if (plot.$label !== 'false') {
_chart.label('value*key', (value, key) => {
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.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) {
@@ -1360,7 +1521,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) {
@@ -1371,11 +1535,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)
@@ -1385,9 +1556,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
}
})
@@ -1400,14 +1578,18 @@
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.label === 'true' && plot.labelColor === 'custom' && item.color) {
lablecfg.style.fill = item.color
}
return {
- content: value,
+ content: val,
...lablecfg
}
})
@@ -1426,11 +1608,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)
@@ -1440,9 +1629,17 @@
.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
}
})
@@ -1452,11 +1649,16 @@
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, '$&,')
}
+
return {
- content: value,
+ content: val,
style: {
fill: plot.color
}
@@ -1564,13 +1766,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({
@@ -1647,9 +1850,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
}
})
@@ -1686,8 +1896,12 @@
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)) {
@@ -1695,13 +1909,13 @@
}
return {
- content: value,
+ content: val,
...lablecfg
}
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.selectColor) {
@@ -1723,9 +1937,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
}
})
@@ -1761,8 +1982,12 @@
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)) {
@@ -1770,13 +1995,13 @@
}
return {
- content: value,
+ content: val,
...lablecfg
}
})
}
- if (plot.barSize || plot.correction) {
+ if (plot.barSize) {
_chart.size(plot.barSize || 35)
}
if (plot.selectColor) {
@@ -1828,34 +2053,32 @@
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
}
+
+ if (!menu) return
- newtab = {
- ...newtab,
- param: {}
- }
+ menu.param = {}
if (plot.joint === 'true') {
- newtab.param.$BID = data.$$uuid || ''
+ menu.param.$BID = data.$$uuid || ''
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
- newtab.param[key] = data[key]
+ menu.param[key] = data[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, (data ? data.$$uuid : ''), data)
}
--
Gitblit v1.8.0