From 42fae277ae5ebe794fc070bf38482a919eb661fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十一月 2020 14:36:02 +0800
Subject: [PATCH] 2020-11-25
---
src/templates/sharecomponent/chartgroupcomponent/index.jsx | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/templates/sharecomponent/chartgroupcomponent/index.jsx b/src/templates/sharecomponent/chartgroupcomponent/index.jsx
index f420254..8596cd8 100644
--- a/src/templates/sharecomponent/chartgroupcomponent/index.jsx
+++ b/src/templates/sharecomponent/chartgroupcomponent/index.jsx
@@ -17,12 +17,11 @@
class ChartGroupComponent extends Component {
static propTpyes = {
config: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
- sysRoles: PropTypes.array, // 瑙掕壊鍒楄〃锛岄粦鍚嶅崟浣跨敤
updatechartgroup: PropTypes.func // 鍥捐〃鏇存柊
}
state = {
- dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
+ dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
chartlist: null, // 鍥捐〃闆�
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
@@ -90,7 +89,7 @@
icon: 'line-chart',
Hide: 'false',
blacklist: [],
- correction: 7
+ barSize: 35
}
}
@@ -130,10 +129,25 @@
}
}
+ let actions = config.action.filter(item => item.OpenType === 'excelOut' || (item.OpenType === 'excelIn' && item.Ot === 'notRequired'))
+ actions = actions.map(cell => ({value: cell.uuid, text: cell.label}))
+
+ if (item.actions && item.actions.length > 0) {
+ let keys = actions.map(cell => cell.value)
+ item.actions = item.actions.filter(cell => keys.includes(cell))
+ }
+
+ let extraActions = config.action.filter(item => ['pop', 'prompt', 'exec'].includes(item.OpenType) && item.Ot === 'notRequired')
+ extraActions = extraActions.map(cell => ({value: cell.uuid, text: cell.label}))
+
+ if (item.extraAction && extraActions.filter(cell => cell.value === item.extraAction).length === 0) {
+ item.extraAction = ''
+ }
+
this.setState({
card: item,
modaltype: _type,
- formlist: getChartViewForm(item, this.props.sysRoles, _columns)
+ formlist: getChartViewForm(item, _columns, actions, extraActions)
})
}
@@ -196,8 +210,6 @@
confirm({
content: dict['model.confirm'] + dict['model.delete'] + ` ${plot.title} 锛焋,
- okText: dict['model.confirm'],
- cancelText: dict['header.cancel'],
onOk() {
let _chartlist = fromJS(_this.state.chartlist).toJS()
let _chartview = _this.state.chartview
@@ -228,6 +240,10 @@
this.props.updatechartgroup(config, id)
}
+ shouldComponentUpdate (nextProps, nextState) {
+ return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
+ }
+
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
*/
@@ -244,7 +260,7 @@
return (
<div className="model-table-chartview-list">
<Icon type="plus" onClick={() => this.handleChart()} />
- {chartlist.length > 1 ? <Icon type={config.expand ? 'up' : 'down'} onClick={this.onChartChange} /> : null}
+ {chartlist.length > 1 ? <Icon type={config.expand ? 'up' : 'down'} title="灞曞紑/鍚堝苟" onClick={this.onChartChange} /> : null}
{chartlist.length > 1 ? <DragChartView
activeKey={chartview}
list={chartlist}
--
Gitblit v1.8.0