zen-gitsync 2.0.9 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "2.0.9",
+  "version": "2.1.0",
   "description": "一个 git 自动查看差异并提交的工具",
   "main": "index.js",
   "type": "module",

package/src/ui/client/src/App.vue

@@ -7,6 +7,7 @@ import { ElMessage } from 'element-plus'
 import { Plus, Setting } from '@element-plus/icons-vue'
 import logo from './assets/logo.svg'
 import { useGitStore } from './stores/gitStore'
+import { useConfigStore } from './stores/configStore'
 
 const configInfo = ref('')
 // 添加组件实例类型
@@ -15,6 +16,8 @@ const gitStatusRef = ref<InstanceType<typeof GitStatus> | null>(null)
 
 // 使用Git Store
 const gitStore = useGitStore()
+// 使用Config Store
+const configStore = useConfigStore()
 
 // 添加初始化完成状态
 const initCompleted = ref(false)
@@ -23,9 +26,10 @@ const currentDirectory = ref('')
 // 加载配置
 async function loadConfig() {
   try {
-    const response = await fetch('/api/config/getConfig')
-    const config = await response.json()
-    configInfo.value = `默认提交信息: ${config.defaultCommitMessage}`
+    const config = await configStore.loadConfig()
+    if (config) {
+      configInfo.value = `默认提交信息: ${config.defaultCommitMessage}`
+    }
   } catch (error) {
     console.error('加载配置失败:', error)
   }
@@ -60,14 +64,12 @@ onMounted(async () => {
     
     // 只有是Git仓库的情况下才加载Git相关信息
     if (gitStore.isGitRepo) {
-      // 只获取分支和用户信息，不重复获取日志
+      // 并行获取所有Git信息，确保每个API只调用一次
       await Promise.all([
-        gitStore.getCurrentBranch(),
-        gitStore.getAllBranches(),
-        gitStore.getUserInfo()
+        gitStore.getCurrentBranch(),  // 获取当前分支
+        gitStore.getAllBranches(),    // 获取所有分支
+        gitStore.getUserInfo()        // 获取用户信息
       ])
-      
-      // 日志信息通过LogList组件直接加载即可，避免重复调用
     } else {
       ElMessage.warning('当前目录不是Git仓库，部分功能将不可用')
     }

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

@@ -1,12 +1,14 @@
 <script setup lang="ts">
 import { ref, onMounted, computed, watch } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { Setting, Edit, Check, Upload, RefreshRight, Delete, Position, Download, Connection } from "@element-plus/icons-vue";
+import { Setting, Edit, Check, Upload, RefreshRight, Delete, Position, Download, Connection, ArrowDown } from "@element-plus/icons-vue";
 import { useGitLogStore } from "../stores/gitLogStore";
 import { useGitStore } from "../stores/gitStore";
+import { useConfigStore } from "../stores/configStore";
 
 const gitLogStore = useGitLogStore();
 const gitStore = useGitStore();
+const configStore = useConfigStore();
 const commitMessage = ref("");
 const isPushing = ref(false);
 // 添加提交并推送的状态变量
@@ -51,6 +53,9 @@ const newDefaultMessage = ref("");
 // 跳过钩子
 const skipHooks = ref(false);
 
+// 添加控制正文和页脚显示的状态变量
+const showAdvancedFields = ref(false);
+
 // 提交类型选项
 const commitTypeOptions = [
   { value: "feat", label: "feat: 新功能" },
@@ -119,28 +124,29 @@ const gitCommandPreview = computed(() => {
 // 加载配置
 async function loadConfig() {
   try {
-    const response = await fetch("/api/config/getConfig");
-    const config = await response.json();
-    placeholder.value = `输入提交信息 (默认: ${config.defaultCommitMessage})`;
-    // 保存默认提交信息到变量中，以便后续使用
-    defaultCommitMessage.value = config.defaultCommitMessage || "";
-
-    // 加载描述模板
-    if (
-      config.descriptionTemplates &&
-      Array.isArray(config.descriptionTemplates)
-    ) {
-      descriptionTemplates.value = config.descriptionTemplates;
-    }
+    const config = await configStore.loadConfig();
+    if (config) {
+      placeholder.value = `输入提交信息 (默认: ${config.defaultCommitMessage})`;
+      // 保存默认提交信息到变量中，以便后续使用
+      defaultCommitMessage.value = config.defaultCommitMessage || "";
+
+      // 加载描述模板
+      if (
+        config.descriptionTemplates &&
+        Array.isArray(config.descriptionTemplates)
+      ) {
+        descriptionTemplates.value = config.descriptionTemplates;
+      }
 
-    // 加载作用域模板
-    if (config.scopeTemplates && Array.isArray(config.scopeTemplates)) {
-      scopeTemplates.value = config.scopeTemplates;
-    }
-    
-    // 加载提交信息模板
-    if (config.messageTemplates && Array.isArray(config.messageTemplates)) {
-      messageTemplates.value = config.messageTemplates;
+      // 加载作用域模板
+      if (config.scopeTemplates && Array.isArray(config.scopeTemplates)) {
+        scopeTemplates.value = config.scopeTemplates;
+      }
+      
+      // 加载提交信息模板
+      if (config.messageTemplates && Array.isArray(config.messageTemplates)) {
+        messageTemplates.value = config.messageTemplates;
+      }
     }
   } catch (error) {
     console.error("加载配置失败:", error);
@@ -173,90 +179,67 @@ async function saveDescriptionTemplate() {
         return;
       }
 
-      // 添加到本地数组
-      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 result = await response.json();
-      if (result.success) {
-        ElMessage({
-          message: "模板保存成功!",
-          type: "success",
-        });
-        newTemplateName.value = "";
-      } else {
-        ElMessage({
-          message: "模板保存失败: " + result.error,
-          type: "error",
-        });
+      // 使用 configStore 保存模板
+      const success = await configStore.saveTemplate(newTemplateName.value, 'description');
+      
+      if (success) {
+        // 确保本地数组同步更新
+        if (!descriptionTemplates.value.includes(newTemplateName.value)) {
+          descriptionTemplates.value.push(newTemplateName.value);
+        }
+        // 强制更新视图
+        descriptionTemplates.value = [...descriptionTemplates.value];
+        
+        // configStore已经显示了成功消息，这里不需要重复操作
+        newTemplateName.value = ""; // 清空输入框，但不关闭弹窗
       }
     }
   } catch (error) {
     ElMessage({
-      message: "模板保存失败: " + (error as Error).message,
+      message: `保存模板失败: ${(error as Error).message}`,
       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",
-        }),
-      });
+  if (!newTemplateName.value.trim()) {
+    ElMessage({
+      message: "请输入模板内容",
+      type: "warning",
+    });
+    return;
+  }
 
-      const result = await response.json();
-      if (result.success) {
-        ElMessage({
-          message: "模板更新成功!",
-          type: "success",
-        });
+  try {
+    // 使用 configStore 更新模板
+    const success = await configStore.updateTemplate(
+      originalDescriptionTemplate.value,
+      newTemplateName.value,
+      'description'
+    );
 
-        // 重置编辑状态
-        isEditingDescription.value = false;
-        originalDescriptionTemplate.value = "";
-        editingDescriptionIndex.value = -1;
-        newTemplateName.value = "";
-      } else {
-        ElMessage({
-          message: "模板更新失败: " + result.error,
-          type: "error",
-        });
+    if (success) {
+      // 确保本地数组同步更新
+      const index = descriptionTemplates.value.indexOf(originalDescriptionTemplate.value);
+      if (index !== -1) {
+        descriptionTemplates.value[index] = newTemplateName.value;
       }
+      // 强制更新视图
+      descriptionTemplates.value = [...descriptionTemplates.value];
+      
+      // configStore已经更新了本地数组并显示了成功消息，这里不需要重复操作
+      
+      // 重置编辑状态
+      isEditingDescription.value = false;
+      originalDescriptionTemplate.value = "";
+      editingDescriptionIndex.value = -1;
+      newTemplateName.value = "";
     }
   } catch (error) {
     ElMessage({
-      message: "模板更新失败: " + (error as Error).message,
+      message: `更新模板失败: ${(error as Error).message}`,
       type: "error",
     });
   }
@@ -304,38 +287,24 @@ async function saveScopeTemplate() {
         return;
       }
 
-      // 添加到本地数组
-      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 result = await response.json();
-      if (result.success) {
-        ElMessage({
-          message: "作用域模板保存成功!",
-          type: "success",
-        });
-        newScopeTemplate.value = "";
-      } else {
-        ElMessage({
-          message: "作用域模板保存失败: " + result.error,
-          type: "error",
-        });
+      // 使用 configStore 保存模板
+      const success = await configStore.saveTemplate(newScopeTemplate.value, 'scope');
+      
+      if (success) {
+        // 确保本地数组同步更新
+        if (!scopeTemplates.value.includes(newScopeTemplate.value)) {
+          scopeTemplates.value.push(newScopeTemplate.value);
+        }
+        // 强制更新视图
+        scopeTemplates.value = [...scopeTemplates.value];
+        
+        // configStore已经显示了成功消息，这里不需要重复操作
+        newScopeTemplate.value = ""; // 清空输入框，但不关闭弹窗
       }
     }
   } catch (error) {
     ElMessage({
-      message: "作用域模板保存失败: " + (error as Error).message,
+      message: `保存模板失败: ${(error as Error).message}`,
       type: "error",
     });
   }
@@ -343,51 +312,42 @@ async function saveScopeTemplate() {
 
 // 更新作用域模板
 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",
-        }),
-      });
+  if (!newScopeTemplate.value.trim()) {
+    ElMessage({
+      message: "请输入模板内容",
+      type: "warning",
+    });
+    return;
+  }
 
-      const result = await response.json();
-      if (result.success) {
-        ElMessage({
-          message: "作用域模板更新成功!",
-          type: "success",
-        });
+  try {
+    // 使用 configStore 更新模板
+    const success = await configStore.updateTemplate(
+      originalScopeTemplate.value,
+      newScopeTemplate.value,
+      'scope'
+    );
 
-        // 重置编辑状态
-        isEditingScope.value = false;
-        originalScopeTemplate.value = "";
-        editingScopeIndex.value = -1;
-        newScopeTemplate.value = "";
-      } else {
-        ElMessage({
-          message: "作用域模板更新失败: " + result.error,
-          type: "error",
-        });
+    if (success) {
+      // 确保本地数组同步更新
+      const index = scopeTemplates.value.indexOf(originalScopeTemplate.value);
+      if (index !== -1) {
+        scopeTemplates.value[index] = newScopeTemplate.value;
       }
+      // 强制更新视图
+      scopeTemplates.value = [...scopeTemplates.value];
+      
+      // configStore已经更新了本地数组并显示了成功消息，这里不需要重复操作
+      
+      // 重置编辑状态
+      isEditingScope.value = false;
+      originalScopeTemplate.value = "";
+      editingScopeIndex.value = -1;
+      newScopeTemplate.value = "";
     }
   } catch (error) {
     ElMessage({
-      message: "作用域模板更新失败: " + (error as Error).message,
+      message: `更新模板失败: ${(error as Error).message}`,
       type: "error",
     });
   }
@@ -412,39 +372,37 @@ function cancelEditScopeTemplate() {
 // 删除描述模板
 async function deleteDescriptionTemplate(template: string) {
   try {
-    // 从本地数组中删除
-    const index = descriptionTemplates.value.indexOf(template);
-    if (index !== -1) {
-      descriptionTemplates.value.splice(index, 1);
-    }
-
-    // 从服务器删除
-    const response = await fetch("/api/config/delete-template", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        template,
-        type: "description",
-      }),
-    });
+    // 确认删除
+    await ElMessageBox.confirm(
+      `确定要删除描述模板 "${template}" 吗？`,
+      "删除确认",
+      {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }
+    );
 
-    const result = await response.json();
-    if (result.success) {
-      ElMessage({
-        message: "模板删除成功!",
-        type: "success",
-      });
-    } else {
-      ElMessage({
-        message: "模板删除失败: " + result.error,
-        type: "error",
-      });
+    // 使用 configStore 删除模板
+    const success = await configStore.deleteTemplate(template, 'description');
+    
+    if (success) {
+      // 确保本地数组同步更新
+      const index = descriptionTemplates.value.indexOf(template);
+      if (index !== -1) {
+        descriptionTemplates.value.splice(index, 1);
+      }
+      // 强制更新视图
+      descriptionTemplates.value = [...descriptionTemplates.value];
     }
   } catch (error) {
+    if (error === "cancel") {
+      // 用户取消删除，不做任何操作
+      return;
+    }
+    
     ElMessage({
-      message: "模板删除失败: " + (error as Error).message,
+      message: `删除模板失败: ${(error as Error).message}`,
       type: "error",
     });
   }
@@ -453,39 +411,37 @@ async function deleteDescriptionTemplate(template: string) {
 // 删除作用域模板
 async function deleteScopeTemplate(template: string) {
   try {
-    // 从本地数组中删除
-    const index = scopeTemplates.value.indexOf(template);
-    if (index !== -1) {
-      scopeTemplates.value.splice(index, 1);
-    }
-
-    // 从服务器删除
-    const response = await fetch("/api/config/delete-template", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        template,
-        type: "scope",
-      }),
-    });
+    // 确认删除
+    await ElMessageBox.confirm(
+      `确定要删除作用域模板 "${template}" 吗？`,
+      "删除确认",
+      {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }
+    );
 
-    const result = await response.json();
-    if (result.success) {
-      ElMessage({
-        message: "作用域模板删除成功!",
-        type: "success",
-      });
-    } else {
-      ElMessage({
-        message: "作用域模板删除失败: " + result.error,
-        type: "error",
-      });
+    // 使用 configStore 删除模板
+    const success = await configStore.deleteTemplate(template, 'scope');
+    
+    if (success) {
+      // 确保本地数组同步更新
+      const index = scopeTemplates.value.indexOf(template);
+      if (index !== -1) {
+        scopeTemplates.value.splice(index, 1);
+      }
+      // 强制更新视图
+      scopeTemplates.value = [...scopeTemplates.value];
     }
   } catch (error) {
+    if (error === "cancel") {
+      // 用户取消删除，不做任何操作
+      return;
+    }
+    
     ElMessage({
-      message: "作用域模板删除失败: " + (error as Error).message,
+      message: `删除模板失败: ${(error as Error).message}`,
       type: "error",
     });
   }
@@ -746,39 +702,26 @@ async function saveDefaultMessage() {
   }
 
   try {
-    // 保存到服务器
-    const response = await fetch("/api/config/saveDefaultMessage", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        defaultCommitMessage: newDefaultMessage.value,
-      }),
-    });
-
-    const result = await response.json();
-    if (result.success) {
-      // 更新本地状态
+    // 使用 configStore 保存默认提交信息
+    const success = await configStore.saveDefaultMessage(newDefaultMessage.value);
+    
+    if (success) {
+      // 更新本地默认提交信息
       defaultCommitMessage.value = newDefaultMessage.value;
-      placeholder.value = `输入提交信息 (默认: ${defaultCommitMessage.value})`;
+      placeholder.value = `输入提交信息 (默认: ${newDefaultMessage.value})`;
       
-      ElMessage({
-        message: "默认提交信息保存成功!",
-        type: "success",
-      });
+      // configStore 已经显示了成功消息，这里不需要重复显示
+      // ElMessage({
+      //   message: "默认提交信息已保存",
+      //   type: "success",
+      // });
       
-      // 不再关闭弹窗，而是保留当前编辑状态
-      // defaultMessageDialogVisible.value = false;
-    } else {
-      ElMessage({
-        message: "保存失败: " + result.error,
-        type: "error",
-      });
+      // 关闭对话框
+      defaultMessageDialogVisible.value = false;
     }
   } catch (error) {
     ElMessage({
-      message: "保存失败: " + (error as Error).message,
+      message: `保存默认提交信息失败: ${(error as Error).message}`,
       type: "error",
     });
   }
@@ -1026,8 +969,6 @@ onMounted(() => {
     skipHooks.value = savedSkipHooks === "true";
   }
   
-  // 获取一次分支状态
-  gitStore.getBranchStatus();
 });
 </script>
 
@@ -1119,15 +1060,17 @@ git config --global user.email "your.email@example.com"</pre>
             <!-- 标准化提交表单 -->
             <div v-else class="standard-commit-form">
               <div class="standard-commit-header">
-                <el-select v-model="commitType" placeholder="提交类型" class="type-select" clearable>
-                  <el-option v-for="item in commitTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-
-                <div class="scope-container">
-                  <el-input v-model="commitScope" placeholder="作用域（可选）" class="scope-input" clearable />
-                  <el-button type="primary" :icon="Setting" circle size="small" class="settings-button"
-                    @click="openScopeSettings">
-                  </el-button>
+                <div class="type-scope-container">
+                  <el-select v-model="commitType" placeholder="提交类型" class="type-select" clearable>
+                    <el-option v-for="item in commitTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
+                  </el-select>
+
+                  <div class="scope-wrapper">
+                    <el-input v-model="commitScope" placeholder="作用域（可选）" class="scope-input" clearable />
+                    <el-button type="primary" :icon="Setting" circle size="small" class="settings-button"
+                      @click="openScopeSettings">
+                    </el-button>
+                  </div>
                 </div>
 
                 <div class="description-container">
@@ -1138,10 +1081,21 @@ git config --global user.email "your.email@example.com"</pre>
                 </div>
               </div>
 
-              <el-input v-model="commitBody" type="textarea" :rows="4" placeholder="正文（可选）：详细描述本次提交的内容和原因" class="body-input"
-                clearable />
+              <!-- 添加展开/收起高级选项的控制按钮 -->
+              <div class="advanced-options-toggle" @click="showAdvancedFields = !showAdvancedFields">
+                <span>{{ showAdvancedFields ? '收起' : '正文及页脚' }}</span>
+                <el-icon class="toggle-icon" :class="{ 'is-active': showAdvancedFields }">
+                  <arrow-down />
+                </el-icon>
+              </div>
+
+              <!-- 使用过渡效果包装高级字段 -->
+              <div v-show="showAdvancedFields" class="advanced-fields">
+                <el-input v-model="commitBody" type="textarea" :rows="4" placeholder="正文（可选）：详细描述本次提交的内容和原因" class="body-input"
+                  clearable />
 
-              <el-input v-model="commitFooter" placeholder="页脚（可选）：如 Closes #123" class="footer-input" clearable />
+                <el-input v-model="commitFooter" placeholder="页脚（可选）：如 Closes #123" class="footer-input" clearable />
+              </div>
 
               <div class="preview-section">
                 <div class="preview-title">提交信息预览：</div>
@@ -1631,19 +1585,22 @@ git config --global user.email "your.email@example.com"</pre>
   width: 100%;
 }
 
-.type-select {
+.type-scope-container {
+  display: flex;
+  gap: 10px;
   width: 100%;
+  margin-bottom: 10px;
 }
 
-.scope-container {
+.type-select {
+  width: 35%; /* 提交类型占35%宽度 */
+}
+
+.scope-wrapper {
   display: flex;
   align-items: center;
   gap: 5px;
-  width: 100%;
-}
-
-.scope-input {
-  flex-grow: 1;
+  width: 65%; /* 作用域占65%宽度 */
 }
 
 .description-container {
@@ -1653,7 +1610,7 @@ git config --global user.email "your.email@example.com"</pre>
   width: 100%;
 }
 
-.description-input {
+.scope-input, .description-input {
   flex-grow: 1;
 }
 
@@ -1665,7 +1622,6 @@ git config --global user.email "your.email@example.com"</pre>
   background-color: #f5f7fa;
   padding: 10px;
   border-radius: 4px;
-  margin-top: 10px;
 }
 
 .preview-title {
@@ -2091,6 +2047,51 @@ git config --global user.email "your.email@example.com"</pre>
   margin: 8px 0;
   line-height: 1.5;
 }
+
+.advanced-options-toggle {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 8px 0;
+  background-color: #f5f7fa;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  user-select: none;
+}
+
+.advanced-options-toggle:hover {
+  background-color: #ebeef5;
+  color: #409EFF;
+}
+
+.toggle-icon {
+  margin-left: 8px;
+  transition: transform 0.3s ease;
+}
+
+.toggle-icon.is-active {
+  transform: rotate(180deg);
+}
+
+.advanced-fields {
+  margin-top: 10px;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  animation: fade-in 0.3s ease-in-out;
+}
+
+@keyframes fade-in {
+  from {
+    opacity: 0;
+    transform: translateY(-10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
 </style>
 
 <!-- 添加全局样式 -->

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

@@ -447,13 +447,7 @@ function getFileDirectory(path: string): string {
 
 onMounted(() => {
   // App.vue已经加载了Git相关数据，此时只需加载状态
-  // 如果已有初始目录，则只需加载状态
   loadStatus()
-  
-  // 如果是Git仓库，确保分支状态也被加载
-  if (gitStore.isGitRepo) {
-    gitStore.getBranchStatus()
-  }
 })
 
 // 监听autoUpdateEnabled的变化，手动调用toggleAutoUpdate

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

@@ -395,8 +395,7 @@ onMounted(() => {
     // 加载所有可能的作者列表
     fetchAllAuthors()
     
-    // 加载所有可能的分支列表
-    fetchAllBranches()
+    // 不再在这里直接设置 availableBranches，改为通过 watch 监听 gitStore.allBranches 的变化
   } else {
     errorMessage.value = '当前目录不是Git仓库'
   }
@@ -409,6 +408,17 @@ onMounted(() => {
   })
 })
 
+// 添加对 gitStore.allBranches 的监听
+watch(() => gitStore.allBranches, (newBranches) => {
+  if (newBranches && newBranches.length > 0) {
+    availableBranches.value = [...newBranches].sort()
+    console.log(`分支数据更新，共 ${availableBranches.value.length} 个分支`)
+  } else {
+    availableBranches.value = []
+    console.warn('gitStore 中没有分支数据')
+  }
+}, { immediate: true }) // immediate: true 确保组件创建时立即执行一次
+
 onBeforeUnmount(() => {
   // 清除表格滚动监听
   removeTableScrollListener()
@@ -725,16 +735,17 @@ function extractAuthorsFromLogs() {
 async function fetchAllBranches() {
   try {
     console.log('获取所有可用分支...')
-    const response = await fetch('/api/branches')
-    const result = await response.json()
     
-    if (result.branches && Array.isArray(result.branches)) {
+    // 直接调用 gitStore 中的方法获取分支列表
+    await gitStore.getAllBranches()
+    
+    // 从 gitStore 中获取分支列表
+    if (gitStore.allBranches.length > 0) {
       // 更新可用分支列表
-      availableBranches.value = result.branches.sort()
+      availableBranches.value = [...gitStore.allBranches].sort()
       console.log(`获取到${availableBranches.value.length}个分支`)
     } else {
-      console.warn('获取分支列表失败')
-      extractBranchesFromLogs()
+      console.warn('gitStore中没有分支数据')
     }
   } catch (error) {
     console.error('获取分支列表失败:', error)

package/src/ui/client/src/stores/configStore.ts

@@ -0,0 +1,212 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+
+export const useConfigStore = defineStore('config', () => {
+  // 配置状态
+  const defaultCommitMessage = ref('')
+  const descriptionTemplates = ref<string[]>([])
+  const scopeTemplates = ref<string[]>([])
+  const messageTemplates = ref<string[]>([])
+  const isLoading = ref(false)
+  const isLoaded = ref(false)
+
+  // 加载配置
+  async function loadConfig() {
+    // 如果已经加载过，则不再重复加载
+    if (isLoaded.value && !isLoading.value) {
+      console.log('使用缓存的配置信息')
+      return {
+        defaultCommitMessage: defaultCommitMessage.value,
+        descriptionTemplates: descriptionTemplates.value,
+        scopeTemplates: scopeTemplates.value,
+        messageTemplates: messageTemplates.value
+      }
+    }
+
+    try {
+      isLoading.value = true
+      console.log('加载配置信息...')
+      const response = await fetch('/api/config/getConfig')
+      const config = await response.json()
+      
+      // 更新状态
+      defaultCommitMessage.value = config.defaultCommitMessage || ''
+      descriptionTemplates.value = config.descriptionTemplates || []
+      scopeTemplates.value = config.scopeTemplates || []
+      messageTemplates.value = config.messageTemplates || []
+      
+      // 标记为已加载
+      isLoaded.value = true
+      
+      console.log('配置信息加载完成')
+      return config
+    } catch (error) {
+      console.error('加载配置失败:', error)
+      ElMessage.error(`加载配置失败: ${(error as Error).message}`)
+      return null
+    } finally {
+      isLoading.value = false
+    }
+  }
+
+  // 保存默认提交信息
+  async function saveDefaultMessage(message: string) {
+    try {
+      const response = await fetch('/api/config/saveDefaultMessage', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ defaultCommitMessage: message })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        defaultCommitMessage.value = message
+        ElMessage.success('默认提交信息已保存')
+        return true
+      } else {
+        ElMessage.error(`保存失败: ${result.error}`)
+        return false
+      }
+    } catch (error) {
+      ElMessage.error(`保存失败: ${(error as Error).message}`)
+      return false
+    }
+  }
+
+  // 保存模板
+  async function saveTemplate(template: string, type: 'description' | 'scope' | 'message') {
+    try {
+      const response = await fetch('/api/config/save-template', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ template, type })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        // 更新本地模板列表
+        if (type === 'description') {
+          if (!descriptionTemplates.value.includes(template)) {
+            descriptionTemplates.value.push(template)
+          }
+        } else if (type === 'scope') {
+          if (!scopeTemplates.value.includes(template)) {
+            scopeTemplates.value.push(template)
+          }
+        } else if (type === 'message') {
+          if (!messageTemplates.value.includes(template)) {
+            messageTemplates.value.push(template)
+          }
+        }
+        
+        ElMessage.success('模板已保存')
+        return true
+      } else {
+        ElMessage.error(`保存模板失败: ${result.error}`)
+        return false
+      }
+    } catch (error) {
+      ElMessage.error(`保存模板失败: ${(error as Error).message}`)
+      return false
+    }
+  }
+
+  // 删除模板
+  async function deleteTemplate(template: string, type: 'description' | 'scope' | 'message') {
+    try {
+      const response = await fetch('/api/config/delete-template', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ template, type })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        // 更新本地模板列表
+        if (type === 'description') {
+          descriptionTemplates.value = descriptionTemplates.value.filter(t => t !== template)
+        } else if (type === 'scope') {
+          scopeTemplates.value = scopeTemplates.value.filter(t => t !== template)
+        } else if (type === 'message') {
+          messageTemplates.value = messageTemplates.value.filter(t => t !== template)
+        }
+        
+        ElMessage.success('模板已删除')
+        return true
+      } else {
+        ElMessage.error(`删除模板失败: ${result.error}`)
+        return false
+      }
+    } catch (error) {
+      ElMessage.error(`删除模板失败: ${(error as Error).message}`)
+      return false
+    }
+  }
+
+  // 更新模板
+  async function updateTemplate(oldTemplate: string, newTemplate: string, type: 'description' | 'scope' | 'message') {
+    try {
+      const response = await fetch('/api/config/update-template', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ oldTemplate, newTemplate, type })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        // 更新本地模板列表
+        if (type === 'description') {
+          const index = descriptionTemplates.value.indexOf(oldTemplate)
+          if (index !== -1) {
+            descriptionTemplates.value[index] = newTemplate
+          }
+        } else if (type === 'scope') {
+          const index = scopeTemplates.value.indexOf(oldTemplate)
+          if (index !== -1) {
+            scopeTemplates.value[index] = newTemplate
+          }
+        } else if (type === 'message') {
+          const index = messageTemplates.value.indexOf(oldTemplate)
+          if (index !== -1) {
+            messageTemplates.value[index] = newTemplate
+          }
+        }
+        
+        ElMessage.success('模板已更新')
+        return true
+      } else {
+        ElMessage.error(`更新模板失败: ${result.error}`)
+        return false
+      }
+    } catch (error) {
+      ElMessage.error(`更新模板失败: ${(error as Error).message}`)
+      return false
+    }
+  }
+
+  return {
+    // 状态
+    defaultCommitMessage,
+    descriptionTemplates,
+    scopeTemplates,
+    messageTemplates,
+    isLoading,
+    isLoaded,
+    
+    // 方法
+    loadConfig,
+    saveDefaultMessage,
+    saveTemplate,
+    deleteTemplate,
+    updateTemplate
+  }
+}) 

package/src/ui/client/src/stores/gitStore.ts

@@ -2,6 +2,10 @@ import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { ElMessage } from 'element-plus'
 
+// 删除防抖变量
+// let branchStatusDebounceTimer: ReturnType<typeof setTimeout> | null = null;
+// const BRANCH_STATUS_DEBOUNCE_DELAY = 1000; // 1秒防抖延迟
+
 export const useGitStore = defineStore('git', () => {
   // 状态
   const currentBranch = ref('')
@@ -18,6 +22,10 @@ export const useGitStore = defineStore('git', () => {
   const branchBehind = ref(0) // 当前分支落后远程分支的提交数
   const hasUpstream = ref(false) // 当前分支是否有上游分支
   const upstreamBranch = ref('') // 上游分支名称
+  // 添加上次获取分支状态的时间戳
+  const lastBranchStatusTime = ref(0)
+  // 添加上次获取分支列表的时间戳
+  const lastBranchesTime = ref(0)
   
   // 添加重置方法
   function $reset() {
@@ -33,13 +41,17 @@ export const useGitStore = defineStore('git', () => {
     branchBehind.value = 0
     hasUpstream.value = false
     upstreamBranch.value = ''
+    lastBranchStatusTime.value = 0
+    lastBranchesTime.value = 0
   }
 
   // 获取分支状态（领先/落后远程）
-  async function getBranchStatus() {
+  async function getBranchStatus(force = false) {
     if (!isGitRepo.value) return;
     
+    // 移除时间戳缓存判断，简化逻辑
     try {
+      console.log('获取分支状态...');
       const response = await fetch('/api/branch-status');
       const data = await response.json();
       
@@ -49,6 +61,9 @@ export const useGitStore = defineStore('git', () => {
         hasUpstream.value = data.hasUpstream || false;
         upstreamBranch.value = data.upstreamBranch || '';
         
+        // 更新获取时间戳
+        lastBranchStatusTime.value = Date.now();
+        
         // 添加调试日志
         console.log(`分支状态更新：领先 ${branchAhead.value} 个提交，落后 ${branchBehind.value} 个提交，上游分支：${hasUpstream.value ? upstreamBranch.value : '无'}`);
       }
@@ -87,14 +102,13 @@ export const useGitStore = defineStore('git', () => {
   }
 
   // 获取当前分支
-  async function getCurrentBranch() {
+  async function getCurrentBranch(skipBranchStatus = false) {
     try {
       const response = await fetch('/api/branch')
       const data = await response.json()
       if (data.branch) {
         currentBranch.value = data.branch
-        // 获取分支状态信息
-        await getBranchStatus();
+        // 不再在这里调用 getBranchStatus
       }
     } catch (error) {
       console.error('获取分支信息失败:', error)
@@ -102,12 +116,19 @@ export const useGitStore = defineStore('git', () => {
   }
 
   // 获取所有分支
-  async function getAllBranches() {
+  async function getAllBranches(force = false) {
+    if (!isGitRepo.value) return;
+    
+    // 移除时间戳缓存判断，简化逻辑
     try {
+      console.log('获取所有分支...');
       const response = await fetch('/api/branches')
       const data = await response.json()
       if (data.branches && Array.isArray(data.branches)) {
         allBranches.value = data.branches
+        // 更新获取时间戳
+        lastBranchesTime.value = Date.now();
+        console.log(`获取到${data.branches.length}个分支`);
       }
     } catch (error) {
       console.error('获取所有分支信息失败:', error)
@@ -135,8 +156,9 @@ export const useGitStore = defineStore('git', () => {
           type: 'success'
         })
         
-        // 刷新状态
-        getCurrentBranch()
+        // 分别刷新分支信息和分支状态
+        await getCurrentBranch()
+        await getBranchStatus()
         
         return true
       } else {
@@ -202,9 +224,10 @@ export const useGitStore = defineStore('git', () => {
           type: 'success'
         })
         
-        // 刷新状态
-        getCurrentBranch()
-        getAllBranches()
+        // 分别刷新分支信息和状态
+        await getCurrentBranch()
+        await getBranchStatus()
+        await getAllBranches()
         
         return true
       } else {
@@ -225,25 +248,6 @@ export const useGitStore = defineStore('git', () => {
     }
   }
 
-  // 初始化加载
-  async function loadInitialData() {
-    // 先检查当前目录是否是Git仓库
-    const isRepo = await checkGitRepo()
-    
-    // 只有是Git仓库的情况下才加载Git相关信息
-    if (isRepo) {
-      getCurrentBranch()
-      getAllBranches()
-      getUserInfo()
-    } else {
-      // 清空所有Git相关状态
-      currentBranch.value = ''
-      allBranches.value = []
-      userName.value = ''
-      userEmail.value = ''
-    }
-  }
-
   // 清除Git用户配置
   async function clearUserConfig() {
     try {
@@ -340,10 +344,19 @@ export const useGitStore = defineStore('git', () => {
         await getBranchStatus();
         return true;
       } else {
-        ElMessage({
-          message: `拉取失败: ${result.error}`,
-          type: 'error'
-        });
+        // 改进错误提示
+        if (result.needsMerge) {
+          ElMessage({
+            message: `需要合并更改: ${result.pullOutput || '存在冲突需要手动解决'}`,
+            type: 'warning',
+            duration: 5000
+          });
+        } else {
+          ElMessage({
+            message: `拉取失败: ${result.error}`,
+            type: 'error'
+          });
+        }
         return false;
       }
     } catch (error) {
@@ -410,6 +423,8 @@ export const useGitStore = defineStore('git', () => {
     branchBehind,
     hasUpstream,
     upstreamBranch,
+    lastBranchStatusTime,
+    lastBranchesTime,
     
     // 方法
     $reset,
@@ -419,7 +434,6 @@ export const useGitStore = defineStore('git', () => {
     changeBranch,
     getUserInfo,
     createBranch,
-    loadInitialData,
     clearUserConfig,
     restoreUserConfig,
     getBranchStatus,

package/src/ui/server/index.js

@@ -659,7 +659,22 @@ async function startUIServer() {
       const { stdout } = await execGitCommand('git pull');
       res.json({ success: true, message: stdout });
     } catch (error) {
-      res.status(500).json({ success: false, error: error.message });
+      // 改进错误处理，检查是否需要合并
+      const errorMsg = error.message || '';
+      const needsMerge = errorMsg.includes('merge') || 
+                         errorMsg.includes('需要合并') || 
+                         errorMsg.includes('CONFLICT') ||
+                         errorMsg.includes('冲突');
+      
+      // 返回更详细的错误信息和标记
+      res.status(500).json({ 
+        success: false, 
+        error: error.message,
+        needsMerge: needsMerge,
+        // 包含完整的错误输出
+        fullError: error.stderr || error.message,
+        pullOutput: error.stdout || ''
+      });
     }
   });