From 2d3f5de03e114f979bb2e8925cc2e53587f77cd2 Mon Sep 17 00:00:00 2001
From: dengchao <754083046@qq.com>
Date: Fri, 12 May 2023 15:27:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E7=BA=BF=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../workFlowComponents/FlowChartRt.jsx | 33 ++++++++++---------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx b/src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx
index 6c762595..9509f3ca 100644
--- a/src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx
+++ b/src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/FlowChartRt.jsx
@@ -79,16 +79,16 @@ const FlowChart = props => {
}, [treeVisible]);
// // 鐩戝惉鍒犻櫎锛岀粰鍒犻櫎鏁扮粍閲屾坊鍔犲垹闄d
- // useEffect(() => {
- // if (deleteLine) {
- // setDeleteLines([...DeleteLines, deleteLine]);
- // }
- // }, [deleteLine]);
- // useEffect(() => {
- // if (deleteNode) {
- // setDeleteNodes([...DeleteNodes, deleteNode]);
- // }
- // }, [deleteNode]);
+ useEffect(() => {
+ if (deleteLine) {
+ setDeleteLines([...DeleteLines, ...deleteLine]);
+ }
+ }, [deleteLine]);
+ useEffect(() => {
+ if (deleteNode) {
+ setDeleteNodes([...DeleteNodes, ...deleteNode]);
+ }
+ }, [deleteNode]);
// 鍒濆鍖�
useEffect(() => {
// 鍒濆鍖栨祦绋嬪浘
@@ -339,17 +339,20 @@ const FlowChart = props => {
};
// 鍒犻櫎鑺傜偣
const delNode = (delNodeIds, delNodes, delLinks) => {
+ console.log(delNodeIds, delNodes, delLinks);
setShowLeaveTip(true);
if (delNodes.length === 0) {
- setDeleteLines([...DeleteLines, ...delLinks]);
+ console.log(DeleteLines, [...DeleteLines, ...delLinks], '[...DeleteLines, ...delLinks]');
+ setDeleteLine(delLinks);
diagram.commandHandler.deleteSelection();
return;
}
DeleteFlowNodes({ ActivityIds: delNodes, LineIds: delLinks }).then(res => {
if (res.code === 0) {
diagram.commandHandler.deleteSelection();
- setDeleteNodes([...DeleteNodes, ...delNodeIds]);
- setDeleteLines([...DeleteLines, ...delLinks]);
+
+ setDeleteNode(delNodeIds);
+ setDeleteLine(delLinks);
message.success('鍒犻櫎鎴愬姛');
} else {
// message.error(res.msg);
@@ -1198,8 +1201,8 @@ const FlowChart = props => {
setDeleteNodes([]);
setDeleteLines([]);
setAddNodes([]);
- setDeleteNode('');
- setDeleteLine('');
+ setDeleteNode([]);
+ setDeleteLine([]);
getFlowData();
message.success('淇濆瓨鎴愬姛');
} else {
--
2.17.1