diff --git a/frontend/src/components/TaskContentEditor/index.vue b/frontend/src/components/TaskContentEditor/index.vue
index 329657c..6c6be6a 100644
--- a/frontend/src/components/TaskContentEditor/index.vue
+++ b/frontend/src/components/TaskContentEditor/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted, onUnmounted } from 'vue'
 import type { IRawStepTask } from '@/stores'
 import SvgIcon from '@/components/SvgIcon/index.vue'
 
@@ -13,6 +13,7 @@ const emit = defineEmits<{
 
 const isEditing = ref(false)
 const editingContent = ref('')
+const editorRef = ref<HTMLElement>()
 
 const startEditing = () => {
   editingContent.value = props.task.TaskContent || ''
@@ -37,57 +38,93 @@ const handleKeydown = (event: KeyboardEvent) => {
     cancel()
   }
 }
+
+// 点击外部保存
+const handleClickOutside = (event: MouseEvent) => {
+  if (isEditing.value && editorRef.value && !editorRef.value.contains(event.target as Node)) {
+    save()
+  }
+}
+
+onMounted(() => {
+  document.addEventListener('click', handleClickOutside)
+})
+
+onUnmounted(() => {
+  document.removeEventListener('click', handleClickOutside)
+})
 </script>
 
 <template>
-  <div v-if="isEditing" class="w-full">
-    <div class="flex flex-col gap-3">
-      <el-input
-        v-model="editingContent"
-        type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4 }"
-        placeholder="请输入任务内容"
-        @keydown="handleKeydown"
-        class="task-content-editor"
-        size="small"
-      />
-      <div class="flex justify-end">
-        <svg-icon
-          icon-class="Check"
-          size="20px"
-          color="#328621"
-          class="cursor-pointer mr-4"
-          @click="save"
-          title="保存"
-        />
-        <svg-icon
-          icon-class="Cancel"
-          size="20px"
-          color="#8e0707"
-          class="cursor-pointer mr-1"
-          @click="cancel"
-          title="取消"
-        />
-      </div>
-    </div>
+  <div ref="editorRef" v-if="isEditing" class="w-full">
+    <el-input
+      v-model="editingContent"
+      type="textarea"
+      :autosize="{ minRows: 2, maxRows: 4 }"
+      placeholder="请输入任务内容"
+      @keydown="handleKeydown"
+      class="task-content-editor"
+      size="small"
+    />
   </div>
-  <div v-else @dblclick="startEditing" class="w-full cursor-pointer">
+  <div v-else @dblclick="startEditing" class="w-full cursor-pointer task-content-wrapper">
     <slot name="display">
       <div class="text-[14px] text-[var(--color-text-secondary)] task-content-display">
         {{ task.TaskContent }}
       </div>
     </slot>
+    <div class="edit-icon-bg" @click.stop="startEditing">
+      <svg-icon icon-class="Edit" class="edit-icon-svg" />
+    </div>
   </div>
 </template>
 
 <style scoped lang="scss">
+.task-content-wrapper {
+  position: relative;
+  padding: 4px;
+  border: 2px solid transparent;
+  border-radius: 7px;
+  box-sizing: border-box;
+  transition: border-color 0.3s ease;
+
+  &:hover {
+    border-color: var(--color-task-edit-hover-border) !important;
+  }
+
+  .edit-icon-bg {
+    position: absolute;
+    right: -1px;
+    bottom: -1px;
+    width: 26px;
+    height: 22px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+    cursor: pointer;
+    background: var(--color-edit-icon-bg);
+    border-radius: 8px 0px 7px 0px;
+
+    .edit-icon-svg {
+      color: var(--color-text-detail);
+    }
+  }
+
+  &:hover .edit-icon-bg {
+    opacity: 1;
+  }
+}
+
 .task-content-editor {
   :deep(.el-textarea__inner) {
     font-size: 14px;
     color: var(--color-text-secondary);
     background: transparent;
-    border: 1px solid #dcdfe6;
+    border: 1px solid var(--color-task-edit-hover-border) !important;
     border-radius: 4px;
+    box-sizing: border-box;
     resize: none;
   }
 }