From f6adeb27e1c1ff7299bbf5079a5749cbcd7864de Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 八月 2023 14:39:32 +0800
Subject: [PATCH] 2023-08-03

---
 src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
index 911bb00..9aef657 100644
--- a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
@@ -5,6 +5,7 @@
 import { FormOutlined } from '@ant-design/icons'
 
 import ColorSketch from '@/mob/colorsketch'
+import NodeForm from './nodeform'
 import './index.scss'
 
 const { TextArea } = Input
@@ -17,12 +18,14 @@
 
   state = {
     formlist: null,
-    mknode: null
+    mknode: null,
+    mkdata: null
   }
 
   UNSAFE_componentWillMount () {
     this.setState({
-      mknode: null,
+      mknode: this.props.node,
+      mkdata: this.props.node.mkdata || '',
       formlist: this.getFormList(this.props.node)
     })
   }
@@ -30,10 +33,11 @@
   UNSAFE_componentWillReceiveProps(nextProps) {
     if (!is(fromJS(this.props.node), fromJS(nextProps.node))) {
       this.setState({
-        mknode: null,
         formlist: null
       }, () => {
         this.setState({
+          mknode: nextProps.node,
+          mkdata: nextProps.node.mkdata || '',
           formlist: this.getFormList(nextProps.node)
         })
       })
@@ -133,8 +137,7 @@
         },
         {
           type: 'other',
-          label: '鑷畾涔変俊鎭�',
-          initval: node
+          label: '鑷畾涔変俊鎭�'
         }
       ]
     } else if (node.shape === 'lane') {
@@ -359,8 +362,7 @@
         },
         {
           type: 'other',
-          label: '鑷畾涔変俊鎭�',
-          initval: node
+          label: '鑷畾涔変俊鎭�'
         }
       ]
     }
@@ -383,11 +385,14 @@
   }
 
   confirm = () => {
-    this.setState({visible: false})
+    this.nodeRef.handleConfirm().then(res => {
+      this.setState({visible: false, mkdata: res})
+      this.props.onChange(res, 'mkdata')
+    })
   }
 
   getFields() {
-    const { formlist } = this.state
+    const { formlist, mkdata, mknode } = this.state
     const fields = []
 
     if (!formlist) return
@@ -466,6 +471,13 @@
         fields.push(
           <Col span={24} key={index}>
             <span className="split-line">{item.label}锛�<FormOutlined onClick={() => {this.setState({visible: true})}}/></span>
+            {mkdata ? <div className="mk-data">
+              <div>鐘舵�侊細{mkdata.status}<span style={{float: 'right'}}>{mkdata.statusName}</span></div>
+              {mknode.shape !== 'edge' ? <div>鏍囪锛歿mkdata.sign || ''}</div> : null}
+              {mkdata.roleId ? <div>瑙掕壊锛歿mkdata.roleName || ''}</div> : null}
+              {mkdata.depId ? <div>閮ㄩ棬锛歿mkdata.depName || ''}</div> : null}
+              <div>澶囨敞锛歿mkdata.remark || ''}</div>
+            </div> : null}
           </Col>
         )
       }
@@ -474,7 +486,7 @@
   }
 
   render() {
-    const { visible } = this.state
+    const { visible, mkdata, mknode } = this.state
 
     return (
       <div className="node-edit-form-wrap">
@@ -491,7 +503,7 @@
           onCancel={() => this.setState({visible: false})}
           destroyOnClose
         >
-
+          <NodeForm node={mknode} data={mkdata} rolelist={this.props.rolelist} handleSubmit={() => this.confirm()} wrappedComponentRef={(inst) => this.nodeRef = inst}/>
         </Modal>
       </div>
     )

--
Gitblit v1.8.0