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/menu/components/chart/antv-dashboard/index.jsx | 311 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 246 insertions(+), 65 deletions(-)
diff --git a/src/menu/components/chart/antv-dashboard/index.jsx b/src/menu/components/chart/antv-dashboard/index.jsx
index 1e395b6..71c92d2 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'
@@ -50,6 +51,12 @@
},
})
+registerShape('point', 'hidden', {
+ draw(cfg, container) {
+ return container.addGroup({})
+ }
+})
+
class antvDashboardChart extends Component {
static propTpyes = {
card: PropTypes.object,
@@ -60,38 +67,55 @@
state = {
dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
- ismob: sessionStorage.getItem('appType') === 'mob',
+ appType: sessionStorage.getItem('appType'),
eventListener: null
}
UNSAFE_componentWillMount () {
- const { card, ismob } = this.props
+ const { card } = this.props
+ const { appType } = this.state
if (card.isNew) {
- let _plot = {
- width: card.width || 12,
- height: 400,
- label: '',
- valueField: '',
- name: card.name,
- maxValue: 100,
- tickInterval: 10,
- labelColor: '#545454',
- tickColor: '#CBCBCB',
- percent: 'true'
+ let _plot = null
+ if (card.subtype === 'ratioboard') {
+ _plot = {
+ width: card.width || 12,
+ height: 400,
+ labelField: '',
+ valueField: '',
+ name: card.name,
+ maxValue: 100,
+ radius: 75,
+ fontSize: 28,
+ percent: 'true',
+ backColor: '#ebedf0',
+ labelColor: '#8c8c8c'
+ }
+ } else {
+ _plot = {
+ width: card.width || 12,
+ height: 400,
+ label: '',
+ valueField: '',
+ name: card.name,
+ maxValue: 100,
+ tickInterval: 10,
+ labelColor: '#545454',
+ tickColor: '#CBCBCB',
+ percent: 'true'
+ }
}
- if (ismob) {
+ if (appType === 'mob') {
_plot.width = 24
}
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
tabId: card.tabId || '',
parentId: card.parentId || '',
- format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
+ format: card.subtype === 'ratioboard' ? 'array' : 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
dataName: card.dataName || '',
@@ -109,7 +133,6 @@
search: [],
action: [],
plot: _plot,
- btnlog: [],
}
if (card.config) {
@@ -119,12 +142,13 @@
_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)
- this.setState({
- card: _card
- })
+ this.updateComponent(_card, true)
} else {
this.setState({
card: fromJS(card).toJS()
@@ -133,9 +157,12 @@
}
componentDidMount () {
- this.dashboardrender()
MKEmitter.addListener('tabsChange', this.handleTabsChange)
MKEmitter.addListener('submitStyle', this.getStyle)
+
+ setTimeout(() => {
+ this.viewrender()
+ }, 1000)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -156,23 +183,147 @@
handleTabsChange = (parentId) => {
const { card } = this.state
- if (parentId === card.parentId) {
- let _element = document.getElementById(card.uuid + 'canvas')
+ if (parentId === card.parentId || parentId === 'all') {
+ let _element = document.getElementById(card.uuid + 'dashboard')
if (_element) {
_element.innerHTML = ''
}
- setTimeout(this.dashboardrender, 100)
+ this.$timer && clearTimeout(this.$timer)
+ this.$timer = setTimeout(this.viewrender, 100)
}
+ }
+
+ viewrender = () => {
+ const { card } = this.state
+ if (card.subtype === 'ratioboard') {
+ this.ratioboardrender()
+ } else {
+ this.dashboardrender()
+ }
+ }
+
+ getratiodata = () => {
+ const { card } = this.state
+
+ let val = (Math.random() * card.plot.maxValue).toFixed(1)
+ let data = [
+ { type: '鏂扮敤鎴�', value: val, $percent: val / card.plot.maxValue, $color: '#1890ff' },
+ ]
+ if (card.plot.colors && card.plot.colors.length > 0) {
+ data = []
+ card.plot.colors.forEach(item => {
+ let _val = (Math.random() * card.plot.maxValue).toFixed(1)
+ data.push({
+ type: item.tick,
+ value: _val,
+ $percent: _val / card.plot.maxValue,
+ $color: item.color
+ })
+ })
+ }
+
+ return data
+ }
+
+ ratioboardrender = () => {
+ const { card } = this.state
+ const plot = card.plot
+
+ const data = this.getratiodata()
+
+ const chart = new Chart({
+ container: card.uuid + 'dashboard',
+ autoFit: true,
+ height: this.wrap.offsetHeight - 30,
+ })
+
+ chart.data(data)
+ chart.coordinate('polar', {
+ startAngle: -Math.PI / 2,
+ endAngle: 3 * Math.PI / 2,
+ radius: (plot.radius || 75) / 100
+ })
+ chart.scale('$percent', {
+ min: 0,
+ max: 1,
+ tickInterval: 1,
+ })
+ chart.axis(false)
+ chart.facet('rect', {
+ fields: ['type'],
+ showTitle: false,
+ eachView: function eachView(view, facet) {
+ const data = facet.data[0]
+
+ view.point().position('').shape('hidden')
+
+ view.annotation().arc({
+ top: false,
+ start: [0, 1],
+ end: [0.9999, 1],
+ style: {
+ stroke: plot.backColor,
+ lineWidth: 10
+ }
+ })
+
+ let _tick = data.$percent
+ if (_tick >= 1) {
+ _tick = 0.9999
+ }
+
+ view.annotation().arc({
+ start: [0, 1],
+ end: [_tick, 1],
+ style: {
+ stroke: data.$color,
+ lineWidth: 10,
+ }
+ })
+ // 浠〃鐩樹俊鎭�
+ let text = ''
+ if (plot.percent === 'true') {
+ text = +(data.$percent * 100).toFixed(2) + '%'
+ } else {
+ text = data.value
+ }
+
+ view.annotation().text({
+ position: ['50%', '45%'],
+ content: data.type,
+ style: {
+ fontSize: plot.fontSize * 0.8,
+ fill: plot.labelColor,
+ fontWeight: 300,
+ textAlign: 'center'
+ },
+ offsetX: 0
+ })
+ view.annotation().text({
+ position: ['50%', '55%'],
+ content: text,
+ style: {
+ fontSize: plot.fontSize,
+ fill: plot.labelColor,
+ fontWeight: 500,
+ textAlign: 'center'
+ },
+ offsetX: 0,
+ offsetY: 10
+ })
+ }
+ })
+ chart.render()
}
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 = () => {
@@ -183,22 +334,22 @@
const chart = new Chart({
container: card.uuid + 'dashboard',
autoFit: true,
- height: plot.height ? (plot.height - 80) : 320,
+ height: this.wrap.offsetHeight - 30,
padding: [0, 0, 0, 0],
})
- chart.data(data);
+ chart.data(data)
chart.scale('value', {
min: 0,
max: plot.maxValue,
tickInterval: plot.tickInterval,
- });
+ })
chart.coordinate('polar', {
startAngle: (-9 / 8) * Math.PI,
endAngle: (1 / 8) * Math.PI,
radius: 0.75,
- });
+ })
- chart.axis('1', false);
+ chart.axis('1', false)
chart.axis('value', {
line: null,
label: {
@@ -217,9 +368,9 @@
}
},
grid: null,
- });
- chart.legend(false);
- chart.tooltip(false);
+ })
+ chart.legend(false)
+ chart.tooltip(false)
chart
.point()
.position('value*1')
@@ -242,7 +393,7 @@
appear: {
animation: 'fade-in'
}
- });
+ })
// 缁樺埗浠〃鐩樿儗鏅�
chart.annotation().arc({
@@ -250,7 +401,7 @@
start: [0, 1],
end: [plot.maxValue, 1],
style: {
- stroke: '#CBCBCB',
+ stroke: '#ebedf0',
lineWidth: 18,
lineDash: null,
},
@@ -308,41 +459,57 @@
textAlign: 'center',
},
offsetY: 15,
- });
+ })
chart.render()
}
- updateComponent = (component) => {
- const card = fromJS(this.state.card).toJS()
- let refresh = false
- if (!is(fromJS(component.plot), fromJS(card.plot)) || !is(fromJS(component.style), fromJS(card.style))) {
- let _element = document.getElementById(card.uuid + 'dashboard')
- if (_element) {
- _element.innerHTML = ''
+ updateComponent = (card, init) => {
+ if (!init) {
+ if (!is(fromJS({plot: card.plot, style: card.style}), fromJS({plot: this.state.card.plot, style: this.state.card.style}))) {
+ let _element = document.getElementById(this.state.card.uuid + 'dashboard')
+ if (_element) {
+ _element.innerHTML = ''
+ }
+ this.$timer && clearTimeout(this.$timer)
+ this.$timer = setTimeout(() => {
+ this.viewrender()
+ }, 150)
}
- refresh = true
}
- component.width = component.plot.width
- component.name = component.plot.name
+ card.width = card.plot.width
+ card.name = card.plot.name
+
+ card.errors = []
+
+ if (card.setting.interType === 'system' && card.setting.execute !== 'false' && !card.setting.dataresource) {
+ card.errors.push({ level: 0, detail: '鏈缃暟鎹簮锛�'})
+ } else if (card.setting.interType === 'system' && card.setting.execute === 'false' && card.scripts.filter(script => script.status !== 'false').length === 0) {
+ card.errors.push({ level: 0, detail: '鏁版嵁婧愪腑鏃犲彲鐢ㄨ剼鏈紒'})
+ } else if (!card.setting.primaryKey) {
+ card.errors.push({ level: 0, detail: '鏈缃富閿紒'})
+ } else if (!card.setting.supModule) {
+ card.errors.push({ level: 0, detail: '鏈缃笂绾х粍浠讹紒'})
+ }
+
+ let columns = card.columns.map(c => c.field)
+ if (!card.plot.valueField) {
+ card.errors.push({ level: 0, detail: '鏄剧ず鍊煎皻鏈缃紒'})
+ } else if (!columns.includes(card.plot.valueField)) {
+ card.errors.push({ level: 1, detail: '鏄剧ず鍊煎湪瀛楁闆嗕腑涓嶅瓨鍦�'})
+ }
this.setState({
- card: component
- }, () => {
- if (refresh) {
- setTimeout(() => {
- this.dashboardrender()
- }, 100)
- }
+ card: card
})
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
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) => {
@@ -368,21 +535,35 @@
return (
<div className="menu-dashboard-edit-box" style={{..._style, height: card.plot.height || 400}} onClick={this.clickComponent} id={card.uuid}>
- <NormalHeader config={card} updateComponent={this.updateComponent}/>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<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>
- <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 className="component-name">
+ <div className="center">
+ <div className="title">{card.name}</div>
+ <div className="content">
+ {card.errors && card.errors.map((err, index) => {
+ if (err.level === 0) {
+ return <span key={index} className="error">{err.detail}</span>
+ } else {
+ return <span key={index} className="waring">{err.detail}锛�</span>
+ }
+ })}
+ </div>
+ </div>
+ </div>
</div>
)
}
--
Gitblit v1.8.0