Commit 8a815c51 authored by 邓超's avatar 邓超

fix: 节点配置交互修改

parent cd11ca18
Pipeline #64541 passed with stages
...@@ -611,7 +611,7 @@ const AddModal = props => { ...@@ -611,7 +611,7 @@ const AddModal = props => {
setType1(rember1); setType1(rember1);
form.setFieldsValue({ BusinessType: rember1 }); form.setFieldsValue({ BusinessType: rember1 });
setReportFromWeb(true); setReportFromWeb(true);
setChee(0); setChee(1);
setValue(0); setValue(0);
getEventData(); getEventData();
setSelectValue(selectData[0]); setSelectValue(selectData[0]);
......
...@@ -252,17 +252,6 @@ const incident = () => { ...@@ -252,17 +252,6 @@ const incident = () => {
<Tooltip title="编辑事件类型"> <Tooltip title="编辑事件类型">
<EditTwoTone onClick={() => editEventType(record)} style={{ fontSize: '16px' }} /> <EditTwoTone onClick={() => editEventType(record)} style={{ fontSize: '16px' }} />
</Tooltip> </Tooltip>
<Tooltip title="删除事件类型">
<Popconfirm
placement="bottomRight"
title={<p>即将删除事件类型表,是否确认删除?</p>}
okText="确认"
cancelText="取消"
onConfirm={() => deleteEventType(record)}
>
<DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }} />
</Popconfirm>
</Tooltip>
<Tooltip title="受理流程"> <Tooltip title="受理流程">
<ApartmentOutlined <ApartmentOutlined
onClick={() => process1(record)} onClick={() => process1(record)}
...@@ -275,6 +264,17 @@ const incident = () => { ...@@ -275,6 +264,17 @@ const incident = () => {
style={{ fontSize: '16px', color: '#1890FF' }} style={{ fontSize: '16px', color: '#1890FF' }}
/> />
</Tooltip> </Tooltip>
<Tooltip title="删除事件类型">
<Popconfirm
placement="bottomRight"
title={<p>即将删除事件类型表,是否确认删除?</p>}
okText="确认"
cancelText="取消"
onConfirm={() => deleteEventType(record)}
>
<DeleteOutlined style={{ fontSize: '16px', color: '#e86060' }} />
</Popconfirm>
</Tooltip>
</Space> </Space>
), ),
}, },
......
...@@ -53,7 +53,7 @@ const FlowChart = props => { ...@@ -53,7 +53,7 @@ const FlowChart = props => {
const [buttonLoading, setButtonLoading] = useState(); // 发布按钮保存loading const [buttonLoading, setButtonLoading] = useState(); // 发布按钮保存loading
const [flag, setFlag] = useState(0); const [flag, setFlag] = useState(0);
const currentNode = useRef(); const currentNode = useRef();
const afterNodes = useRef(new Map([])); const afterNodes = useRef(new Map([])); // 当前节点后所有节点
const objGo = go.GraphObject.make; const objGo = go.GraphObject.make;
useEffect(() => { useEffect(() => {
if (treeVisible) { if (treeVisible) {
......
...@@ -106,7 +106,16 @@ const FlowModal = props => { ...@@ -106,7 +106,16 @@ const FlowModal = props => {
> >
<Input placeholder="请输入流程名称" /> <Input placeholder="请输入流程名称" />
</Form.Item> </Form.Item>
<Form.Item label="分组信息" name="Type"> <Form.Item
label="分组信息"
name="Type"
rules={[
{
required: true,
message: '请选择分组',
},
]}
>
<Select <Select
showSearch showSearch
filterOption={false} filterOption={false}
...@@ -150,7 +159,7 @@ const FlowModal = props => { ...@@ -150,7 +159,7 @@ const FlowModal = props => {
<Form.Item <Form.Item
label="前端样式" label="前端样式"
name="WebPage" name="WebPage"
initialValue="多表显示" initialValue="多表在办显示"
rules={[{ required: true, message: '请选择前端样式' }]} rules={[{ required: true, message: '请选择前端样式' }]}
> >
<Select placeholder="请选择前端样式"> <Select placeholder="请选择前端样式">
......
...@@ -123,6 +123,7 @@ const NodeModal = props => { ...@@ -123,6 +123,7 @@ const NodeModal = props => {
<div <div
style={{ style={{
display: display:
editMsg.NodeType === '1' ||
editMsg.NodeType === '20' || editMsg.NodeType === '20' ||
editMsg.NodeType === '21' || editMsg.NodeType === '21' ||
editMsg.NodeType === '22' || editMsg.NodeType === '22' ||
......
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-bottom: 15px; margin-bottom: 15px;
padding-left: 15px; // padding-left: 15px;
.label { .label {
white-space: nowrap; white-space: nowrap;
......
...@@ -118,10 +118,10 @@ const ConfigOperate = (props, ref) => { ...@@ -118,10 +118,10 @@ const ConfigOperate = (props, ref) => {
style={{ marginBottom: '0', padding: '2px', borderBottom: '1px solid #ccc' }} style={{ marginBottom: '0', padding: '2px', borderBottom: '1px solid #ccc' }}
label={ label={
<div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>
<Tooltip title="开始节点不允许转"> <Tooltip title="开始节点不允许转">
<InfoCircleOutlined style={{ color: '#1890ff', marginRight: '3px' }} /> <InfoCircleOutlined style={{ color: '#1890ff', marginRight: '3px' }} />
</Tooltip> </Tooltip>
<span></span> <span></span>
</div> </div>
} }
name="Transferable" name="Transferable"
...@@ -137,7 +137,12 @@ const ConfigOperate = (props, ref) => { ...@@ -137,7 +137,12 @@ const ConfigOperate = (props, ref) => {
<Switch checkedChildren="是" unCheckedChildren="否" /> <Switch checkedChildren="是" unCheckedChildren="否" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
style={{ marginBottom: '0', padding: '2px', borderBottom: '1px solid #ccc' }} style={{
marginBottom: '0',
padding: '2px',
borderBottom: '1px solid #ccc',
display: editMsg.NodeType === '0' ? 'flex' : 'none',
}}
valuePropName="checked" valuePropName="checked"
label={ label={
<div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>
...@@ -156,7 +161,12 @@ const ConfigOperate = (props, ref) => { ...@@ -156,7 +161,12 @@ const ConfigOperate = (props, ref) => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
style={{ marginBottom: '0', padding: '2px', borderBottom: '1px solid #ccc' }} style={{
marginBottom: '0',
padding: '2px',
borderBottom: '1px solid #ccc',
display: editMsg.NodeType === '2' ? 'flex' : 'none',
}}
valuePropName="checked" valuePropName="checked"
label={ label={
<div style={{ display: 'flex', alignItems: 'center' }}> <div style={{ display: 'flex', alignItems: 'center' }}>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment