From 5ae8e447c55f61508546e00559f54eb623a5c803 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 31 七月 2020 19:23:38 +0800
Subject: [PATCH] 2020-07-31
---
src/tabviews/zshare/chartcomponent/index.jsx | 136 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 114 insertions(+), 22 deletions(-)
diff --git a/src/tabviews/zshare/chartcomponent/index.jsx b/src/tabviews/zshare/chartcomponent/index.jsx
index b9ab3d2..80e3629 100644
--- a/src/tabviews/zshare/chartcomponent/index.jsx
+++ b/src/tabviews/zshare/chartcomponent/index.jsx
@@ -7,8 +7,8 @@
import asyncComponent from './asyncButtonComponent'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
+import zhCN from '@/locales/zh-CN/main.js'
+import enUS from '@/locales/en-US/main.js'
import './index.scss'
const ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
@@ -16,29 +16,35 @@
class LineChart extends Component {
static propTpyes = {
- BID: PropTypes.any,
- Tab: PropTypes.any,
- plot: PropTypes.object,
- data: PropTypes.array,
- loading: PropTypes.bool,
- config: PropTypes.object,
- getexceloutparam: PropTypes.func
+ BID: PropTypes.any, // 鐖剁骇Id
+ Tab: PropTypes.any, // 鏍囩淇℃伅
+ plot: PropTypes.object, // 鍥炬爣璁剧疆淇℃伅
+ data: PropTypes.array, // 鍥捐〃浼犲叆鏁版嵁
+ loading: PropTypes.bool, // 鏁版嵁鍔犺浇涓�
+ config: PropTypes.object, // 椤甸潰閰嶇疆淇℃伅
+ getexceloutparam: PropTypes.func // 鑾峰彇excel瀵煎嚭鍙傛暟
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
- empty: true,
- actions: [],
- chartId: Utils.getuuid(),
- chartData: [],
- chartFields: [],
- selectFields: []
+ dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, // 瀛楀吀
+ empty: true, // 鍥捐〃鏁版嵁涓虹┖
+ actions: [], // 鍥捐〃缁戝畾鐨勬寜閽粍
+ chartId: Utils.getuuid(), // 鍥捐〃Id
+ chartData: [], // 鍥捐〃鏁版嵁
+ chartFields: [], // 缁熻鍥捐〃鐢熸垚瀛楁闆�
+ selectFields: [], // 缁熻鍥捐〃閫夋嫨瀛楁
+ percentFields: [] // 璁剧疆涓虹櫨鍒嗘瘮鐨勫瓧娈碉紝tooltip鏃跺鍔�%
}
+ /**
+ * @description 鏍￠獙鍥捐〃鐨勬寜閽粍锛屽鏋滀负缁熻鍥捐〃锛岃绠楀浘琛ㄥ瓧娈�
+ */
componentDidMount () {
const { plot, data, config } = this.props
let _state = {}
let actions = []
+ let percentFields = []
+
config.action.forEach(item => {
if (!plot.actions || plot.actions.length === 0) return
if (!(item.OpenType === 'excelOut' || (item.OpenType === 'excelIn' && item.Ot === 'notRequired'))) return
@@ -54,15 +60,38 @@
_state.selectFields = result.selectFields
_state.actions = actions
+ let _column = config.columns.filter(col => plot.InfoValue === col.field)[0]
+
+ if (_column && _column.format === 'percent') {
+ percentFields.push(plot.InfoValue)
+ _state.percentFields = percentFields
+ }
+
this.setState(_state, () => {
this.viewrender()
})
} else {
- this.setState({ actions })
- this.viewrender()
+ if (plot.chartType === 'line' || plot.chartType === 'bar') {
+ try {
+ plot.Yaxis.forEach(yaxis => {
+ let _column = config.columns.filter(col => yaxis === col.field)[0]
+ if (_column && _column.format === 'percent') {
+ percentFields.push(_column.label)
+ }
+ })
+ } catch {
+ console.warn('Incorrect percentage setting')
+ }
+ }
+ this.setState({ actions, percentFields }, () => {
+ this.viewrender()
+ })
}
}
+ /**
+ * @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
+ */
UNSAFE_componentWillReceiveProps (nextProps) {
const { plot } = this.props
if (!is(fromJS(this.props.data), fromJS(nextProps.data))) {
@@ -89,6 +118,12 @@
return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
}
+ /**
+ * @description 鍥捐〃鏁版嵁棰勫鐞�
+ * 1銆侀�氳繃鏄剧ず鍒楄繘琛屾暟鎹被鍨嬭浆鎹�
+ * 2銆侀噸澶嶆暟鎹細鍙栧钩鍧囧�笺�佺疮璁°�佸幓閲�
+ * 3銆佹煴鐘跺浘鏁版嵁琛ラ綈
+ */
getdata = () => {
const { data, plot, config } = this.props
let vFields = plot.Yaxis && typeof(plot.Yaxis) === 'string' ? [plot.Yaxis] : plot.Yaxis
@@ -217,6 +252,9 @@
return _data
}
+ /**
+ * @description 缁熻鏁版嵁棰勫鐞嗭紝鍔ㄦ�佺敓鎴愮粺璁″瓧娈靛苟杩涜鏁版嵁杞崲
+ */
getStaticMsg = (data) => {
const { plot, config } = this.props
@@ -248,7 +286,7 @@
item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
if (typeof(item[plot.InfoValue]) !== 'number') {
- item[plot.InfoValue] = parseFloat(plot.InfoValue)
+ item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
if (isNaN(item[plot.InfoValue])) {
item[plot.InfoValue] = 0
}
@@ -285,7 +323,7 @@
item.$uuid = item[plot.InfoType] + item[plot.Xaxis]
if (typeof(item[plot.InfoValue]) !== 'number') {
- item[plot.InfoValue] = parseFloat(plot.InfoValue)
+ item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
if (isNaN(item[plot.InfoValue])) {
item[plot.InfoValue] = 0
}
@@ -320,7 +358,7 @@
if (!_mdata.has(item.$uuid)) {
if (typeof(item[plot.InfoValue]) !== 'number') {
- item[plot.InfoValue] = parseFloat(plot.InfoValue)
+ item[plot.InfoValue] = parseFloat(item[plot.InfoValue])
if (isNaN(item[plot.InfoValue])) {
item[plot.InfoValue] = 0
}
@@ -350,6 +388,9 @@
return {data: _data, chartFields: _chartFields, selectFields: _selectFields}
}
+ /**
+ * @description 鑾峰彇缁熻鍥捐〃灞曠ず鏁版嵁锛岄�氳繃閫夋嫨绫诲瀷绛涢��
+ */
getStaticData = () => {
const { plot } = this.props
const { chartData, chartFields, selectFields } = this.state
@@ -365,6 +406,9 @@
return _data
}
+ /**
+ * @description 鍥捐〃娓叉煋鍒嗙粍
+ */
viewrender = () => {
const { plot } = this.props
@@ -377,8 +421,12 @@
}
}
+ /**
+ * @description 鎶樼嚎鍥炬覆鏌�
+ */
linerender = () => {
const { plot, config } = this.props
+ const { percentFields } = this.state
let _data = []
let _valfield = 'value'
@@ -489,6 +537,12 @@
.position(`${plot.Xaxis}*${_valfield}`)
.color(_typefield)
.shape(plot.shape || 'smooth')
+ .tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+ return {
+ name: type,
+ value: percentFields.includes(type) ? value + '%' : value
+ }
+ })
if (plot.label === 'true') {
_chart.label(_valfield)
@@ -506,8 +560,12 @@
chart.render()
}
+ /**
+ * @description 鑷畾涔夋覆鏌�
+ */
customrender = (data, transfield) => {
const { plot } = this.props
+ const { percentFields } = this.state
let barfields = []
let fields = []
@@ -630,13 +688,19 @@
label: null
})
}
-
+
if (item.chartType === 'bar') {
let _chart = chart
.interval()
.position(`${plot.Xaxis}*${item.name}`)
.color(item.color)
.shape(item.shape)
+ .tooltip(`${item.name}`, (value) => {
+ return {
+ name: item.name,
+ value: percentFields.includes(item.name) ? value + '%' : value
+ }
+ })
if (item.label === 'true') {
_chart.label(item.name)
@@ -647,6 +711,12 @@
.position(`${plot.Xaxis}*${item.name}`)
.color(item.color)
.shape(item.shape)
+ .tooltip(`${item.name}`, (value) => {
+ return {
+ name: item.name,
+ value: percentFields.includes(item.name) ? value + '%' : value
+ }
+ })
if (item.label === 'true') {
_chart.label(item.name)
@@ -666,8 +736,12 @@
chart.render()
}
+ /**
+ * @description 鏌辩姸鍥炬覆鏌�
+ */
barrender = () => {
const { plot, config } = this.props
+ const { percentFields } = this.state
let _data = []
let _valfield = 'value'
@@ -785,6 +859,12 @@
}
])
.shape(plot.shape || 'rect')
+ .tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+ return {
+ name: type,
+ value: percentFields.includes(type) ? value + '%' : value
+ }
+ })
if (plot.label === 'true') {
_chart.label(_valfield)
@@ -796,6 +876,12 @@
.color(_typefield)
.adjust('stack')
.shape(plot.shape || 'rect')
+ .tooltip(`${plot.Xaxis}*${_valfield}*${_typefield}`, (name, value, type) => {
+ return {
+ name: type,
+ value: percentFields.includes(type) ? value + '%' : value
+ }
+ })
if (plot.label === 'true') {
_chart.label(_valfield)
@@ -805,6 +891,9 @@
chart.render()
}
+ /**
+ * @description 楗煎浘娓叉煋
+ */
pierender = () => {
const { plot, config } = this.props
@@ -953,6 +1042,9 @@
chart.render()
}
+ /**
+ * @description 缁熻鍥捐〃锛岀粺璁＄被鍨嬪垏鎹�
+ */
handleChange = (val) => {
this.setState({selectFields: val}, () => {
let _element = document.getElementById(this.state.chartId)
--
Gitblit v1.8.0