diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss
index bdbec2d71..d3cc6a350 100644
--- a/nezha-fronted/src/assets/css/components/chart/chart.scss
+++ b/nezha-fronted/src/assets/css/components/chart/chart.scss
@@ -400,6 +400,7 @@
     cursor: pointer;
     display: inline-block;
     line-height: 20px;
+    color: $--color-text-regular;
   }
   .legend-item, .legend--table-row {
     &.legend-item--inactive, &.row--inactive {
@@ -715,4 +716,4 @@
     color: $--color-text-primary;
     transition: all 0.7s;
   }
-}
\ No newline at end of file
+}
diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/topoTooltip.scss b/nezha-fronted/src/assets/css/components/common/project/L5/topoTooltip.scss
index 2ae3351c4..4e7df02ee 100644
--- a/nezha-fronted/src/assets/css/components/common/project/L5/topoTooltip.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/L5/topoTooltip.scss
@@ -8,7 +8,9 @@
   height: 100%;
   box-sizing: border-box;
   border: 1px solid $--border-color-light;
-
+  .tooltip-box-title {
+    color: $--color-text-primary
+  }
   .tooltip-box-chart {
     max-height: 400px;
     min-height: 200px;
diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss b/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss
index cb72830d4..e6b5d27ac 100644
--- a/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss
@@ -29,15 +29,17 @@
 
   .top-tool-item {
     cursor: pointer;
-    background: $--background-color-empty;
-    border: 1px solid $--border-color-base;
+    background: $--background-color-base;
+    border: 1px solid $--border-color-light;
     border-radius: 2px;
     padding: 8px 11px;
     line-height: 14px;
     margin-right: 10px;
   }
   .is-active-meta2d.top-tool-item {
-    background: $--background-color-disabled;
+    background: mix(#FFF, $--background-color-disabled, 35%);
+    border: 1px solid mix(#000, $--background-color-disabled, 35%);
+    color: $--color-text-disabled;
   }
   .top-tool-item-scale {
     margin-left: 40px;
diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss
index eccda1174..34ea3bc76 100644
--- a/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss
@@ -3,6 +3,9 @@
   box-sizing: border-box;
   padding: 14px 20px 14px 10px;
   display: flex;
+  > div {
+    color: $--color-text-primary
+  }
   .tools-left{
     display: flex;
   }
diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss
index 83b9e1949..3fe331164 100644
--- a/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss
@@ -13,6 +13,7 @@
     background: $--background-color-empty;
   }
   .form-row-item{
+    color: $--color-text-primary;
     vertical-align: top;
     width: calc(50% - 3px);
     display: inline-block;
diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss
index ece50d853..b456dfea9 100644
--- a/nezha-fronted/src/assets/css/themes/theme-light.scss
+++ b/nezha-fronted/src/assets/css/themes/theme-light.scss
@@ -52,7 +52,7 @@ $--border-color-base: #DEDEDE;
 // 普通边框色focus
 $--border-color-base-focus: #C7C7C7;
 // 浅边框色(覆盖element-ui内置变量)
-$--border-color-light: #E7EAED;
+$--border-color-light: #e7eaed;
 // 浅边框色hover
 $--border-color-light-hover: darken($--border-color-light, 10%);
 // 浅边框色focus
diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
index 1912d2859..a83c77295 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
@@ -218,6 +218,7 @@ export default {
         this.timer3 = null
       }
       this.position.show = false
+      console.log(pen)
       if (!pen.type && pen.data.enable.tooltip) {
         if (!pen.data.tooltip.legends.length) {
           return
diff --git a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
index 416bfcd18..3d306b25b 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
@@ -9,6 +9,7 @@ export default {
       getTopology(id).resize()
     },
     initEdit (id) {
+      bus.$emit('changeSelectPens', [])
       getTopology(id).lock(0)
       getTopology(id).stopAnimate()
       if (getTopology(id).data().pens) {
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue
index bd5e8f3f7..f9e27eec9 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="tooltip-box" style="width: 400px;height: 300px;display: flex;flex-direction: column">
-    <div v-if="params.titleShow && params.title" style="margin-bottom: 5px">{{params.title}}</div>
+    <div v-if="params.titleShow && params.title" style="margin-bottom: 5px" class="tooltip-box-title">{{params.title}}</div>
 
     <div
       v-if="params.chartType === 'text'"
diff --git a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
index 5aeb733c6..8b0b07bbd 100644
--- a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
@@ -227,13 +227,13 @@ export default {
     undo () { // 撤销
       getTopology(this.meta2dId).undo()
       // getTopology(this.meta2dId).inactive()
-      // bus.$emit('changeSelectPens', [])
+      bus.$emit('changeSelectPens', [])
     },
     redo () { // 重做
       getTopology(this.meta2dId).redo()
       // getTopology(this.meta2dId).render()
       // getTopology(this.meta2dId).inactive()
-      // bus.$emit('changeSelectPens', [])
+      bus.$emit('changeSelectPens', [])
     },
     centerView () { // 居中显示
       getTopology(this.meta2dId).centerView()