From 3eef57e11ee93e2e412456badb0ebc36ba251f55 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 14 Jul 2021 17:13:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20chart=20Diagra?=
 =?UTF-8?q?m=20=E5=9F=BA=E6=9C=AC=E5=9B=BE=E5=BD=A2=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=9A=84=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/ChartDiagram/diagram.vue           | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index 3a7378b4c..f6c6d9ddc 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -405,6 +405,26 @@ export default {
                 iconName: 'nz-icon-EMAC1',
                 iconColor: '#0c62e3'
               }
+            },
+            {
+              name: 'rectangle2',
+              icon: 'icon-rect',
+              data: {
+                text: 'rect',
+                rect: {
+                  width: 100,
+                  height: 100
+                },
+                paddingLeft: 10,
+                paddingRight: 10,
+                paddingTop: 10,
+                paddingBottom: 10,
+                name: 'rectangleImg2',
+                icon: '\ue62f',
+                iconFamily: 'nz-icon',
+                iconName: 'nz-icon-circle',
+                iconColor: '#0c62e3'
+              }
             }
           ]
         }
@@ -884,6 +904,7 @@ export default {
           const selLevel = pen.data.valueMapping.find(item => item.level === maxLevel)
           if (selLevel) {
             pen.fontColor = selLevel.color.text
+            pen.fillStyle = selLevel.color.fill
             if (pen.iconFamily) {
               pen.fillStyle = 'transparent'
               pen.iconColor = selLevel.color.fill
@@ -1675,6 +1696,26 @@ export default {
                   iconName: 'nz-icon-EMAC1',
                   iconColor: '#0c62e3'
                 }
+              },
+              {
+                name: 'rectangle2',
+                icon: 'icon-rect',
+                data: {
+                  text: 'rect',
+                  rect: {
+                    width: 100,
+                    height: 100
+                  },
+                  paddingLeft: 10,
+                  paddingRight: 10,
+                  paddingTop: 10,
+                  paddingBottom: 10,
+                  name: 'rectangleImg2',
+                  icon: '\ue62f',
+                  iconFamily: 'nz-icon',
+                  iconName: 'nz-icon-circle',
+                  iconColor: '#0c62e3'
+                }
               }
             ]
           }]