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/form/normal-form/index.jsx |   79 ++++++++++++++++++++++++---------------
 1 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/menu/components/form/normal-form/index.jsx b/src/menu/components/form/normal-form/index.jsx
index e10544c..01c6dde 100644
--- a/src/menu/components/form/normal-form/index.jsx
+++ b/src/menu/components/form/normal-form/index.jsx
@@ -106,10 +106,9 @@
         })
       }
       this.setState({
-        card: _card,
         group: _card.subcards[0] || null
       })
-      this.props.updateConfig(_card)
+      this.updateComponent(_card)
     } else {
       let _card = fromJS(card).toJS()
       this.setState({
@@ -159,15 +158,28 @@
   /**
    * @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
    */
-  updateComponent = (component) => {
+  updateComponent = (card) => {
+    card.width = card.wrap.width
+    card.name = card.wrap.name
+    card.errors = []
+
+    if (card.wrap.datatype !== 'static') {
+      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
     })
 
-    component.width = component.wrap.width
-    component.name = component.wrap.name
-
-    this.props.updateConfig(component)
+    this.props.updateConfig(card)
   }
 
   /**
@@ -181,9 +193,7 @@
       return item
     })
 
-    this.setState({card})
-
-    this.props.updateConfig(card)
+    this.updateComponent(card)
   }
 
   changeStyle = () => {
@@ -212,12 +222,8 @@
     if (comIds.length !== 1 || comIds[0] !== card.uuid) return
 
     let _card = {...card, style}
-
-    this.setState({
-      card: _card
-    })
     
-    this.props.updateConfig(_card)
+    this.updateComponent(_card)
   }
 
   addCard = () => {
@@ -237,10 +243,9 @@
     card.subcards.push(newcard)
     
     this.setState({
-      card,
       group: newcard
     })
-    this.props.updateConfig(card)
+    this.updateComponent(card)
   }
 
   changecards = (list) => {
@@ -250,8 +255,7 @@
       return item
     })
 
-    this.setState({card})
-    this.props.updateConfig(card)
+    this.updateComponent(card)
   }
 
   selectGroup = (item) => {
@@ -279,8 +283,8 @@
           _group = card.subcards[0] || null
         }
 
-        _this.setState({card, group: _group})
-        _this.props.updateConfig(card)
+        _this.setState({group: _group})
+        _this.updateComponent(card)
       },
       onCancel() {}
     })
@@ -296,8 +300,8 @@
       return item
     })
 
-    this.setState({card, group})
-    this.props.updateConfig(card)
+    this.setState({group})
+    this.updateComponent(card)
   }
 
   plusFields = (items) => {
@@ -343,8 +347,8 @@
           }
           return item
         })
-        _this.setState({group: config, card})
-        _this.props.updateConfig(card)
+        _this.setState({group: config})
+        _this.updateComponent(card)
       },
       onCancel() {}
     })
@@ -363,12 +367,12 @@
       return item
     })
 
-    this.setState({card, group}, () => {
+    this.setState({group}, () => {
       if (newcard) {
         this.handleForm(newcard)
       }
     })
-    this.props.updateConfig(card)
+    this.updateComponent(card)
   }
 
   closeForm = (cell) => {
@@ -388,8 +392,8 @@
     confirm({
       content: `纭畾鍒犻櫎<<${cell.label}>>鍚楋紵`,
       onOk() {
-        _this.setState({card, group})
-        _this.props.updateConfig(card)
+        _this.setState({group})
+        _this.updateComponent(card)
       },
       onCancel() {}
     })
@@ -731,7 +735,20 @@
           />}
           <FormAction config={card} group={group} updateconfig={this.updateGroup}/>
         </div> : null}
-        <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>
         <Modal
           title={this.state.dict['model.edit']}
           visible={this.state.visible}

--
Gitblit v1.8.0