From 470fbb1a61d3c774242fb70802288bf922fe515e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 16 Dec 2021 20:05:20 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E6=B7=BB=E5=8A=A0=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/chart/chart.scss       |  2 +-
 .../src/components/chart/chart/chartMap.vue          |  5 +++--
 .../common/rightBox/chart/otherChartConfig.vue       | 12 ++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss
index b784e7869..d0054827f 100644
--- a/nezha-fronted/src/assets/css/components/chart/chart.scss
+++ b/nezha-fronted/src/assets/css/components/chart/chart.scss
@@ -335,7 +335,7 @@
     word-break: break-all;
     border-radius: 2px;
     box-sizing: border-box;
-    border: 2px solid #fff;
+    border: 2px solid $--border-color-light;
     overflow: hidden;
   }
 }
diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue
index 7adfd1d93..ba8eeaeba 100644
--- a/nezha-fronted/src/components/chart/chart/chartMap.vue
+++ b/nezha-fronted/src/components/chart/chart/chartMap.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="overview">
     <div class="content-col-content">
-      <div id="map" style="height: 100%; width: 100%"></div>
+      <div id="map" style="height: 100%; width: 100%" :style="theme=='light'? '': ' filter: invert(1) hue-rotate(0.5turn);opacity: 0.75;'"></div>
     </div>
     <!--自定义地图鼠标悬浮提示dom，避免被overflow：hidden裁剪-->
     <div :style="{'left': `${tooltip.x}px`, 'top': `${tooltip.y}px`}" class="my-pane"></div>
@@ -32,7 +32,8 @@ export default {
       tooltip: {
         x: 0,
         y: 0
-      }
+      },
+      theme: localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`)
     }
   },
   mounted () {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
index 2551b3160..08538b615 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -165,6 +165,18 @@ export default {
         {
           id: 'group',
           name: this.$t('dashboard.panel.chartForm.typeVal.group.label')
+        },
+        {
+          id: 'map',
+          name: this.$t('dashboard.panel.chartForm.typeVal.map.label')
+        },
+        {
+          id: 'carousel',
+          name: this.$t('dashboard.panel.chartForm.typeVal.carousel.label')
+        },
+        {
+          id: 'hexagonFigure',
+          name: this.$t('dashboard.panel.chartForm.typeVal.hexagonFigure.label')
         }
       ]
     }