From 735955be17afba088e389c85ad36145656b3d750 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 12 五月 2024 23:03:00 +0800
Subject: [PATCH] 2024-05-12
---
src/tabviews/custom/components/chart/antv-X6/index.jsx | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-X6/index.jsx b/src/tabviews/custom/components/chart/antv-X6/index.jsx
index 08990ce..83d89e4 100644
--- a/src/tabviews/custom/components/chart/antv-X6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/index.jsx
@@ -1035,7 +1035,9 @@
let mkdata = target.prop('mkdata')
- if (target.prop('mknode') === 'end') {
+ if (source.prop('mknode') === 'start' && target.prop('mknode') === 'end') {
+ edge.prop('mknode', 'throughEdge')
+ } else if (target.prop('mknode') === 'end') {
edge.prop('mknode', 'endEdge')
} else if (target.prop('mknode') === 'start') {
edge.prop('mknode', 'startEdge')
@@ -1623,7 +1625,13 @@
} else if (item.mknode === 'end') {
end_num++
} else if (item.shape === 'edge') {
- if (item.mknode !== 'endEdge' && item.mknode !== 'startEdge' && (!item.mkdata.members || item.mkdata.members.length === 0)) {
+ if (item.mknode === 'throughEdge') {
+ if (!item.mkdata.seniorbers || item.mkdata.seniorbers.length === 0) {
+ unvalid = true
+ }
+ } else if (item.mkdata.seniorCondition === 'open') {
+
+ } else if (item.mknode !== 'endEdge' && item.mknode !== 'startEdge' && (!item.mkdata.members || item.mkdata.members.length === 0)) {
unvalid = true
} else if (item.mknode === 'startEdge' || item.mkdata.flowType === 'reject') {
if (map.has(item.source.cell)) {
@@ -2091,7 +2099,13 @@
} else if (item.mknode === 'end') {
end_num++
} else if (item.shape === 'edge' && !unvalidId && !rejectId && !approvalId) {
- if (item.mknode !== 'endEdge' && item.mknode !== 'startEdge' && (!item.mkdata.members || item.mkdata.members.length === 0)) {
+ if (item.mknode === 'throughEdge') {
+ if (!item.mkdata.seniorbers || item.mkdata.seniorbers.length === 0) {
+ unvalidId = item.id
+ }
+ } else if (item.mkdata.seniorCondition === 'open') {
+
+ } else if (item.mknode !== 'endEdge' && item.mknode !== 'startEdge' && (!item.mkdata.members || item.mkdata.members.length === 0)) {
unvalidId = item.id
} else if (item.mknode === 'startEdge' || item.mkdata.flowType === 'reject') {
if (map.has(item.source.cell)) {
--
Gitblit v1.8.0