From b20d0f21e53b3730de9ad1e7d96f25512620ff77 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 09 十月 2023 16:22:02 +0800
Subject: [PATCH] 2023-10-09
---
src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx | 9 +++++----
1 files changed, 5 insertions(+), 4 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 34ac0c0..9ff4eb4 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,7 @@
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'
@@ -463,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>
)
@@ -474,6 +474,7 @@
{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>
@@ -494,11 +495,11 @@
<Row>{this.getFields()}</Row>
</Form>
<Modal
- title="鑺傜偣缂栬緫"
+ title={mknode && mknode.shape === 'edge' ? '杩炵嚎缂栬緫' : '鑺傜偣缂栬緫'}
visible={visible}
closable={false}
maskClosable={false}
- width={1000}
+ width={1050}
onOk={this.confirm}
onCancel={() => this.setState({visible: false})}
destroyOnClose
--
Gitblit v1.8.0