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/menu/components/chart/antv-dashboard/index.jsx | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/menu/components/chart/antv-dashboard/index.jsx b/src/menu/components/chart/antv-dashboard/index.jsx
index cc59f86..03305f3 100644
--- a/src/menu/components/chart/antv-dashboard/index.jsx
+++ b/src/menu/components/chart/antv-dashboard/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover } from 'antd'
+import { Popover } from 'antd'
+import { ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import { Chart, registerShape } from '@antv/g2'
import MKEmitter from '@/utils/events.js'
@@ -111,7 +112,6 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
tabId: card.tabId || '',
parentId: card.parentId || '',
format: card.subtype === 'ratioboard' ? 'array' : 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
@@ -142,6 +142,10 @@
_card.plot.name = card.name
_card.style = config.style
_card.headerStyle = config.headerStyle
+
+ _card.setting = config.setting
+ _card.columns = config.columns
+ _card.scripts = config.scripts
}
this.props.updateConfig(_card)
@@ -234,7 +238,7 @@
const chart = new Chart({
container: card.uuid + 'dashboard',
autoFit: true,
- height: plot.title ? plot.height - 45 : plot.height,
+ height: this.wrap.offsetHeight - 30,
})
chart.data(data)
@@ -319,10 +323,10 @@
getdata = () => {
const { card } = this.state
- const data = [];
- const val = (Math.random() * card.plot.maxValue).toFixed(1);
- data.push({ value: +val });
- return data;
+ const data = []
+ const val = (Math.random() * card.plot.maxValue).toFixed(1)
+ data.push({ value: +val })
+ return data
}
dashboardrender = () => {
@@ -333,7 +337,7 @@
const chart = new Chart({
container: card.uuid + 'dashboard',
autoFit: true,
- height: plot.title ? plot.height - 45 : plot.height,
+ height: this.wrap.offsetHeight - 30,
padding: [0, 0, 0, 0],
})
chart.data(data)
@@ -466,7 +470,7 @@
updateComponent = (component) => {
const card = fromJS(this.state.card).toJS()
- if (!is(fromJS(component.plot), fromJS(card.plot)) || !is(fromJS(component.style), fromJS(card.style))) {
+ if (!is(fromJS(component.plot), fromJS(card.plot)) || !is(fromJS(component.style), fromJS(card.style)) || !is(fromJS(component.search), fromJS(card.search))) {
let _element = document.getElementById(card.uuid + 'dashboard')
if (_element) {
_element.innerHTML = ''
@@ -489,7 +493,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin'], card.style)
+ MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], card.style)
}
getStyle = (comIds, style) => {
@@ -519,17 +523,17 @@
<div className="mk-popover-control">
<ChartCompileForm config={card} dict={this.state.dict} plotchange={this.updateComponent}/>
<CopyComponent type="dashboard" card={card}/>
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<ClockComponent config={card} updateConfig={this.updateComponent}/>
<UserComponent config={card}/>
- <Icon className="close" title="delete" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
+ <DeleteOutlined className="close" title="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent}/>
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined/>
</Popover>
- {card.plot.title ? <NormalHeader config={card} updateComponent={this.updateComponent}/> : null}
- <div className="canvas" id={card.uuid + 'dashboard'}></div>
+ <NormalHeader hideSearch="true" config={card} updateComponent={this.updateComponent}/>
+ <div className="canvas" id={card.uuid + 'dashboard'} ref={ref => this.wrap = ref}></div>
</div>
)
}
--
Gitblit v1.8.0