diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
index 0187291200..73b5430084 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java
@@ -442,6 +442,8 @@ public class ChartViewManege {
         dto.setFlowMapStartName(JsonUtil.parseList(record.getFlowMapStartName(), tokenType));
         dto.setFlowMapEndName(JsonUtil.parseList(record.getFlowMapEndName(), tokenType));
         dto.setExtColor(JsonUtil.parseList(record.getExtColor(), tokenType));
+        dto.setSortPriority(JsonUtil.parseList(record.getSortPriority(), new TypeReference<List<SortAxis>>() {
+        }));
 
         return dto;
 
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
index 72546e08d2..e4a3d29e0e 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
@@ -76,6 +76,11 @@ const props = defineProps({
     type: String,
     required: false,
     default: 'inherit'
+  },
+  active: {
+    type: Boolean,
+    required: false,
+    default: true
   }
 })
 
@@ -779,6 +784,15 @@ onMounted(() => {
   useEmitt({ name: 'l7-prepare-picture', callback: preparePicture })
   useEmitt({ name: 'l7-unprepare-picture', callback: unPreparePicture })
 })
+const MAP_CHARTS = ['map', 'bubble-map', 'flow-map', 'heat-map', 'symbolic-map']
+const onWheel = (e: WheelEvent) => {
+  if (!MAP_CHARTS.includes(view.value.type)) {
+    return
+  }
+  if (!props.active) {
+    e.stopPropagation()
+  }
+}
 onBeforeUnmount(() => {
   try {
     myChart?.destroy()
@@ -801,7 +815,13 @@ onBeforeUnmount(() => {
       :style="state.trackBarStyle"
       @trackClick="trackClick"
     />
-    <div v-if="!isError" ref="chartContainer" class="canvas-content" :id="containerId"></div>
+    <div
+      @wheel.capture="onWheel"
+      v-if="!isError"
+      ref="chartContainer"
+      class="canvas-content"
+      :id="containerId"
+    ></div>
     <chart-error v-else :err-msg="errMsg" />
   </div>
 </template>
diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index e15a64b805..4e97ad49d0 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -1190,6 +1190,7 @@ const clearG2Tooltip = () => {
         :element="element"
         :suffixId="suffixId"
         :font-family="fontFamily"
+        :active="active"
         v-else-if="
           showChartView(ChartLibraryType.G2_PLOT, ChartLibraryType.L7_PLOT, ChartLibraryType.L7)
         "