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-pie/index.jsx | 94 ++++++++++++++++++++++++++++++++--------------
1 files changed, 65 insertions(+), 29 deletions(-)
diff --git a/src/menu/components/chart/antv-pie/index.jsx b/src/menu/components/chart/antv-pie/index.jsx
index 2d34e00..c6fa78b 100644
--- a/src/menu/components/chart/antv-pie/index.jsx
+++ b/src/menu/components/chart/antv-pie/index.jsx
@@ -32,12 +32,13 @@
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 = {
@@ -48,7 +49,7 @@
name: card.name
}
- if (ismob) {
+ if (appType === 'mob') {
_plot.width = 24
}
@@ -97,16 +98,15 @@
_card.columns = config.columns
_card.scripts = config.scripts
- _card.search = config.search.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
+ if (appType !== 'mob') {
+ _card.search = config.search.map(col => {
+ col.uuid = Utils.getuuid()
+ return col
+ })
+ }
}
- this.props.updateConfig(_card)
- this.setState({
- card: _card
- })
+ this.updateComponent(_card, true)
} else {
this.setState({
card: fromJS(card).toJS()
@@ -599,27 +599,50 @@
chart.render()
}
- 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(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.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.Xaxis) {
+ card.errors.push({ level: 0, detail: '鍚嶇О瀛楁灏氭湭璁剧疆锛�'})
+ } else {
+ if (!columns.includes(card.plot.Xaxis)) {
+ card.errors.push({ level: 1, detail: '鍚嶇О瀛楁鍦ㄥ瓧娈甸泦涓笉瀛樺湪'})
+ }
+ if (!columns.includes(card.plot.Yaxis)) {
+ card.errors.push({ level: 1, detail: '鍊煎瓧娈靛湪瀛楁闆嗕腑涓嶅瓨鍦�'})
+ }
+ }
this.setState({
- card: component
+ card: card
})
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
addSearch = () => {
@@ -665,14 +688,14 @@
}
render() {
- const { card, ismob } = this.state
+ const { card, appType } = this.state
let _style = resetStyle(card.style)
return (
<div className="menu-pie-chart-edit-box" style={{..._style, height: card.plot.height || 400}} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- {!ismob ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
+ {appType !== 'mob' ? <PlusCircleOutlined className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch}/> : null}
<ChartCompileForm config={card} dict={this.state.dict} plotchange={this.updateComponent}/>
<CopyComponent type="pie" card={card}/>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
@@ -686,7 +709,20 @@
</Popover>
<NormalHeader config={card} updateComponent={this.updateComponent}/>
<div className="canvas" id={card.uuid + 'canvas'} ref={ref => this.wrap = ref}></div>
- <div className="component-name"><div className="center">{card.name}</div></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