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/templates/sharecomponent/chartcomponent/index.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/chartcomponent/index.jsx b/src/templates/sharecomponent/chartcomponent/index.jsx
index f35533c..8c356fb 100644
--- a/src/templates/sharecomponent/chartcomponent/index.jsx
+++ b/src/templates/sharecomponent/chartcomponent/index.jsx
@@ -17,7 +17,7 @@
}
state = {
- dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: true
}
@@ -420,6 +420,9 @@
if (plot.label === 'true') {
_chart.label('value')
}
+ if (plot.barSize || plot.correction) {
+ _chart.size(plot.barSize || 35)
+ }
} else if (plot.adjust === 'stack') {
let _chart = chart
.interval()
@@ -430,6 +433,10 @@
if (plot.label === 'true') {
_chart.label('value')
+ }
+
+ if (plot.barSize || plot.correction) {
+ _chart.size(plot.barSize || 35)
}
}
@@ -531,11 +538,6 @@
type: 'overlap'
}
setting.offset = 0
- // setting.style = {
- // textAlign: 'center',
- // fontSize: 12,
- // fill: '#535353'
- // }
}
_chart.label('percent', setting)
@@ -601,6 +603,10 @@
this.props.plotchange({...config, charts: _charts})
}
+ shouldComponentUpdate (nextProps, nextState) {
+ return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ }
+
render() {
const { plot } = this.props
--
Gitblit v1.8.0