zen-gitsync 2.0.1 → 2.0.4

package/src/ui/client/src/components/CommitForm.vue

@@ -1,17 +1,17 @@
 <script setup lang="ts">
-import { ref, onMounted, defineEmits, computed, watch } from "vue";
-import { ElMessage } from "element-plus";
-import { Setting } from "@element-plus/icons-vue";
-
-const emit = defineEmits(["commit-success", "push-success"]);
+import { ref, onMounted, computed, watch } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { Setting, Plus, Upload, Refresh, Download, Edit } from "@element-plus/icons-vue";
+import { useGitLogStore } from "../stores/gitLogStore";
+import { useGitStore } from "../stores/gitStore";
+
+const gitLogStore = useGitLogStore();
+const gitStore = useGitStore();
+const emit = defineEmits(["commit-success", "push-success", "status-update"]);
 const commitMessage = ref("");
-const commitBtnText = ref("提交");
-const pushBtnText = ref("推送到远程");
-const isCommitting = ref(false);
 const isPushing = ref(false);
 // 添加提交并推送的状态变量
 const isCommitAndPushing = ref(false);
-const commitAndPushBtnText = ref("提交并推送");
 const placeholder = ref("输入提交信息...");
 // 添加默认提交信息变量
 const defaultCommitMessage = ref("");
@@ -27,11 +27,19 @@ const descriptionTemplates = ref<string[]>([]);
 // 添加对话框可见性变量
 const descriptionDialogVisible = ref(false);
 const newTemplateName = ref("");
+// 添加模板编辑相关变量
+const isEditingDescription = ref(false);
+const originalDescriptionTemplate = ref("");
+const editingDescriptionIndex = ref(-1);
 
 // 作用域模板相关变量
 const scopeTemplates = ref<string[]>([]);
 const scopeDialogVisible = ref(false);
 const newScopeTemplate = ref("");
+// 添加作用域模板编辑相关变量
+const isEditingScope = ref(false);
+const originalScopeTemplate = ref("");
+const editingScopeIndex = ref(-1);
 
 // 跳过钩子
 const skipHooks = ref(false);
@@ -82,6 +90,19 @@ const finalCommitMessage = computed(() => {
   return message;
 });
 
+// 计算Git命令预览
+const gitCommandPreview = computed(() => {
+  // 基本命令
+  let command = `git commit -m "${finalCommitMessage.value}"`
+  
+  // 如果跳过钩子开关打开，添加 --no-verify 参数
+  if (skipHooks.value) {
+    command += ' --no-verify'
+  }
+  
+  return command
+});
+
 // 加载配置
 async function loadConfig() {
   try {
@@ -119,51 +140,126 @@ async function saveDescriptionTemplate() {
   }
 
   try {
-    // 检查是否已存在相同模板
-    if (descriptionTemplates.value.includes(newTemplateName.value)) {
-      ElMessage({
-        message: "该模板已存在",
-        type: "warning",
-      });
-      return;
-    }
+    // 判断是编辑还是新建
+    if (isEditingDescription.value) {
+      // 编辑现有模板
+      await updateDescriptionTemplate();
+    } else {
+      // 新建模板
+      // 检查是否已存在相同模板
+      if (descriptionTemplates.value.includes(newTemplateName.value)) {
+        ElMessage({
+          message: "该模板已存在",
+          type: "warning",
+        });
+        return;
+      }
 
-    // 添加到本地数组
-    descriptionTemplates.value.push(newTemplateName.value);
+      // 添加到本地数组
+      descriptionTemplates.value.push(newTemplateName.value);
+
+      // 保存到服务器
+      const response = await fetch("/api/config/save-template", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          template: newTemplateName.value,
+          type: "description",
+        }),
+      });
 
-    // 保存到服务器
-    const response = await fetch("/api/config/save-template", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        template: newTemplateName.value,
-        type: "description",
-      }),
+      const result = await response.json();
+      if (result.success) {
+        ElMessage({
+          message: "模板保存成功!",
+          type: "success",
+        });
+        newTemplateName.value = "";
+      } else {
+        ElMessage({
+          message: "模板保存失败: " + result.error,
+          type: "error",
+        });
+      }
+    }
+  } catch (error) {
+    ElMessage({
+      message: "模板保存失败: " + (error as Error).message,
+      type: "error",
     });
+  }
+}
 
-    const result = await response.json();
-    if (result.success) {
-      ElMessage({
-        message: "模板保存成功!",
-        type: "success",
-      });
-      newTemplateName.value = "";
-    } else {
-      ElMessage({
-        message: "模板保存失败: " + result.error,
-        type: "error",
+// 编辑描述模板
+async function updateDescriptionTemplate() {
+  try {
+    // 先从本地数组中更新
+    if (editingDescriptionIndex.value >= 0) {
+      // 保存原模板和新模板
+      const oldTemplate = originalDescriptionTemplate.value;
+      const newTemplate = newTemplateName.value;
+      
+      // 更新本地数组
+      descriptionTemplates.value[editingDescriptionIndex.value] = newTemplate;
+      
+      // 调用API更新服务器
+      const response = await fetch("/api/config/update-template", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          oldTemplate,
+          newTemplate,
+          type: "description",
+        }),
       });
+      
+      const result = await response.json();
+      if (result.success) {
+        ElMessage({
+          message: "模板更新成功!",
+          type: "success",
+        });
+        
+        // 重置编辑状态
+        isEditingDescription.value = false;
+        originalDescriptionTemplate.value = "";
+        editingDescriptionIndex.value = -1;
+        newTemplateName.value = "";
+      } else {
+        ElMessage({
+          message: "模板更新失败: " + result.error,
+          type: "error",
+        });
+      }
     }
   } catch (error) {
     ElMessage({
-      message: "模板保存失败: " + (error as Error).message,
+      message: "模板更新失败: " + (error as Error).message,
       type: "error",
     });
   }
 }
 
+// 开始编辑描述模板
+function startEditDescriptionTemplate(template: string, index: number) {
+  isEditingDescription.value = true;
+  originalDescriptionTemplate.value = template;
+  editingDescriptionIndex.value = index;
+  newTemplateName.value = template;
+}
+
+// 取消编辑描述模板
+function cancelEditDescriptionTemplate() {
+  isEditingDescription.value = false;
+  originalDescriptionTemplate.value = "";
+  editingDescriptionIndex.value = -1;
+  newTemplateName.value = "";
+}
+
 // 保存作用域模板
 async function saveScopeTemplate() {
   if (!newScopeTemplate.value.trim()) {
@@ -175,51 +271,126 @@ async function saveScopeTemplate() {
   }
 
   try {
-    // 检查是否已存在相同模板
-    if (scopeTemplates.value.includes(newScopeTemplate.value)) {
-      ElMessage({
-        message: "该模板已存在",
-        type: "warning",
-      });
-      return;
-    }
+    // 判断是编辑还是新建
+    if (isEditingScope.value) {
+      // 编辑现有模板
+      await updateScopeTemplate();
+    } else {
+      // 新建模板
+      // 检查是否已存在相同模板
+      if (scopeTemplates.value.includes(newScopeTemplate.value)) {
+        ElMessage({
+          message: "该模板已存在",
+          type: "warning",
+        });
+        return;
+      }
 
-    // 添加到本地数组
-    scopeTemplates.value.push(newScopeTemplate.value);
+      // 添加到本地数组
+      scopeTemplates.value.push(newScopeTemplate.value);
+
+      // 保存到服务器
+      const response = await fetch("/api/config/save-template", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          template: newScopeTemplate.value,
+          type: "scope",
+        }),
+      });
 
-    // 保存到服务器
-    const response = await fetch("/api/config/save-template", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        template: newScopeTemplate.value,
-        type: "scope",
-      }),
+      const result = await response.json();
+      if (result.success) {
+        ElMessage({
+          message: "作用域模板保存成功!",
+          type: "success",
+        });
+        newScopeTemplate.value = "";
+      } else {
+        ElMessage({
+          message: "作用域模板保存失败: " + result.error,
+          type: "error",
+        });
+      }
+    }
+  } catch (error) {
+    ElMessage({
+      message: "作用域模板保存失败: " + (error as Error).message,
+      type: "error",
     });
+  }
+}
 
-    const result = await response.json();
-    if (result.success) {
-      ElMessage({
-        message: "作用域模板保存成功!",
-        type: "success",
-      });
-      newScopeTemplate.value = "";
-    } else {
-      ElMessage({
-        message: "作用域模板保存失败: " + result.error,
-        type: "error",
+// 更新作用域模板
+async function updateScopeTemplate() {
+  try {
+    // 先从本地数组中更新
+    if (editingScopeIndex.value >= 0) {
+      // 保存原模板和新模板
+      const oldTemplate = originalScopeTemplate.value;
+      const newTemplate = newScopeTemplate.value;
+      
+      // 更新本地数组
+      scopeTemplates.value[editingScopeIndex.value] = newTemplate;
+      
+      // 调用API更新服务器
+      const response = await fetch("/api/config/update-template", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          oldTemplate,
+          newTemplate,
+          type: "scope",
+        }),
       });
+      
+      const result = await response.json();
+      if (result.success) {
+        ElMessage({
+          message: "作用域模板更新成功!",
+          type: "success",
+        });
+        
+        // 重置编辑状态
+        isEditingScope.value = false;
+        originalScopeTemplate.value = "";
+        editingScopeIndex.value = -1;
+        newScopeTemplate.value = "";
+      } else {
+        ElMessage({
+          message: "作用域模板更新失败: " + result.error,
+          type: "error",
+        });
+      }
     }
   } catch (error) {
     ElMessage({
-      message: "作用域模板保存失败: " + (error as Error).message,
+      message: "作用域模板更新失败: " + (error as Error).message,
       type: "error",
     });
   }
 }
 
+// 开始编辑作用域模板
+function startEditScopeTemplate(template: string, index: number) {
+  isEditingScope.value = true;
+  originalScopeTemplate.value = template;
+  editingScopeIndex.value = index;
+  newScopeTemplate.value = template;
+}
+
+// 取消编辑作用域模板
+function cancelEditScopeTemplate() {
+  isEditingScope.value = false;
+  originalScopeTemplate.value = "";
+  editingScopeIndex.value = -1;
+  newScopeTemplate.value = "";
+}
+
 // 删除描述模板
 async function deleteDescriptionTemplate(template: string) {
   try {
@@ -324,231 +495,225 @@ function openScopeSettings() {
   scopeDialogVisible.value = true;
 }
 
-
-// 从localStorage加载标准化提交设置
-function loadCommitPreference() {
-  const savedPreference = localStorage.getItem("zen-gitsync-standard-commit");
-  if (savedPreference !== null) {
-    isStandardCommit.value = savedPreference === "true";
-  }
-
-  // 加载跳过钩子设置
-  const savedSkipHooks = localStorage.getItem("zen-gitsync-skip-hooks");
-  if (savedSkipHooks !== null) {
-    skipHooks.value = savedSkipHooks === "true";
+// 添加文件到暂存区 (git add)
+async function addToStage() {
+  try {
+    const result = await gitLogStore.addToStage();
+    if (result) {
+      // 触发状态更新事件
+      emit("status-update");
+    }
+  } catch (error) {
+    ElMessage({
+      message: `添加文件失败: ${(error as Error).message}`,
+      type: "error",
+    });
   }
 }
 
-// 提交更改
+// 提交更改 (git commit)
 async function commitChanges() {
-  const message = finalCommitMessage.value;
-  if (!message && isStandardCommit.value && !commitDescription.value) {
+  if (!finalCommitMessage.value.trim()) {
     ElMessage({
-      message: "请输入提交描述",
+      message: "提交信息不能为空",
       type: "warning",
     });
     return;
   }
 
   try {
-    isCommitting.value = true;
-    commitBtnText.value = "提交中...";
-
-    // 先执行 git add .
-    const addResponse = await fetch("/api/add", {
-      method: "POST",
-    });
+    // 使用Store提交更改
+    const result = await gitLogStore.commitChanges(finalCommitMessage.value, skipHooks.value);
     
-    const addResult = await addResponse.json();
-    if (!addResult.success) {
-      ElMessage({
-        message: "添加文件失败: " + addResult.error,
-        type: "error",
-      });
-      return;
-    }
-
-    const response = await fetch("/api/commit", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message,
-        // 添加一个标志，表示消息包含换行符
-        hasNewlines: message.includes("\n"),
-        // 添加 no-verify 选项
-        noVerify: skipHooks.value,
-      }),
-    });
-
-    const result = await response.json();
-    if (result.success) {
-      // 清空输入
-      if (isStandardCommit.value) {
-        commitDescription.value = "";
-        commitBody.value = "";
-        commitFooter.value = "";
-      } else {
-        commitMessage.value = "";
-      }
-
-      ElMessage({
-        message: "提交成功!",
-        type: "success",
-      });
-      // 发出提交成功事件
+    if (result) {
+      // 清空提交信息
+      clearCommitFields();
+      
+      // 触发成功事件
       emit("commit-success");
-    } else {
-      ElMessage({
-        message: "提交失败: " + result.error,
-        type: "error",
-      });
+      // 触发状态更新事件
+      emit("status-update");
     }
   } catch (error) {
     ElMessage({
-      message: "提交失败: " + (error as Error).message,
+      message: `提交失败: ${(error as Error).message}`,
       type: "error",
     });
-  } finally {
-    isCommitting.value = false;
-    commitBtnText.value = "提交";
   }
 }
 
-// 推送更改
-async function pushChanges() {
+// 推送到远程 (git push)
+async function pushToRemote() {
   try {
-    isPushing.value = true;
-    pushBtnText.value = "推送中...";
-
-    const response = await fetch("/api/push", {
-      method: "POST",
-    });
-
-    const result = await response.json();
-    if (result.success) {
-      ElMessage({
-        message: "推送成功!",
-        type: "success",
-      });
-      // 发出推送成功事件
+    isPushing.value = true
+    // 使用Store推送更改
+    const result = await gitLogStore.pushToRemote();
+    
+    if (result) {
+      // 触发成功事件
       emit("push-success");
-    } else {
-      ElMessage({
-        message: "推送失败: " + result.error,
-        type: "error",
-      });
+      // 触发状态更新事件
+      emit("status-update");
     }
   } catch (error) {
     ElMessage({
-      message: "推送失败: " + (error as Error).message,
+      message: `推送失败: ${(error as Error).message}`,
       type: "error",
     });
   } finally {
-    isPushing.value = false;
-    pushBtnText.value = "推送到远程";
+    isPushing.value = false
   }
 }
 
-// 提交并推送更改
-async function commitAndPush() {
-  const message = finalCommitMessage.value;
-  if (!message && isStandardCommit.value && !commitDescription.value) {
+// 添加并提交 (git add + git commit)
+async function addAndCommit() {
+  if (!finalCommitMessage.value.trim()) {
     ElMessage({
-      message: "请输入提交描述",
+      message: "提交信息不能为空", 
       type: "warning",
     });
     return;
   }
 
   try {
-    isCommitAndPushing.value = true;
-    commitAndPushBtnText.value = "处理中...";
+    const result = await gitLogStore.addAndCommit(finalCommitMessage.value, skipHooks.value);
+    
+    if (result) {
+      // 清空提交信息
+      clearCommitFields();
+      
+      // 触发成功事件
+      emit("commit-success");
+      // 触发状态更新事件
+      emit("status-update");
+    }
+  } catch (error) {
+    ElMessage({
+      message: `暂存并提交失败: ${(error as Error).message}`,
+      type: "error",
+    });
+  }
+}
 
-    // 先执行 git add .
-    const addResponse = await fetch("/api/add", {
-      method: "POST",
+// 添加、提交并推送 (git add + git commit + git push)
+async function addCommitAndPush() {
+  if (!finalCommitMessage.value.trim()) {
+    ElMessage({
+      message: "提交信息不能为空",
+      type: "warning",
     });
+    return;
+  }
+
+  try {
+    isCommitAndPushing.value = true
+    const result = await gitLogStore.addCommitAndPush(finalCommitMessage.value, skipHooks.value);
     
-    const addResult = await addResponse.json();
-    if (!addResult.success) {
-      ElMessage({
-        message: "添加文件失败: " + addResult.error,
-        type: "error",
-      });
-      return;
+    if (result) {
+      // 清空提交信息
+      clearCommitFields();
+      
+      // 触发成功事件
+      emit("commit-success");
+      
+      // 添加小延迟后再触发推送成功事件，确保提交历史能够刷新
+      setTimeout(() => {
+        emit("push-success");
+      }, 300);
+      
+      // 触发状态更新事件
+      emit("status-update");
     }
-
-    // 再提交
-    const commitResponse = await fetch("/api/commit", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        message,
-        // 添加一个标志，表示消息包含换行符
-        hasNewlines: message.includes("\n"),
-        // 添加 no-verify 选项
-        noVerify: skipHooks.value,
-      }),
+  } catch (error) {
+    ElMessage({
+      message: `暂存、提交并推送失败: ${(error as Error).message}`,
+      type: "error",
     });
+  } finally {
+    isCommitAndPushing.value = false
+  }
+}
 
-    const commitResult = await commitResponse.json();
-    if (!commitResult.success) {
+// 重置暂存区 (git reset HEAD)
+async function resetHead() {
+  try {
+    await ElMessageBox.confirm(
+      '确定要重置暂存区吗？这将取消所有已暂存的更改，但不会影响工作区的文件。',
+      '重置暂存区',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }
+    );
+    
+    const result = await gitLogStore.resetHead();
+    if (result) {
+      // 触发状态更新事件
+      emit("status-update");
+    }
+  } catch (error) {
+    // 用户取消操作，不显示错误
+    if ((error as any) !== 'cancel') {
       ElMessage({
-        message: "提交失败: " + commitResult.error,
-        type: "error",
+        message: `重置暂存区失败: ${(error as Error).message}`,
+        type: 'error'
       });
-      return;
     }
+  }
+}
 
-    // 清空输入
-    if (isStandardCommit.value) {
-      commitDescription.value = "";
-      commitBody.value = "";
-      commitFooter.value = "";
-    } else {
-      commitMessage.value = "";
+// 重置到远程分支 (git reset --hard origin/branch)
+async function resetToRemote() {
+  try {
+    await ElMessageBox.confirm(
+      `确定要重置当前分支 "${gitStore.currentBranch}" 到远程状态吗？这将丢失所有未推送的提交和本地更改。`,
+      '重置到远程分支',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }
+    );
+    
+    const result = await gitLogStore.resetToRemote(gitStore.currentBranch);
+    if (result) {
+      // 触发状态更新事件
+      emit("status-update");
     }
-
-    // 再推送
-    const pushResponse = await fetch("/api/push", {
-      method: "POST",
-    });
-
-    const pushResult = await pushResponse.json();
-    if (pushResult.success) {
-      commitMessage.value = "";
-      ElMessage({
-        message: "提交并推送成功!",
-        type: "success",
-      });
-      // 发出提交和推送成功事件
-      emit("commit-success");
-      emit("push-success");
-    } else {
+  } catch (error) {
+    // 用户取消操作，不显示错误
+    if ((error as any) !== 'cancel') {
       ElMessage({
-        message: "推送失败: " + pushResult.error,
-        type: "error",
+        message: `重置到远程分支失败: ${(error as Error).message}`,
+        type: 'error'
       });
     }
-  } catch (error) {
-    ElMessage({
-      message: "操作失败: " + (error as Error).message,
-      type: "error",
-    });
-  } finally {
-    isCommitAndPushing.value = false;
-    commitAndPushBtnText.value = "提交并推送";
   }
 }
 
+// 清空提交字段
+function clearCommitFields() {
+  commitMessage.value = "";
+  commitDescription.value = "";
+  commitBody.value = "";
+  commitFooter.value = "";
+}
 
 onMounted(() => {
   loadConfig();
-  loadCommitPreference();
+  
+  // 从 localStorage 中获取标准化提交设置
+  const savedStandardCommit = localStorage.getItem("zen-gitsync-standard-commit");
+  if (savedStandardCommit !== null) {
+    isStandardCommit.value = savedStandardCommit === "true";
+  }
+  
+  // 从 localStorage 中获取跳过钩子设置
+  const savedSkipHooks = localStorage.getItem("zen-gitsync-skip-hooks");
+  if (savedSkipHooks !== null) {
+    skipHooks.value = savedSkipHooks === "true";
+  }
 });
 </script>
 
@@ -557,30 +722,26 @@ onMounted(() => {
     <h2>提交更改</h2>
 
     <div class="commit-options">
-      <div class="commit-mode-toggle">
-        <el-switch
-          v-model="isStandardCommit"
-          active-text="标准化提交"
-          inactive-text="普通提交"
-        />
-      </div>
+      <div class="options-row">
+        <div class="commit-mode-toggle">
+          <el-switch
+            v-model="isStandardCommit"
+            active-text="标准化提交"
+            inactive-text="普通提交"
+          />
+        </div>
 
-      <div class="no-verify-toggle">
-        <el-tooltip content="跳过 Git 钩子检查 (--no-verify)" placement="top">
-          <el-switch v-model="skipHooks" active-text="跳过钩子 (--no-verify)" />
-        </el-tooltip>
+        <div class="no-verify-toggle">
+          <el-tooltip content="跳过 Git 钩子检查 (--no-verify)" placement="top">
+            <el-switch v-model="skipHooks" active-text="跳过钩子 (--no-verify)" />
+          </el-tooltip>
+        </div>
       </div>
     </div>
 
     <!-- 普通提交表单 -->
     <div v-if="!isStandardCommit" class="commit-form">
       <el-input v-model="commitMessage" :placeholder="placeholder" clearable />
-      <el-button
-        type="primary"
-        @click="commitChanges"
-        :loading="isCommitting"
-        >{{ commitBtnText }}</el-button
-      >
     </div>
 
     <!-- 标准化提交表单 -->
@@ -654,28 +815,79 @@ onMounted(() => {
       />
 
       <div class="preview-section">
-        <div class="preview-title">预览：</div>
+        <div class="preview-title">提交信息预览：</div>
         <pre class="preview-content">{{ finalCommitMessage }}</pre>
+        
+        <div class="preview-title" style="margin-top: 10px;">Git命令预览：</div>
+        <pre class="preview-content code-command">{{ gitCommandPreview }}</pre>
       </div>
-
-      <el-button
-        type="primary"
-        @click="commitChanges"
-        :loading="isCommitting"
-        >{{ commitBtnText }}</el-button
-      >
     </div>
 
-    <div class="button-group">
-      <el-button type="success" @click="pushChanges" :loading="isPushing">{{
-        pushBtnText
-      }}</el-button>
-      <el-button
-        type="warning"
-        @click="commitAndPush"
-        :loading="isCommitAndPushing"
-        >{{ commitAndPushBtnText }}</el-button
-      >
+    <div class="git-actions">
+      <div class="action-row">
+        <el-button
+          type="primary"
+          @click="addToStage"
+          :loading="gitLogStore.isAddingFiles"
+          :icon="Plus"
+        >
+          添加到暂存区(git add .)
+        </el-button>
+        
+        <el-button
+          type="primary"
+          @click="commitChanges"
+          :loading="gitLogStore.isLoadingStatus"
+        >
+          提交(git commit)
+        </el-button>
+        
+        <el-button
+          type="success"
+          @click="pushToRemote"
+          :icon="Upload"
+          :loading="isPushing"
+        >
+          推送(git push)
+        </el-button>
+      </div>
+      
+      <div class="action-row">
+        <el-button
+          type="warning"
+          @click="addAndCommit"
+        >
+          添加并提交(git add+commit)
+        </el-button>
+        
+        <el-button
+          type="danger"
+          @click="addCommitAndPush"
+          :loading="isCommitAndPushing"
+        >
+          添加、提交并推送(git add+commit+push)
+        </el-button>
+      </div>
+      
+      <div class="action-row">
+        <el-button
+          type="info"
+          @click="resetHead"
+          :loading="gitLogStore.isResetting"
+          :icon="Refresh"
+        >
+          重置暂存区(git reset HEAD)
+        </el-button>
+        
+        <el-button
+          type="info"
+          @click="resetToRemote"
+          :loading="gitLogStore.isResetting"
+          :icon="Download"
+        >
+          重置到远程(git reset --hard origin/branch)
+        </el-button>
+      </div>
     </div>
 
     <!-- 简短描述设置弹窗 -->
@@ -689,16 +901,23 @@ onMounted(() => {
         <div class="template-form">
           <el-input
             v-model="newTemplateName"
-            placeholder="输入新模板内容"
+            :placeholder="isEditingDescription ? '编辑模板内容' : '输入新模板内容'"
             class="template-input"
             clearable
           />
-          <el-button
-            type="primary"
-            @click="saveDescriptionTemplate"
-            :disabled="!newTemplateName.trim()"
-            >添加模板</el-button
-          >
+          <div class="template-form-buttons">
+            <el-button
+              v-if="isEditingDescription"
+              @click="cancelEditDescriptionTemplate"
+              >取消</el-button
+            >
+            <el-button
+              type="primary"
+              @click="saveDescriptionTemplate"
+              :disabled="!newTemplateName.trim()"
+              >{{ isEditingDescription ? '更新模板' : '添加模板' }}</el-button
+            >
+          </div>
         </div>
 
         <div class="template-list">
@@ -722,6 +941,13 @@ onMounted(() => {
                   @click="useTemplate(template)"
                   >使用</el-button
                 >
+                <el-button
+                  type="warning"
+                  size="small"
+                  :icon="Edit"
+                  @click="startEditDescriptionTemplate(template, index)"
+                  >编辑</el-button
+                >
                 <el-button
                   type="danger"
                   size="small"
@@ -746,16 +972,23 @@ onMounted(() => {
         <div class="template-form">
           <el-input
             v-model="newScopeTemplate"
-            placeholder="输入新作用域模板"
+            :placeholder="isEditingScope ? '编辑作用域模板内容' : '输入新作用域模板'"
             class="template-input"
             clearable
           />
-          <el-button
-            type="primary"
-            @click="saveScopeTemplate"
-            :disabled="!newScopeTemplate.trim()"
-            >添加模板</el-button
-          >
+          <div class="template-form-buttons">
+            <el-button
+              v-if="isEditingScope"
+              @click="cancelEditScopeTemplate"
+              >取消</el-button
+            >
+            <el-button
+              type="primary"
+              @click="saveScopeTemplate"
+              :disabled="!newScopeTemplate.trim()"
+              >{{ isEditingScope ? '更新模板' : '添加模板' }}</el-button
+            >
+          </div>
         </div>
 
         <div class="template-list">
@@ -778,6 +1011,13 @@ onMounted(() => {
                   @click="useScopeTemplate(template)"
                   >使用</el-button
                 >
+                <el-button
+                  type="warning"
+                  size="small"
+                  :icon="Edit"
+                  @click="startEditScopeTemplate(template, index)"
+                  >编辑</el-button
+                >
                 <el-button
                   type="danger"
                   size="small"
@@ -794,33 +1034,55 @@ onMounted(() => {
 </template>
 
 <style scoped>
+.card {
+  background-color: white;
+  border-radius: 5px;
+  box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+  margin-bottom: 20px;
+  padding: 20px;
+}
+
 .commit-form {
   display: flex;
   margin-bottom: 15px;
   gap: 10px;
 }
-.button-group {
+
+.git-actions {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.action-row {
   display: flex;
   gap: 10px;
+  flex-wrap: wrap;
 }
+
 .commit-mode-toggle {
-  margin-bottom: 15px;
+  /* 移除margin-bottom */
 }
+
 .standard-commit-form {
   display: flex;
   flex-direction: column;
   gap: 15px;
   margin-bottom: 15px;
 }
+
 .standard-commit-header {
   display: flex;
   gap: 10px;
   width: 100%;
 }
+
 .type-select {
   width: 120px;
   flex-shrink: 0;
 }
+
 .scope-container {
   display: flex;
   align-items: center;
@@ -828,31 +1090,38 @@ onMounted(() => {
   flex-grow: 0;
   width: 200px;
 }
+
 .scope-input {
   flex-grow: 1;
 }
+
 .description-container {
   display: flex;
   align-items: center;
   gap: 5px;
   flex-grow: 1;
 }
+
 .description-input {
   flex-grow: 1;
   min-width: 200px;
 }
+
 .settings-button {
   flex-shrink: 0;
 }
+
 .preview-section {
   background-color: #f5f7fa;
   padding: 10px;
   border-radius: 4px;
 }
+
 .preview-title {
   font-weight: bold;
   margin-bottom: 5px;
 }
+
 .preview-content {
   white-space: pre-wrap;
   font-family: monospace;
@@ -861,6 +1130,7 @@ onMounted(() => {
   background-color: #ebeef5;
   border-radius: 4px;
 }
+
 .template-container {
   display: flex;
   flex-direction: column;
@@ -876,24 +1146,30 @@ onMounted(() => {
   flex: 1;
   overflow-y: auto;
 }
+
 .template-input {
   flex-grow: 1;
 }
+
 .template-list {
   overflow-y: auto;
   height: 100%;
 }
+
 .template-item {
   margin-bottom: 10px;
 }
+
 .template-item:hover {
   background-color: #f5f7fa;
 }
+
 .template-content {
   flex-grow: 1;
   margin-right: 10px;
   word-break: break-all;
 }
+
 .template-actions {
   display: flex;
   gap: 5px;
@@ -901,4 +1177,29 @@ onMounted(() => {
   min-width: 120px;
   flex-shrink: 0;
 }
+
+.options-row {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15px;
+}
+
+.code-command {
+  background-color: #2d2d2d;
+  color: #f8f8f2;
+  font-family: 'Courier New', Courier, monospace;
+  padding: 10px;
+  border-radius: 4px;
+  overflow-x: auto;
+  white-space: pre;
+  font-size: 14px;
+}
+
+@media (max-width: 768px) {
+  .action-row {
+    flex-direction: column;
+  }
+}
 </style>
+