From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09
---
src/templates/sharecomponent/chartgroupcomponent/index.jsx | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/templates/sharecomponent/chartgroupcomponent/index.jsx b/src/templates/sharecomponent/chartgroupcomponent/index.jsx
index 58fae66..7dd78e8 100644
--- a/src/templates/sharecomponent/chartgroupcomponent/index.jsx
+++ b/src/templates/sharecomponent/chartgroupcomponent/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Modal } from 'antd'
+import { Modal } from 'antd'
+import { DownOutlined, UpOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
@@ -17,12 +18,11 @@
class ChartGroupComponent extends Component {
static propTpyes = {
config: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
- sysRoles: PropTypes.array, // 瑙掕壊鍒楄〃锛岄粦鍚嶅崟浣跨敤
updatechartgroup: PropTypes.func // 鍥捐〃鏇存柊
}
state = {
- dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
chartlist: null, // 鍥捐〃闆�
card: null, // 缂栬緫涓厓绱�
formlist: null, // 琛ㄥ崟淇℃伅
@@ -90,7 +90,7 @@
icon: 'line-chart',
Hide: 'false',
blacklist: [],
- correction: 7
+ barSize: 35
}
}
@@ -141,14 +141,14 @@
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.uuid === item.extraAction).length === 0) {
+ 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, actions, extraActions)
+ formlist: getChartViewForm(item, _columns, actions, extraActions)
})
}
@@ -211,8 +211,6 @@
confirm({
content: dict['model.confirm'] + dict['model.delete'] + ` ${plot.title} 锛焋,
- okText: dict['model.confirm'],
- cancelText: dict['model.cancel'],
onOk() {
let _chartlist = fromJS(_this.state.chartlist).toJS()
let _chartview = _this.state.chartview
@@ -262,8 +260,8 @@
return (
<div className="model-table-chartview-list">
- <Icon type="plus" onClick={() => this.handleChart()} />
- {chartlist.length > 1 ? <Icon type={config.expand ? 'up' : 'down'} title="灞曞紑/鍚堝苟" onClick={this.onChartChange} /> : null}
+ {/* <PlusOutlined onClick={() => this.handleChart()} /> */}
+ {chartlist.length > 1 ? (config.expand ? <UpOutlined onClick={this.onChartChange} /> : <DownOutlined onClick={this.onChartChange} />) : null}
{chartlist.length > 1 ? <DragChartView
activeKey={chartview}
list={chartlist}
--
Gitblit v1.8.0