From ac1d52c46ff9019fcc93cf3d5e7ab17cf850824e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 八月 2023 16:05:24 +0800
Subject: [PATCH] 2023-08-10
---
src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx | 63 ++++++++-----------------------
1 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
index 44e92d5..de23978 100644
--- a/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/nodeupdate/nodeform.jsx
@@ -1,41 +1,24 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Input, Radio, Tooltip, InputNumber } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, InputNumber } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
+import MemberForm from './memberform'
const { TextArea } = Input
class NodeForm extends Component {
static propTpyes = {
node: PropTypes.any,
data: PropTypes.any,
- rolelist: PropTypes.array
+ orgs: PropTypes.array
}
state = {}
handleConfirm = () => {
- const { rolelist } = this.props
-
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
- if (values.roleId) {
- values.roleName = ''
- rolelist.forEach(item => {
- if (item.RoleID === values.roleId) {
- values.roleName = item.RoleName
- }
- })
- }
- if (values.depId) {
- values.depName = ''
- rolelist.forEach(item => {
- if (item.RoleID === values.depId) {
- values.depName = item.RoleName
- }
- })
- }
resolve(values)
} else {
reject(err)
@@ -45,7 +28,7 @@
}
render() {
- const { node, rolelist } = this.props
+ const { node, orgs } = this.props
const { getFieldDecorator } = this.props.form
const formItemLayout = {
labelCol: {
@@ -107,7 +90,7 @@
</Form.Item>
</Col> : null}
{nodetype === 'node' ? <Col span={12}>
- <Form.Item label="瀹℃壒浜�">
+ <Form.Item label="璁剧疆瀹℃壒浜�">
{getFieldDecorator('approver', {
initialValue: data.approver || 'member'
})(
@@ -132,36 +115,24 @@
</Form.Item>
</Col> : null}
<Col span={12}>
- <Form.Item label="瑙掕壊">
- {getFieldDecorator('roleId', {
- initialValue: data.roleId || '',
- rules: [
- {
- required: true,
- message: '璇烽�夋嫨瑙掕壊!'
- }
- ]
+ <Form.Item label="瀹℃壒浜�">
+ {getFieldDecorator('members', {
+ initialValue: data.members || [],
+ rules: [{
+ required: true,
+ message: '璇锋坊鍔犲鎵逛汉!'
+ }]
})(
- <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
- {rolelist.map(item => (<Select.Option key={item.RoleID} value={item.RoleID}>{item.RoleName}</Select.Option>))}
- </Select>
+ <MemberForm orgs={orgs} title="瀹℃壒浜�"/>
)}
</Form.Item>
</Col>
<Col span={12}>
- <Form.Item label="閮ㄩ棬">
- {getFieldDecorator('depId', {
- initialValue: data.depId || '',
- rules: [
- {
- required: true,
- message: '璇烽�夋嫨閮ㄩ棬!'
- }
- ]
+ <Form.Item label="鎶勯�佷汉">
+ {getFieldDecorator('copys', {
+ initialValue: data.copys || []
})(
- <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
- {rolelist.map(item => (<Select.Option key={item.RoleID} value={item.RoleID}>{item.RoleName}</Select.Option>))}
- </Select>
+ <MemberForm orgs={orgs} title="鎶勯�佷汉"/>
)}
</Form.Item>
</Col>
--
Gitblit v1.8.0