diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
index 4d79b53bbe..ed6085ecc3 100644
--- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
+++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
@@ -877,12 +877,11 @@ public class ChartDataBuild {
 
     // 表格
     public static Map<String, Object> transTableNormal(Map<String, List<ChartViewFieldDTO>> fieldMap, ChartViewWithBLOBs view, List<String[]> data, List<String> desensitizationList) {
-        // List<ChartViewFieldDTO> fields = fieldMap.entrySet().stream().map(Map.Entry::getValue).flatMap(List::stream).collect(Collectors.toList());
-        // 上面乱序了
+        
         List<ChartViewFieldDTO> fields = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(fieldMap.get("xAxis")))fields.addAll(fieldMap.get("xAxis"));
-        if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis")))fields.addAll(fieldMap.get("labelAxis"));
         if (CollectionUtils.isNotEmpty(fieldMap.get("tooltipAxis")))fields.addAll(fieldMap.get("tooltipAxis"));
+        if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis")))fields.addAll(fieldMap.get("labelAxis"));
         if (CollectionUtils.isNotEmpty(fieldMap.get("yAxis")))fields.addAll(fieldMap.get("yAxis"));
         return transTableNormal(fields, view, data, desensitizationList);
     }
diff --git a/frontend/src/components/business/DeLayoutContent.vue b/frontend/src/components/business/DeLayoutContent.vue
index 39a0daa9fa..e38271e634 100644
--- a/frontend/src/components/business/DeLayoutContent.vue
+++ b/frontend/src/components/business/DeLayoutContent.vue
@@ -49,7 +49,7 @@ export default {
   border-radius: 4px;
   box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 14%);
   box-sizing: border-box;
-  background: #f5f6f7;
+  background-color: var(--MainBG,#f5f6f7);
   overflow: hidden;
   padding: 24px 24px 24px 24px;
   height: 100%;
@@ -61,14 +61,14 @@ export default {
     font-weight: 500;
     line-height: 28px;
     text-align: left;
-    color: #1F2329;
+    color: var(--TextPrimary, #1F2329);
     width: 100%;
     margin: 0;
   }
   .container-wrapper {
     width: 100%;
     overflow: auto;
-    background: #fff;
+    background-color: var(--ContentBG, #FFFFFF);
     margin-top: 24px;
     padding: 24px;
     flex: 1;
diff --git a/frontend/src/views/panel/templateMarket/component/MarketPreview.vue b/frontend/src/views/panel/templateMarket/component/MarketPreview.vue
index c15ba178da..6cee4cf5b8 100644
--- a/frontend/src/views/panel/templateMarket/component/MarketPreview.vue
+++ b/frontend/src/views/panel/templateMarket/component/MarketPreview.vue
@@ -303,7 +303,7 @@ export default {
   height: calc(100vh - 56px);
   overflow-x: hidden;
   overflow-y: auto;
-  background: #fff;
+  background-color: var(--ContentBG,#ffffff);
 }
 
 .aside-inActive{
@@ -337,6 +337,7 @@ export default {
   font-weight: 500;
   font-size: 16px;
   line-height: 24px;
+  color: var(--TextPrimary, #1F2329);
 }
 
 .insert-filter {
@@ -403,6 +404,7 @@ export default {
   font-size: 20px;
   line-height: 28px;
   margin-bottom: 24px;
+  color: var(--TextPrimary, #1F2329);
 }
 
 .margin-top16 {
diff --git a/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue b/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue
index 333334b857..d355433757 100644
--- a/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue
+++ b/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue
@@ -88,6 +88,7 @@ export default {
     white-space:nowrap;
     overflow:hidden;
     text-overflow:ellipsis;
+    color: var(--TextPrimary, #1F2329);
   }
 
   .template-img {
diff --git a/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue b/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue
index 8ae016594f..294978e7de 100644
--- a/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue
+++ b/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue
@@ -67,7 +67,7 @@ export default {
     box-sizing: border-box;
     width: 182px;
     height: 116px;
-    background: #ffffff;
+    background-color: var(--ContentBG,#ffffff);
     border: 1px solid #DEE0E3 ;
     border-radius: 4px;
     flex: none;
diff --git a/frontend/src/views/panel/templateMarket/index.vue b/frontend/src/views/panel/templateMarket/index.vue
index 6e34c31f9f..573666d355 100644
--- a/frontend/src/views/panel/templateMarket/index.vue
+++ b/frontend/src/views/panel/templateMarket/index.vue
@@ -158,7 +158,7 @@ export default {
       _this.$nextTick(() => {
         const curSeparator = Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)
         _this.templateSpan = (100 / Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)) + '%'
-        _this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 32
+        _this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 33
       })
     })
   },
@@ -266,7 +266,7 @@ export default {
     height: calc(100vh - 190px)!important;
     overflow-x: hidden;
     overflow-y: auto;
-    background: #fff ;
+    background-color: var(--ContentBG,#ffffff);
   }
   .market-main{
     padding:24px
@@ -276,6 +276,7 @@ export default {
     font-size: 20px;
     font-weight: 500;
     line-height: 28px;
+    color: var(--TextPrimary, #1F2329);
   }
   .title-right{
     float: right;
@@ -322,7 +323,7 @@ export default {
   .outer-body{
     width: 100%;
     height: calc(100vh - 56px);
-    background: #f5f6f7;
+    background-color: var(--MainBG,#f5f6f7);
   }
 
   .market-dialog-css{
diff --git a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue
index 203da13b9b..b54f537ec1 100644
--- a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue
+++ b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue
@@ -100,7 +100,7 @@ export default {
 
     filterNode(value, data) {
       if (!value) return true
-      return data.label.indexOf(value) !== -1
+      return data.name.indexOf(value) !== -1
     },
 
     nodeClick(data, node) {
diff --git a/frontend/src/views/system/user/filterUser.vue b/frontend/src/views/system/user/filterUser.vue
index 16a89a77d6..8dec097357 100644
--- a/frontend/src/views/system/user/filterUser.vue
+++ b/frontend/src/views/system/user/filterUser.vue
@@ -421,8 +421,8 @@ export default {
   }
 }
 .user-popper {
-  background: transparent;
   padding: 0;
+  background: #fff;
   .popper__arrow {
     display: none;
   }