diff --git a/frontend/src/views/chat/chat-block/ChartBlock.vue b/frontend/src/views/chat/chat-block/ChartBlock.vue
index c8cf7aa6..3e1f03cb 100644
--- a/frontend/src/views/chat/chat-block/ChartBlock.vue
+++ b/frontend/src/views/chat/chat-block/ChartBlock.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { ChatMessage } from '@/api/chat.ts'
 import DisplayChartBlock from '@/views/chat/component/DisplayChartBlock.vue'
+import ChartPopover from '@/views/chat/chat-block/ChartPopover.vue'
 import { computed, ref } from 'vue'
 import { concat } from 'lodash-es'
 import type { ChartTypes } from '@/views/chat/component/BaseChart.ts'
@@ -157,11 +158,11 @@ const chartTypeList = computed(() => {
 })
 
 function changeTable() {
-  chartType.value = 'table'
-  onTypeChange()
+  onTypeChange('table')
 }
 
-function onTypeChange() {
+function onTypeChange(val: any) {
+  chartType.value = val
   chartRef.value?.onTypeChange()
 }
 
@@ -207,21 +208,13 @@ function addToDashboard() {
       <div class="buttons-bar">
         <div class="chart-select-container">
           <el-tooltip effect="dark" :content="t('chat.type')" placement="top">
-            <el-select
+            <ChartPopover
+              :chartTypeList="chartTypeList"
+              :chartType="chartType"
+              :title="t('chat.type')"
+              @typeChange="onTypeChange"
               v-if="chartTypeList.length > 0"
-              v-model="chartType"
-              class="chart-select"
-              :class="{ 'chart-active': currentChartType !== 'table' }"
-              @change="onTypeChange"
-            >
-              <el-option v-for="type in chartTypeList" :key="type.value" :value="type.value">
-                <el-icon size="16">
-                  <component :is="type.icon" />
-                </el-icon>
-                {{ type.name }}
-                &nbsp;
-              </el-option>
-            </el-select>
+            ></ChartPopover>
           </el-tooltip>
 
           <el-tooltip effect="dark" :content="t('chat.chart_type.table')" placement="top">
diff --git a/frontend/src/views/chat/chat-block/ChartPopover.vue b/frontend/src/views/chat/chat-block/ChartPopover.vue
new file mode 100644
index 00000000..532f5437
--- /dev/null
+++ b/frontend/src/views/chat/chat-block/ChartPopover.vue
@@ -0,0 +1,151 @@
+<script lang="ts" setup>
+import icon_done_outlined from '@/assets/svg/icon_done_outlined.svg'
+import { computed } from 'vue'
+import icon_expand_down_filled from '@/assets/svg/icon_down_outlined.svg'
+const props = defineProps({
+  chartTypeList: {
+    type: Array<any>,
+    default: () => [],
+  },
+  chartType: {
+    type: String,
+    default: 'table',
+  },
+  title: {
+    type: String,
+    default: '',
+  },
+})
+const currentIcon = computed(() => {
+  return props.chartTypeList.find((ele) => ele.value === props.chartType || ele.value === 'table')
+    .icon
+})
+const emits = defineEmits(['typeChange'])
+const handleDefaultChatChange = (val: any) => {
+  emits('typeChange', val.value)
+}
+</script>
+
+<template>
+  <el-popover trigger="click" popper-class="chat-type_select" placement="bottom">
+    <template #reference>
+      <div class="chat-select_type" :class="chartType && chartType !== 'table' && 'active'">
+        <component :is="currentIcon" />
+        <el-icon style="transform: scale(0.75)" class="expand" size="16">
+          <icon_expand_down_filled></icon_expand_down_filled>
+        </el-icon>
+      </div>
+    </template>
+    <div class="popover">
+      <div class="popover-content">
+        <div v-if="!!title" class="title">{{ title }}</div>
+        <div
+          v-for="ele in chartTypeList"
+          :key="ele.name"
+          class="popover-item"
+          :class="chartType === ele.value && 'isActive'"
+          @click="handleDefaultChatChange(ele)"
+        >
+          <el-icon size="16">
+            <component :is="ele.icon" />
+          </el-icon>
+          <div class="model-name">{{ ele.name }}</div>
+          <el-icon size="16" class="done">
+            <icon_done_outlined></icon_done_outlined>
+          </el-icon>
+        </div>
+      </div>
+    </div>
+  </el-popover>
+</template>
+
+<style lang="less">
+.chat-type_select.chat-type_select {
+  padding: 4px 0;
+  width: 120px !important;
+  min-width: 120px !important;
+  box-shadow: 0px 4px 8px 0px #1f23291a;
+  border: 1px solid #dee0e3;
+
+  .popover {
+    .popover-content {
+      padding: 0 4px;
+      max-height: 300px;
+      overflow-y: auto;
+
+      .title {
+        width: 100%;
+        height: 32px;
+        margin-bottom: 2px;
+        display: flex;
+        align-items: center;
+        padding-left: 8px;
+        color: #8f959e;
+      }
+    }
+    .popover-item {
+      height: 32px;
+      display: flex;
+      align-items: center;
+      padding-left: 12px;
+      padding-right: 8px;
+      margin-bottom: 2px;
+      position: relative;
+      border-radius: 4px;
+      cursor: pointer;
+      &:last-child {
+        margin-bottom: 0;
+      }
+      &:hover {
+        background: #1f23291a;
+      }
+
+      .model-name {
+        margin-left: 8px;
+        font-weight: 400;
+        font-size: 14px;
+        line-height: 22px;
+        max-width: 220px;
+      }
+
+      .done {
+        margin-left: auto;
+        display: none;
+      }
+
+      &.isActive {
+        color: var(--ed-color-primary);
+
+        .done {
+          display: block;
+        }
+      }
+    }
+  }
+}
+</style>
+
+<style lang="less" scoped>
+.chat-select_type {
+  width: 40px;
+  height: 24px;
+  border-radius: 4px;
+  padding-left: 4px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+
+  .expand {
+    margin-left: 4px;
+  }
+
+  &:hover {
+    background: #1f23291a;
+  }
+
+  &.active {
+    background: rgba(28, 186, 144, 0.1);
+    color: rgba(28, 186, 144, 1);
+  }
+}
+</style>