From fc8c8d714687a22f711d642d192bd4149f3b7e88 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 22 四月 2024 11:15:14 +0800
Subject: [PATCH] 2024-04-22

---
 src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx |   47 +++++++++++++++++++++++++++++++----------------
 1 files changed, 31 insertions(+), 16 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..e125341 100644
--- a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
@@ -4,7 +4,8 @@
 import { Form, Row, Col, Input, Select, Radio, InputNumber, Modal } from 'antd'
 import { FormOutlined } from '@ant-design/icons'
 
-import ColorSketch from '@/mob/colorsketch'
+import ColorSketch from '@/tabviews/zshare/mutilform/mkColor'
+import NodeForm from './nodeform'
 import './index.scss'
 
 const { TextArea } = Input
@@ -12,17 +13,19 @@
 class NodeUpdate extends Component {
   static propTpyes = {
     node: PropTypes.object,
-    rolelist: PropTypes.array
+    orgs: PropTypes.array
   }
 
   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
@@ -458,7 +463,7 @@
         fields.push(
           <Col span={24} key={index}>
             <Form.Item label={item.label}>
-              <ColorSketch defaultValue={item.initval} onChange={(value) => this.change(value, item.field)}/>
+              <ColorSketch config={{initval: item.initval}} onChange={(value) => this.change(value, item.field)}/>
             </Form.Item>
           </Col>
         )
@@ -466,6 +471,14 @@
         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' && !mknode.mknode ? <div>鏍囪锛歿mkdata.sign || ''}</div> : null}
+              {mknode.shape === 'edge' && mkdata.flowType ? <div>鎿嶄綔锛歿mkdata.flowType === 'reject' ? '椹冲洖' : '瀹℃壒'}</div> : null}
+              {mkdata.members && mkdata.members.length ? <div>瀹℃壒浜猴細{mkdata.members.map(item => item.workername).join('銆�')}</div> : null}
+              {mkdata.copys && mkdata.copys.length ? <div>鎶勯�佷汉锛歿mkdata.copys.map(item => item.workername).join('銆�')}</div> : null}
+              <div>澶囨敞锛歿mkdata.remark || ''}</div>
+            </div> : null}
           </Col>
         )
       }
@@ -474,7 +487,7 @@
   }
 
   render() {
-    const { visible } = this.state
+    const { visible, mkdata, mknode } = this.state
 
     return (
       <div className="node-edit-form-wrap">
@@ -482,16 +495,18 @@
           <Row>{this.getFields()}</Row>
         </Form>
         <Modal
-          title="鑺傜偣缂栬緫"
+          title={mknode && mknode.shape === 'edge' ? '杩炵嚎缂栬緫' : '鑺傜偣缂栬緫'}
+          wrapClassName="mk-x6-modal"
           visible={visible}
           closable={false}
           maskClosable={false}
-          width={700}
+          width={1050}
+          centered={true}
           onOk={this.confirm}
           onCancel={() => this.setState({visible: false})}
           destroyOnClose
         >
-
+          <NodeForm node={mknode} data={mkdata} orgs={this.props.orgs} handleSubmit={() => this.confirm()} wrappedComponentRef={(inst) => this.nodeRef = inst}/>
         </Modal>
       </div>
     )

--
Gitblit v1.8.0