From 1779677cece5864b62a65df4b01a4a69496e149a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 五月 2025 20:51:15 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/components/chart/antv-X6/index.jsx |  175 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 92 insertions(+), 83 deletions(-)

diff --git a/src/tabviews/custom/components/chart/antv-X6/index.jsx b/src/tabviews/custom/components/chart/antv-X6/index.jsx
index a1df8cf..ecedc25 100644
--- a/src/tabviews/custom/components/chart/antv-X6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/index.jsx
@@ -138,8 +138,8 @@
   'mk-rect',
   {
     inherit: 'rect',
-    width: 66,
-    height: 40,
+    width: 100,
+    height: 32,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -168,8 +168,8 @@
   'mk-polygon',
   {
     inherit: 'polygon',
-    width: 66,
-    height: 40,
+    width: 100,
+    height: 32,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -198,8 +198,8 @@
   'mk-paral',
   {
     inherit: 'polygon',
-    width: 66,
-    height: 40,
+    width: 100,
+    height: 32,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -256,8 +256,8 @@
   'mk-ellipse',
   {
     inherit: 'ellipse',
-    width: 66,
-    height: 40,
+    width: 100,
+    height: 32,
     attrs: {
       body: {
         strokeWidth: 1,
@@ -318,8 +318,8 @@
   'mk-text',
   {
     inherit: 'text-block',
-    width: 66,
-    height: 40,
+    width: 100,
+    height: 50,
     text: '鏂囨湰鍩�',
     attrs: {
       body: {
@@ -900,18 +900,18 @@
     const stencil = new Stencil({
       title: '娴佺▼鍥�',
       target: graph,
-      stencilGraphWidth: 180,
+      stencilGraphWidth: 230,
       stencilGraphHeight: 180,
       groups: [
         {
           title: '閫氱敤鑺傜偣',
           name: 'group1',
-          graphHeight: 240
+          graphHeight: 150
         },
         {
           title: '鑷畾涔�',
           name: 'group2',
-          graphHeight: 150,
+          graphHeight: 300,
           layoutOptions: {
             rowHeight: 70
           }
@@ -919,7 +919,7 @@
       ],
       layoutOptions: {
         columns: 2,
-        columnWidth: 80,
+        columnWidth: 110,
         rowHeight: 55
       }
     })
@@ -1055,10 +1055,10 @@
       mkdata: {status: 0, statusName: '鏈彁浜�'},
       attrs: {
         body: {
-          rx: 20,
-          ry: 26,
-          fill: '#52c41a',
-          stroke: '#52c41a'
+          rx: 0,
+          ry: 0,
+          fill: '#000000',
+          stroke: '#000000'
         },
         text: {
           fill: '#ffffff',
@@ -1066,83 +1066,34 @@
         }
       }
     })
-    const r2 = graph.createNode({
-      shape: 'mk-rect',
-      attrs: {
-        body: {
-          rx: 20,
-          ry: 26,
-          fill: '#e6f4ff',
-          stroke: '#1890ff'
-        },
-        text: {
-          text: '杩囩▼'
-        }
-      }
-    })
-    const r3 = graph.createNode({
-      shape: 'mk-rect',
-      attrs: {
-        body: {
-          rx: 6,
-          ry: 6,
-          fill: '#fff7e6',
-          stroke: '#fa8c16'
-        },
-        text: {
-          text: '鍙�夎繃绋�'
-        }
-      }
-    })
+    
     const r4 = graph.createNode({
       shape: 'mk-rect',
       attrs: {
         body: {
           rx: 0,
           ry: 0,
-          fill: '#fff7e6',
-          stroke: '#fa8c16'
+          fill: '#ffffff',
+          stroke: '#757575'
         },
         text: {
+          fill: '#000000',
           text: '鑺傜偣'
         }
       }
     })
+
     const r5 = graph.createNode({
       shape: 'mk-polygon',
       attrs: {
         body: {
           refPoints: '0,10 10,0 20,10 10,20',
-          fill: '#f9f0ff',
-          stroke: '#722ed1'
+          fill: '#ffffff',
+          stroke: '#757575'
         },
         text: {
+          fill: '#000000',
           text: '鍐崇瓥'
-        }
-      }
-    })
-    const r6 = graph.createNode({
-      shape: 'mk-paral',
-      attrs: {
-        body: {
-          refPoints: '10,0 40,0 30,20 0,20',
-          fill: '#e6fffb',
-          stroke: '#13c2c2'
-        },
-        text: {
-          text: '鏁版嵁'
-        }
-      }
-    })
-    const r7 = graph.createNode({
-      shape: 'mk-circle',
-      attrs: {
-        body: {
-          fill: '#e6f4ff',
-          stroke: '#1890ff'
-        },
-        text: {
-          text: '杩炴帴'
         }
       }
     })
@@ -1153,10 +1104,10 @@
       mkdata: {status: 888, statusName: '宸插畬鎴�'},
       attrs: {
         body: {
-          rx: 20,
-          ry: 26,
-          fill: '#fa8c16',
-          stroke: '#fa8c16'
+          rx: 0,
+          ry: 0,
+          fill: '#000000',
+          stroke: '#000000'
         },
         text: {
           fill: '#ffffff',
@@ -1165,7 +1116,65 @@
       }
     })
     
-    stencil.load([r1, r2, r3, r4, r5, r6, r7, r8], 'group1')
+    stencil.load([r1, r4, r5, r8], 'group1')
+    
+    const r2 = graph.createNode({
+      shape: 'mk-rect',
+      attrs: {
+        body: {
+          rx: 20,
+          ry: 26,
+          fill: '#ffffff',
+          stroke: '#757575'
+        },
+        text: {
+          fill: '#000000',
+          text: '杩囩▼'
+        }
+      }
+    })
+    const r3 = graph.createNode({
+      shape: 'mk-rect',
+      attrs: {
+        body: {
+          rx: 6,
+          ry: 6,
+          fill: '#ffffff',
+          stroke: '#757575'
+        },
+        text: {
+          fill: '#000000',
+          text: '鍙�夎繃绋�'
+        }
+      }
+    })
+    const r6 = graph.createNode({
+      shape: 'mk-paral',
+      attrs: {
+        body: {
+          refPoints: '10,0 40,0 30,20 0,20',
+          fill: '#ffffff',
+          stroke: '#757575'
+        },
+        text: {
+          fill: '#000000',
+          text: '鏁版嵁'
+        }
+      }
+    })
+    const r7 = graph.createNode({
+      shape: 'mk-circle',
+      attrs: {
+        body: {
+          fill: '#ffffff',
+          stroke: '#757575'
+        },
+        text: {
+          fill: '#000000',
+          text: '杩炴帴'
+        }
+      }
+    })
     
     const p1 = graph.createNode({
       shape: 'mk-ellipse',
@@ -1180,7 +1189,7 @@
       shape: 'mk-text'
     })
     
-    stencil.load([p1, p2, p3], 'group2')
+    stencil.load([r2, r3, r6, r7, p1, p2, p3], 'group2')
 
     if (this.cells.length > 0) {
       let cells = []
@@ -1299,7 +1308,7 @@
     const stencil = new Stencil({
       title: '娴佺▼鍥�',
       target: graph,
-      stencilGraphWidth: 180,
+      stencilGraphWidth: 230,
       stencilGraphHeight: 180,
       groups: [
         {
@@ -1325,7 +1334,7 @@
       ],
       layoutOptions: {
         columns: 2,
-        columnWidth: 80,
+        columnWidth: 110,
         rowHeight: 55
       }
     })

--
Gitblit v1.8.0