From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16
---
src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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..3c0f69a 100644
--- a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/index.jsx
@@ -2,10 +2,11 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Form, Row, Col, Input, Select, Radio, InputNumber, Modal } from 'antd'
-import { FormOutlined } from '@ant-design/icons'
+import { FormOutlined, DeleteOutlined } from '@ant-design/icons'
-import ColorSketch from '@/mob/colorsketch'
+import ColorSketch from '@/tabviews/zshare/mutilform/mkColor'
import NodeForm from './nodeform'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
const { TextArea } = Input
@@ -30,6 +31,10 @@
})
}
+ componentDidMount () {
+ MKEmitter.addListener('mk-x6-dbclick', this.trigger)
+ }
+
UNSAFE_componentWillReceiveProps(nextProps) {
if (!is(fromJS(this.props.node), fromJS(nextProps.node))) {
this.setState({
@@ -42,6 +47,25 @@
})
})
}
+ }
+
+ /**
+ * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+ */
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+
+ MKEmitter.removeListener('mk-x6-dbclick', this.trigger)
+ }
+
+ trigger = () => {
+ const { formlist } = this.state
+
+ if (!formlist || formlist.findIndex(item => item.type === 'other') === -1) return
+
+ this.setState({visible: true})
}
getFormList = (node) => {
@@ -463,18 +487,20 @@
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>
)
} else if (item.type === 'other') {
fields.push(
<Col span={24} key={index}>
- <span className="split-line">{item.label}锛�<FormOutlined onClick={() => {this.setState({visible: true})}}/></span>
+ <span className="split-line">{item.label}:<FormOutlined onClick={() => {this.setState({visible: true})}}/><DeleteOutlined onClick={() => this.props.onDel()}/></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.seniorbers && mkdata.seniorbers.length ? <div>鐗规畩瀹℃壒浜猴細{mkdata.seniorbers.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}
@@ -494,11 +520,13 @@
<Row>{this.getFields()}</Row>
</Form>
<Modal
- title="鑺傜偣缂栬緫"
+ title={mknode && mknode.shape === 'edge' ? '杩炵嚎缂栬緫' : '鑺傜偣缂栬緫'}
+ wrapClassName="mk-x6-modal"
visible={visible}
closable={false}
maskClosable={false}
- width={1000}
+ width={1070}
+ centered={true}
onOk={this.confirm}
onCancel={() => this.setState({visible: false})}
destroyOnClose
--
Gitblit v1.8.0