diff --git a/src/views/Editor/CanvasTool/ShapeItemThumbnail.vue b/src/views/Editor/CanvasTool/ShapeItemThumbnail.vue
new file mode 100644
index 00000000..4d897c9e
--- /dev/null
+++ b/src/views/Editor/CanvasTool/ShapeItemThumbnail.vue
@@ -0,0 +1,66 @@
+<template>
+  <div class="shape-item-thumbnail">
+    <div class="shape-content">
+      <svg 
+        overflow="visible" 
+        width="18"
+        height="18"
+      >
+        <g 
+          :transform="`scale(${18 / shape.viewBox[0]}, ${18 / shape.viewBox[1]}) translate(0,0) matrix(1,0,0,1,0,0)`"
+        >
+          <path 
+            class="shape-path"
+            :class="{ 'outlined': shape.outlined }"
+            vector-effect="non-scaling-stroke" 
+            stroke-linecap="butt" 
+            stroke-miterlimit="8"
+            :fill="shape.outlined ? '#999' : 'transparent'"
+            :stroke="shape.outlined ? 'transparent' : '#999'"
+            stroke-width="2" 
+            :d="shape.path"
+          ></path>
+        </g>
+      </svg>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { PropType } from 'vue'
+import { ShapePoolItem } from '@/configs/shapes'
+
+defineProps({
+  shape: {
+    type: Object as PropType<ShapePoolItem>,
+    required: true,
+  },
+})
+</script>
+
+<style lang="scss" scoped>
+.shape-item-thumbnail {
+  position: relative;
+  cursor: pointer;
+}
+.shape-content {
+  @include absolute-0();
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  &:hover .shape-path {
+    &:not(.outlined) {
+      stroke: $themeColor;
+    }
+    &.outlined {
+      fill: $themeColor;
+    }
+  }
+
+  svg:not(:root) {
+    overflow: visible;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Editor/CanvasTool/ShapePool.vue b/src/views/Editor/CanvasTool/ShapePool.vue
index 66a53364..19169857 100644
--- a/src/views/Editor/CanvasTool/ShapePool.vue
+++ b/src/views/Editor/CanvasTool/ShapePool.vue
@@ -3,31 +3,13 @@
     <div class="category" v-for="item in SHAPE_LIST" :key="item.type">
       <div class="category-name">{{item.type}}</div>
       <div class="shape-list">
-        <div class="shape-item" v-for="(shape, index) in item.children" :key="index">
-          <div class="shape-content" @click="selectShape(shape)">
-            <svg 
-              overflow="visible" 
-              width="18"
-              height="18"
-            >
-              <g 
-                :transform="`scale(${18 / shape.viewBox[0]}, ${18 / shape.viewBox[1]}) translate(0,0) matrix(1,0,0,1,0,0)`"
-              >
-                <path 
-                  class="shape-path"
-                  :class="{ 'outlined': shape.outlined }"
-                  vector-effect="non-scaling-stroke" 
-                  stroke-linecap="butt" 
-                  stroke-miterlimit="8"
-                  :fill="shape.outlined ? '#999' : 'transparent'"
-                  :stroke="shape.outlined ? 'transparent' : '#999'"
-                  stroke-width="2" 
-                  :d="shape.path"
-                ></path>
-              </g>
-            </svg>
-          </div>
-        </div>
+        <ShapeItemThumbnail 
+          class="shape-item"
+          v-for="(shape, index) in item.children" 
+          :key="index" 
+          :shape="shape" 
+          @click="selectShape(shape)"
+        />
       </div>
     </div>
   </div>
@@ -35,6 +17,7 @@
 
 <script lang="ts" setup>
 import { SHAPE_LIST, ShapePoolItem } from '@/configs/shapes'
+import ShapeItemThumbnail from './ShapeItemThumbnail.vue'
 
 const emit = defineEmits<{
   (event: 'select', payload: ShapePoolItem): void
@@ -75,27 +58,5 @@ const selectShape = (shape: ShapePoolItem) => {
   height: 0;
   padding-bottom: 8%;
   flex-shrink: 0;
-  position: relative;
-  cursor: pointer;
-}
-.shape-content {
-  @include absolute-0();
-
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  &:hover .shape-path {
-    &:not(.outlined) {
-      stroke: $themeColor;
-    }
-    &.outlined {
-      fill: $themeColor;
-    }
-  }
-
-  svg:not(:root) {
-    overflow: visible;
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue
index b6f0bba0..11b25b40 100644
--- a/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue
+++ b/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue
@@ -1,5 +1,23 @@
 <template>
   <div class="shape-style-panel">
+    <div class="title">
+      <span>点击替换形状</span>
+      <IconDown />
+    </div>
+    <div class="shape-pool">
+      <div class="category" v-for="item in SHAPE_LIST" :key="item.type">
+        <div class="shape-list">
+          <ShapeItemThumbnail 
+            class="shape-item"
+            v-for="(shape, index) in item.children" 
+            :key="index" 
+            :shape="shape"
+            @click="changeShape(shape)"
+          />
+        </div>
+      </div>
+    </div>
+
     <div class="row">
       <Select 
         style="flex: 10;" 
@@ -69,6 +87,7 @@
     </template>
 
     <ElementFlip />
+
     <Divider />
 
     <template v-if="handleShapeElement.text?.content">
@@ -245,6 +264,7 @@ import { storeToRefs } from 'pinia'
 import { useMainStore, useSlidesStore } from '@/store'
 import { PPTShapeElement, ShapeGradient, ShapeText } from '@/types/slides'
 import { WEB_FONTS } from '@/configs/font'
+import { ShapePoolItem, SHAPE_LIST, SHAPE_PATH_FORMULAS } from '@/configs/shapes'
 import emitter, { EmitterEvents } from '@/utils/emitter'
 import useHistorySnapshot from '@/hooks/useHistorySnapshot'
 import useTextFormatPainter from '@/hooks/useTextFormatPainter'
@@ -258,6 +278,7 @@ import TextColorButton from '../common/TextColorButton.vue'
 import CheckboxButton from '@/components/CheckboxButton.vue'
 import CheckboxButtonGroup from '@/components/CheckboxButtonGroup.vue'
 import ColorPicker from '@/components/ColorPicker/index.vue'
+import ShapeItemThumbnail from '@/views/Editor/CanvasTool/ShapeItemThumbnail.vue'
 import {
   Divider,
   Button,
@@ -326,6 +347,32 @@ const updateFill = (value: string) => {
   updateElement({ fill: value })
 }
 
+// 修改形状
+const changeShape = (shape: ShapePoolItem) => {
+  const { width, height } = handleElement.value as PPTShapeElement
+  const props: Partial<PPTShapeElement> = {
+    viewBox: shape.viewBox,
+    path: shape.path,
+    special: shape.special,
+  }
+  if (shape.pathFormula) {
+    props.pathFormula = shape.pathFormula
+    props.viewBox = [width, height]
+
+    const pathFormula = SHAPE_PATH_FORMULAS[shape.pathFormula]
+    if ('editable' in pathFormula) {
+      props.path = pathFormula.formula(width, height, pathFormula.defaultValue)
+      props.keypoint = pathFormula.defaultValue
+    }
+    else props.path = pathFormula.formula(width, height)
+  }
+  else {
+    props.pathFormula = undefined
+    props.keypoint = undefined
+  }
+  updateElement(props)
+}
+
 const updateTextAlign = (align: 'top' | 'middle' | 'bottom') => {
   const _handleElement = handleElement.value as PPTShapeElement
   
@@ -366,4 +413,28 @@ const emitRichTextCommand = (command: string, value?: string) => {
 .slider {
   flex: 3;
 }
+.title {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+.shape-pool {
+  width: 235px;
+  height: 190px;
+  overflow: auto;
+  padding: 5px;
+  padding-right: 10px;
+  border: 1px solid $borderColor;
+  margin-bottom: 20px;
+}
+.shape-list {
+  @include flex-grid-layout();
+}
+.shape-item {
+  @include flex-grid-layout-children(6, 14%);
+
+  height: 0;
+  padding-bottom: 14%;
+  flex-shrink: 0;
+}
 </style>
\ No newline at end of file