From f6adeb27e1c1ff7299bbf5079a5749cbcd7864de Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 八月 2023 14:39:32 +0800
Subject: [PATCH] 2023-08-03

---
 src/tabviews/custom/components/chart/antv-X6/index.jsx |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/tabviews/custom/components/chart/antv-X6/index.jsx b/src/tabviews/custom/components/chart/antv-X6/index.jsx
index dad76ed..a29bd40 100644
--- a/src/tabviews/custom/components/chart/antv-X6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/index.jsx
@@ -139,7 +139,7 @@
   {
     inherit: 'rect',
     width: 66,
-    height: 36,
+    height: 40,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -169,7 +169,7 @@
   {
     inherit: 'polygon',
     width: 66,
-    height: 36,
+    height: 40,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -199,7 +199,7 @@
   {
     inherit: 'polygon',
     width: 66,
-    height: 36,
+    height: 40,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -226,8 +226,8 @@
   'mk-circle',
   {
     inherit: 'circle',
-    width: 36,
-    height: 36,
+    width: 40,
+    height: 40,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -257,7 +257,7 @@
   {
     inherit: 'ellipse',
     width: 66,
-    height: 36,
+    height: 40,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -286,8 +286,8 @@
   'mk-star',
   {
     inherit: 'polygon',
-    width: 36,
-    height: 36,
+    width: 40,
+    height: 40,
     points: '100,10 40,198 190,78 10,78 160,198',
     attrs: {
       body: {
@@ -319,7 +319,7 @@
   {
     inherit: 'text-block',
     width: 66,
-    height: 36,
+    height: 40,
     text: '鏂囨湰鍩�',
     attrs: {
       body: {
@@ -899,6 +899,7 @@
     const r1 = graph.createNode({
       shape: 'mk-rect',
       mknode: 'start',
+      mkdata: {status: 0},
       attrs: {
         body: {
           rx: 20,
@@ -941,6 +942,20 @@
       }
     })
     const r4 = graph.createNode({
+      shape: 'mk-rect',
+      attrs: {
+        body: {
+          rx: 0,
+          ry: 0,
+          fill: '#fff7e6',
+          stroke: '#fa8c16'
+        },
+        text: {
+          text: '鑺傜偣'
+        }
+      }
+    })
+    const r5 = graph.createNode({
       shape: 'mk-polygon',
       attrs: {
         body: {
@@ -953,7 +968,7 @@
         }
       }
     })
-    const r5 = graph.createNode({
+    const r6 = graph.createNode({
       shape: 'mk-paral',
       attrs: {
         body: {
@@ -966,7 +981,7 @@
         }
       }
     })
-    const r6 = graph.createNode({
+    const r7 = graph.createNode({
       shape: 'mk-circle',
       attrs: {
         body: {
@@ -979,7 +994,7 @@
       }
     })
 
-    const r7 = graph.createNode({
+    const r8 = graph.createNode({
       shape: 'mk-rect',
       mknode: 'end',
       attrs: {
@@ -996,7 +1011,7 @@
       }
     })
     
-    stencil.load([r1, r2, r3, r4, r5, r6, r7], 'group1')
+    stencil.load([r1, r2, r3, r4, r5, r6, r7, r8], 'group1')
     
     const p1 = graph.createNode({
       shape: 'mk-ellipse',
@@ -1661,6 +1676,8 @@
         } else {
           this.selectNode.attr('line/strokeDasharray', 0)
         }
+      } else if (key === 'mkdata') {
+        this.selectNode.prop('mkdata', value)
       }
     } else if (node.shape === 'lane') {
       if (key === 'title') {
@@ -1796,12 +1813,12 @@
     const { plot, status } = this.state
 
     let _status = status === 10 ? 0 : 10
-    let nodes = this.mkGraph.toJSON()
     
     if (plot.subtype === 'xflow' && _status === 10) {
+      let nodes = this.mkGraph.toJSON()
       let start_num = nodes.cells.filter(cell => cell.mknode === 'start').length
       let end_num = nodes.cells.filter(cell => cell.mknode === 'end').length
-      
+
       if (start_num === 0) {
         notification.warning({
           top: 92,

--
Gitblit v1.8.0