From da5ff4b9866a2d458d950f0c743ab9244e16c66d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 12 十一月 2023 12:23:08 +0800
Subject: [PATCH] 2023-11-12
---
src/menu/components/chart/antv-bar/index.jsx | 216 +++++++++++++++++++++++++++--------------------------
1 files changed, 110 insertions(+), 106 deletions(-)
diff --git a/src/menu/components/chart/antv-bar/index.jsx b/src/menu/components/chart/antv-bar/index.jsx
index 53df3c8..ad556b3 100644
--- a/src/menu/components/chart/antv-bar/index.jsx
+++ b/src/menu/components/chart/antv-bar/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, notification } from 'antd'
+import { Popover, message } from 'antd'
import { PlusCircleOutlined, PlusSquareOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import { Chart } from '@antv/g2'
import DataSet from '@antv/data-set'
@@ -9,21 +9,17 @@
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, getHeight, checkComponent } from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import { chartColors } from '@/utils/option.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
const ChartCompileForm = asyncIconComponent(() => import('./chartcompile'))
-const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
-const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const ClockComponent = asyncIconComponent(() => import('@/menu/components/share/clockcomponent'))
class antvBarLineChart extends Component {
@@ -34,7 +30,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
appType: sessionStorage.getItem('appType'),
eventListener: null
@@ -71,12 +66,9 @@
let _card = {
uuid: card.uuid,
type: card.type,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: card.type === 'bar' ? true : false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
- dataName: card.dataName || '',
width: _plot.width,
name: _plot.name,
subtype: card.subtype,
@@ -91,33 +83,9 @@
search: [],
action: [],
plot: _plot,
- btnlog: [],
}
- if (card.config) {
- let config = fromJS(card.config).toJS()
-
- _card.plot = config.plot
- _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
-
- _card.action = config.action.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
- _card.search = config.search.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
- }
- this.setState({
- card: _card
- })
- this.props.updateConfig(_card)
+ this.updateComponent(_card, true)
} else {
this.setState({
card: fromJS(card).toJS()
@@ -126,7 +94,6 @@
}
componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('plusSearch', this.plusSearch)
MKEmitter.addListener('tabsChange', this.handleTabsChange)
setTimeout(() => {
@@ -145,7 +112,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('plusSearch', this.plusSearch)
MKEmitter.removeListener('tabsChange', this.handleTabsChange)
}
@@ -153,7 +119,7 @@
handleTabsChange = (parentId) => {
const { card } = this.state
- if (parentId === card.parentId || parentId === 'all') {
+ if (parentId.indexOf(card.uuid) > -1 || parentId === 'all') {
let _element = document.getElementById(card.uuid + 'canvas')
if (_element) {
_element.innerHTML = ''
@@ -240,7 +206,7 @@
const chart = new Chart({
container: card.uuid + 'canvas',
autoFit: true,
- height: this.wrap.offsetHeight - 25
+ height: getHeight(plot.height)
})
chart.data(dv.rows)
@@ -566,7 +532,7 @@
const chart = new Chart({
container: card.uuid + 'canvas',
autoFit: true,
- height: this.wrap.offsetHeight - 25,
+ height: getHeight(plot.height)
})
// chart.axis(plot.Xaxis, { label: { style: { fill: color } }, tickLine: {style: { stroke: color }}, line: { style: { stroke: color } } })
@@ -584,7 +550,8 @@
})
}
- if (!plot.legend || plot.legend === 'hidden') {
+ let noLegend = !plot.legend || plot.legend === 'hidden'
+ if (noLegend) {
chart.legend(false)
} else {
chart.legend({
@@ -677,7 +644,9 @@
}
view1.axis('value', yc)
- view1.legend(false)
+ if (!noLegend) {
+ view1.legend(false)
+ }
if (plot.mutilBar !== 'stack') {
let _chart = view1
@@ -790,17 +759,23 @@
}
}
- const view2 = chart.createView({
- region: {
- start: { x: 0, y: 0 },
- end: { x: 1, y: 1 }
- },
- padding
- })
+ let view2 = chart // 鏃犵嫭绔嬫煴鐘跺浘鏃朵笉鍋氬垎闈�
+
+ if (Bar_axis.length) {
+ view2 = chart.createView({
+ region: {
+ start: { x: 0, y: 0 },
+ end: { x: 1, y: 1 }
+ },
+ padding
+ })
+ }
view2.data(dv.rows)
- view2.legend(false)
+ if (!noLegend) {
+ view2.legend(false)
+ }
fields.forEach(item => {
if (item.chartType === 'bar' && !Bar_axis.length) {
@@ -956,7 +931,7 @@
const chart = new Chart({
container: card.uuid + 'canvas',
autoFit: true,
- height: this.wrap.offsetHeight - 25
+ height: getHeight(plot.height)
})
chart.data(dv.rows)
@@ -1212,26 +1187,60 @@
}
}
- updateComponent = (component) => {
- const card = fromJS(this.state.card).toJS()
- 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 + 'canvas')
- if (_element) {
- _element.innerHTML = ''
+ updateComponent = (card, init) => {
+ if (!init) {
+ if (!is(fromJS({plot: card.plot, style: card.style, search: card.search}), fromJS({plot: this.state.card.plot, style: this.state.card.style, search: this.state.card.search}))) {
+ let _element = document.getElementById(this.state.card.uuid + 'canvas')
+ if (_element) {
+ _element.innerHTML = ''
+ }
+ this.$timer && clearTimeout(this.$timer)
+ this.$timer = setTimeout(() => {
+ this.viewrender()
+ }, 150)
}
- this.$timer && clearTimeout(this.$timer)
- this.$timer = setTimeout(() => {
- this.viewrender()
- }, 150)
}
- component.width = component.plot.width
- component.name = component.plot.name
+ card.width = card.plot.width
+ card.name = card.plot.name
+
+ card.$c_ds = true
+ card.$c_ac = this.state.appType !== 'mob'
+
+ card.errors = checkComponent(card)
+
+ if (card.errors.length === 0) {
+ card.$tables = getTables(card)
+ }
+
+ let columns = card.columns.map(c => c.field)
+ if (!card.plot.Xaxis) {
+ card.errors.push({ level: 0, detail: '鍧愭爣杞村皻鏈缃紒'})
+ } else if (card.plot.datatype === 'query') {
+ if (!columns.includes(card.plot.Xaxis)) {
+ card.errors.push({ level: 0, detail: 'X杞村湪瀛楁闆嗕腑涓嶅瓨鍦�'})
+ }
+ if (card.plot.Yaxis) {
+ card.plot.Yaxis.forEach(m => {
+ if (!columns.includes(m)) {
+ card.errors.push({ level: 0, detail: `Y杞翠腑瀛楁鈥�${m}鈥濆凡澶辨晥`})
+ }
+ })
+ }
+ } else if (card.plot.datatype === 'statistics') {
+ if (!columns.includes(card.plot.Xaxis)) {
+ card.errors.push({ level: 0, detail: 'X杞村湪瀛楁闆嗕腑涓嶅瓨鍦�'})
+ } else if (!columns.includes(card.plot.InfoType)) {
+ card.errors.push({ level: 0, detail: '鍥捐〃涓粺璁＄被鍨嬪瓧娈靛凡澶辨晥'})
+ } else if (!columns.includes(card.plot.InfoValue)) {
+ card.errors.push({ level: 0, detail: '鍥捐〃涓粺璁″�煎瓧娈靛凡澶辨晥'})
+ }
+ }
this.setState({
- card: component
+ card: card
})
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
addSearch = () => {
@@ -1294,69 +1303,44 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], card.style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
-
- if (comIds[0] !== card.uuid || comIds.length > 1) return
-
- let _card = {...card, style}
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
this.updateComponent(_card)
- }
-
- handleLog = (type, logs, item) => {
- let card = fromJS(this.state.card).toJS()
-
- if (type === 'revert') {
- card.action = card.action ? [...card.action, item] : [item]
- card.btnlog = logs
-
- this.setState({ card })
- this.props.updateConfig(card)
- notification.success({
- top: 92,
- message: '鎭㈠鎴愬姛锛�',
- duration: 2
- })
- } else {
- card.btnlog = logs
- this.setState({ card })
- this.props.updateConfig(card)
- notification.success({
- top: 92,
- message: '娓呴櫎鎴愬姛锛�',
- duration: 2
- })
- }
}
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
- MKEmitter.emit('clickComponent', this.state.card)
+ MKEmitter.emit('clickComponent', this.state.card.uuid, null, (style) => {
+ let _card = {...this.state.card}
+ _card.style = {..._card.style, ...style}
+
+ this.updateComponent(_card)
+ })
}
}
render() {
const { card, appType } = this.state
+
let _style = resetStyle(card.style)
+ _style.height = 'auto'
return (
- <div className="menu-line-chart-edit-box" style={{..._style, height: card.plot.height || 400}} onClick={this.clickComponent} id={card.uuid}>
+ <div className="menu-line-chart-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
{appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
{appType !== 'mob' ? <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton}/> : null}
- <ChartCompileForm config={card} dict={this.state.dict} plotchange={this.updateComponent}/>
+ <ChartCompileForm config={card} plotchange={this.updateComponent}/>
<CopyComponent type="line" card={card}/>
<PasteComponent config={card} options={['action', 'search']} updateConfig={this.updateComponent} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
- <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
<ClockComponent config={card} updateConfig={this.updateComponent}/>
- <UserComponent config={card}/>
<DeleteOutlined className="close" title="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
<SettingComponent config={card} updateConfig={this.updateComponent}/>
</div>
@@ -1364,13 +1348,33 @@
<ToolOutlined/>
</Popover>
<NormalHeader config={card} updateComponent={this.updateComponent}/>
- <div className="canvas" id={card.uuid + 'canvas'} ref={ref => this.wrap = ref}></div>
+ <div className="canvas" style={{minHeight: card.plot.height}} id={card.uuid + 'canvas'}></div>
{appType !== 'mob' ? <ActionComponent
- type="chart"
config={card}
updateaction={this.updateComponent}
/> : null}
- <div className="component-name"><div className="center">{card.name}</div></div>
+ <div className="component-name">
+ <div className="center">
+ <div className="title" onDoubleClick={() => {
+ let oInput = document.createElement('input')
+ oInput.value = 'anchor' + card.uuid
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+ message.success('澶嶅埗鎴愬姛銆�')
+ }}>{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