zen-gitsync 2.0.6 → 2.0.8

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

@@ -255,12 +255,20 @@ export const useGitLogStore = defineStore('gitLog', () => {
     try {
       isLoadingLog.value = true
       console.log('开始加载提交历史...')
-      const response = await fetch('/api/log')
+      
+      // 增加时间戳参数避免缓存，确保获取最新数据
+      const timestamp = new Date().getTime()
+      const response = await fetch(`/api/log?page=1&_t=${timestamp}`)
       const data = await response.json()
-      if (data && Array.isArray(data)) {
-        log.value = data
+      
+      if (data && data.data && Array.isArray(data.data)) {
+        // 清空并更新日志数组
+        log.value = [...data.data]
+        console.log(`提交历史加载完成，共 ${log.value.length} 条记录`)
+      } else {
+        console.warn('API返回的提交历史格式不正确:', data)
+        log.value = [] // 如果数据格式不对，清空日志
       }
-      console.log(`提交历史加载完成，共 ${log.value.length} 条记录`)
       
       if (showMessage) {
         ElMessage({
@@ -487,7 +495,7 @@ export const useGitLogStore = defineStore('gitLog', () => {
     return new Promise(resolve => setTimeout(resolve, ms))
   }
   
-  // 提交更改
+  // 提交更改 (git commit)
   async function commitChanges(message: string, noVerify = false) {
     // 检查是否是Git仓库
     if (!gitStore.isGitRepo) {
@@ -520,6 +528,9 @@ export const useGitLogStore = defineStore('gitLog', () => {
         fetchStatus()
         fetchLog()
         
+        // 更新分支状态
+        gitStore.getBranchStatus()
+        
         return true
       } else {
         ElMessage({
@@ -565,6 +576,9 @@ export const useGitLogStore = defineStore('gitLog', () => {
         // 刷新日志
         fetchLog()
         
+        // 更新分支状态
+        gitStore.getBranchStatus()
+        
         return true
       } else {
         ElMessage({
@@ -632,6 +646,12 @@ export const useGitLogStore = defineStore('gitLog', () => {
         message: `操作失败: ${(error as Error).message}`,
         type: 'error'
       })
+      
+      // 即使出错也要刷新状态
+      fetchStatus()
+      fetchLog()
+      gitStore.getBranchStatus()
+      
       return false
     }
   }

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

@@ -13,6 +13,12 @@ export const useGitStore = defineStore('git', () => {
   const isGitRepo = ref(false) // 当前目录是否是Git仓库
   const lastCheckedTime = ref(0) // 上次检查Git仓库状态的时间戳
   
+  // 添加分支状态相关变量
+  const branchAhead = ref(0) // 当前分支领先远程分支的提交数
+  const branchBehind = ref(0) // 当前分支落后远程分支的提交数
+  const hasUpstream = ref(false) // 当前分支是否有上游分支
+  const upstreamBranch = ref('') // 上游分支名称
+  
   // 添加重置方法
   function $reset() {
     currentBranch.value = ''
@@ -23,6 +29,37 @@ export const useGitStore = defineStore('git', () => {
     isCreatingBranch.value = false
     isGitRepo.value = false
     lastCheckedTime.value = 0
+    branchAhead.value = 0
+    branchBehind.value = 0
+    hasUpstream.value = false
+    upstreamBranch.value = ''
+  }
+
+  // 获取分支状态（领先/落后远程）
+  async function getBranchStatus() {
+    if (!isGitRepo.value) return;
+    
+    try {
+      const response = await fetch('/api/branch-status');
+      const data = await response.json();
+      
+      if (data) {
+        branchAhead.value = data.ahead || 0;
+        branchBehind.value = data.behind || 0;
+        hasUpstream.value = data.hasUpstream || false;
+        upstreamBranch.value = data.upstreamBranch || '';
+        
+        // 添加调试日志
+        console.log(`分支状态更新：领先 ${branchAhead.value} 个提交，落后 ${branchBehind.value} 个提交，上游分支：${hasUpstream.value ? upstreamBranch.value : '无'}`);
+      }
+    } catch (error) {
+      console.error('获取分支状态失败:', error);
+      // 出错时重置状态
+      branchAhead.value = 0;
+      branchBehind.value = 0;
+      hasUpstream.value = false;
+      upstreamBranch.value = '';
+    }
   }
 
   // 检查当前目录是否是Git仓库
@@ -56,6 +93,8 @@ export const useGitStore = defineStore('git', () => {
       const data = await response.json()
       if (data.branch) {
         currentBranch.value = data.branch
+        // 获取分支状态信息
+        await getBranchStatus();
       }
     } catch (error) {
       console.error('获取分支信息失败:', error)
@@ -275,6 +314,88 @@ export const useGitStore = defineStore('git', () => {
     }
   }
 
+  // 执行git pull操作
+  async function gitPull() {
+    if (!isGitRepo.value) {
+      ElMessage({
+        message: '当前目录不是Git仓库',
+        type: 'warning'
+      });
+      return false;
+    }
+
+    try {
+      const response = await fetch('/api/pull', {
+        method: 'POST'
+      });
+      
+      const result = await response.json();
+      if (result.success) {
+        ElMessage({
+          message: '拉取成功',
+          type: 'success'
+        });
+        
+        // 刷新分支状态
+        await getBranchStatus();
+        return true;
+      } else {
+        ElMessage({
+          message: `拉取失败: ${result.error}`,
+          type: 'error'
+        });
+        return false;
+      }
+    } catch (error) {
+      ElMessage({
+        message: `拉取失败: ${(error as Error).message}`,
+        type: 'error'
+      });
+      return false;
+    }
+  }
+
+  // 执行git fetch --all操作
+  async function gitFetchAll() {
+    if (!isGitRepo.value) {
+      ElMessage({
+        message: '当前目录不是Git仓库',
+        type: 'warning'
+      });
+      return false;
+    }
+
+    try {
+      const response = await fetch('/api/fetch-all', {
+        method: 'POST'
+      });
+      
+      const result = await response.json();
+      if (result.success) {
+        ElMessage({
+          message: '获取所有远程分支信息成功',
+          type: 'success'
+        });
+        
+        // 刷新分支状态
+        await getBranchStatus();
+        return true;
+      } else {
+        ElMessage({
+          message: `获取远程分支信息失败: ${result.error}`,
+          type: 'error'
+        });
+        return false;
+      }
+    } catch (error) {
+      ElMessage({
+        message: `获取远程分支信息失败: ${(error as Error).message}`,
+        type: 'error'
+      });
+      return false;
+    }
+  }
+
   return {
     // 状态
     currentBranch,
@@ -285,6 +406,10 @@ export const useGitStore = defineStore('git', () => {
     isCreatingBranch,
     isGitRepo,
     lastCheckedTime,
+    branchAhead,
+    branchBehind,
+    hasUpstream,
+    upstreamBranch,
     
     // 方法
     $reset,
@@ -296,6 +421,9 @@ export const useGitStore = defineStore('git', () => {
     createBranch,
     loadInitialData,
     clearUserConfig,
-    restoreUserConfig
+    restoreUserConfig,
+    getBranchStatus,
+    gitPull,
+    gitFetchAll
   }
 })