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 |   77 ++++++++++++++++++++++++++------------
 1 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/src/menu/components/chart/antv-dashboard/index.jsx b/src/menu/components/chart/antv-dashboard/index.jsx
index 58d1a55..71c92d2 100644
--- a/src/menu/components/chart/antv-dashboard/index.jsx
+++ b/src/menu/components/chart/antv-dashboard/index.jsx
@@ -67,12 +67,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 = null
@@ -105,7 +106,7 @@
         }
       }
 
-      if (ismob) {
+      if (appType === 'mob') {
         _plot.width = 24
       }
 
@@ -132,7 +133,6 @@
         search: [],
         action: [],
         plot: _plot,
-        btnlog: [],
       }
 
       if (card.config) {
@@ -148,10 +148,7 @@
         _card.scripts = config.scripts
       }
 
-      this.props.updateConfig(_card)
-      this.setState({
-        card: _card
-      })
+      this.updateComponent(_card, true)
     } else {
       this.setState({
         card: fromJS(card).toJS()
@@ -467,27 +464,46 @@
     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 + '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)
       }
-      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.valueField) {
+      card.errors.push({ level: 0, detail: '鏄剧ず鍊煎皻鏈缃紒'})
+    } else if (!columns.includes(card.plot.valueField)) {
+      card.errors.push({ level: 1, detail: '鏄剧ず鍊煎湪瀛楁闆嗕腑涓嶅瓨鍦�'})
+    }
     
     this.setState({
-      card: component
+      card: card
     })
-    this.props.updateConfig(component)
+    this.props.updateConfig(card)
   }
 
   changeStyle = () => {
@@ -534,7 +550,20 @@
         </Popover>
         <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">{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