From 43398618f35eb084ed4eb4000bd2e082196cbf71 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 27 五月 2022 16:12:37 +0800 Subject: [PATCH] 错误信息收集&注释btnlog --- src/menu/components/chart/chart-custom/index.jsx | 65 ++++++++++++++++++++++---------- 1 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/menu/components/chart/chart-custom/index.jsx b/src/menu/components/chart/chart-custom/index.jsx index 46ced3e..57d124c 100644 --- a/src/menu/components/chart/chart-custom/index.jsx +++ b/src/menu/components/chart/chart-custom/index.jsx @@ -90,10 +90,8 @@ return col }) } - this.setState({ - card: _card - }) - this.props.updateConfig(_card) + + this.updateComponent(_card, true) } else { this.setState({ card: fromJS(card).toJS() @@ -176,28 +174,40 @@ } } - 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 = '' - _element.removeAttribute('_echarts_instance_') - _element.removeAttribute('style') + 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 = '' + _element.removeAttribute('_echarts_instance_') + _element.removeAttribute('style') + } + 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: '鏈缃笂绾х粍浠讹紒'}) + } this.setState({ - card: component + card: card }) - this.props.updateConfig(component) + this.props.updateConfig(card) } addSearch = () => { @@ -263,7 +273,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