From 18db27a22c29edd78addd244fb60c43c67469f38 Mon Sep 17 00:00:00 2001
From: cfq <cfq@qq.com>
Date: Wed, 28 Jan 2026 20:00:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(git):=20=E5=9C=A8=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8DGit=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E5=B9=B6=E6=94=B9=E8=BF=9B=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增获取当前分支的API接口和前端状态管理
- 在Git面板顶部显示当前分支名称和图标
- 重新组织操作按钮布局，将远程仓库和刷新按钮移至顶部工具栏
- 为状态列表添加文件数量统计
- 优化响应式布局，使拉取/推送按钮等宽显示
---
 public/preload/services.js  |  4 ++
 src/components/GitPanel.vue | 87 +++++++++++++++++++++++++++++++------
 src/composables/useGit.js   | 14 ++++++
 3 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/public/preload/services.js b/public/preload/services.js
index 0b12fd1..61177f2 100644
--- a/public/preload/services.js
+++ b/public/preload/services.js
@@ -176,6 +176,10 @@ window.services = {
     return this.execGit("-c core.quotePath=false status --short", dirPath);
   },
 
+  async gitBranch(dirPath) {
+    return this.execGit("branch --show-current", dirPath);
+  },
+
   async gitAdd(dirPath, files = ".") {
     return this.execGit(`add ${files}`, dirPath);
   },
diff --git a/src/components/GitPanel.vue b/src/components/GitPanel.vue
index aa49ec4..9117da1 100644
--- a/src/components/GitPanel.vue
+++ b/src/components/GitPanel.vue
@@ -5,28 +5,39 @@
     </div>
     
     <div v-else class="git-content">
+      <div class="git-header">
+        <div class="git-branch" v-if="state.branch">
+          <BranchesOutlined />
+          <span class="branch-name">{{ state.branch }}</span>
+        </div>
+        <div class="git-toolbar">
+          <a-button @click="openRemoteUrl" :disabled="!state.remoteUrl" title="打开 Git 仓库" size="small">
+            <template #icon><GithubOutlined /></template>
+          </a-button>
+          <a-button @click="handleRefresh" :loading="state.loading" size="small">
+            <template #icon><ReloadOutlined /></template>
+          </a-button>
+        </div>
+      </div>
+
       <div class="git-actions">
-        <a-button-group>
-          <a-button @click="handlePull" :loading="state.loading">
+        <a-button-group class="action-group">
+          <a-button @click="handlePull" :loading="state.loading" block>
             <template #icon><ArrowDownOutlined /></template>
             拉取
           </a-button>
-          <a-button @click="handlePush" :loading="state.loading">
+          <a-button @click="handlePush" :loading="state.loading" block>
             <template #icon><ArrowUpOutlined /></template>
             推送
           </a-button>
-          <a-button @click="openRemoteUrl" :disabled="!state.remoteUrl" title="打开 Git 仓库">
-            <template #icon><GithubOutlined /></template>
-          </a-button>
         </a-button-group>
-        
-        <a-button @click="handleRefresh" :loading="state.loading">
-          <template #icon><ReloadOutlined /></template>
-        </a-button>
       </div>
       
       <div class="git-status">
-        <h3>状态</h3>
+        <div class="status-header">
+          <h3>状态</h3>
+          <span class="status-count" v-if="state.statusFiles.length">{{ state.statusFiles.length }}</span>
+        </div>
         <div class="status-list" v-if="state.statusFiles.length > 0">
           <div v-for="(file, index) in state.statusFiles" :key="index" class="status-item">
             <span class="status-badge" :class="getStatusClass(file.status)">{{ file.status }}</span>
@@ -60,7 +71,7 @@
 
 <script setup>
 import { ref, onMounted, watch } from 'vue';
-import { ArrowDownOutlined, ArrowUpOutlined, ReloadOutlined, GithubOutlined } from '@ant-design/icons-vue';
+import { ArrowDownOutlined, ArrowUpOutlined, ReloadOutlined, GithubOutlined, BranchesOutlined } from '@ant-design/icons-vue';
 import { useGit } from '../composables/useGit';
 import { useFileTree } from '../composables/useFileTree';
 import { message } from 'ant-design-vue';
@@ -143,16 +154,66 @@ const getStatusClass = (status) => {
   text-align: center;
 }
 
-.git-actions {
+.git-header {
   display: flex;
   justify-content: space-between;
+  align-items: center;
+  margin-bottom: 16px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid var(--border-color);
+}
+
+.git-branch {
+  display: flex;
+  align-items: center;
+  font-weight: bold;
+  color: var(--primary-color, #1890ff);
+}
+
+.branch-name {
+  margin-left: 6px;
+}
+
+.git-toolbar {
+  display: flex;
+  gap: 8px;
+}
+
+.git-actions {
   margin-bottom: 20px;
 }
 
+.action-group {
+  display: flex;
+  width: 100%;
+}
+
+.action-group .ant-btn {
+  flex: 1;
+}
+
 .git-status {
   margin-bottom: 20px;
 }
 
+.status-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.status-header h3 {
+  margin: 0;
+}
+
+.status-count {
+  background-color: var(--border-color);
+  padding: 2px 6px;
+  border-radius: 10px;
+  font-size: 12px;
+}
+
 .status-list {
   border: 1px solid var(--border-color);
   border-radius: 4px;
diff --git a/src/composables/useGit.js b/src/composables/useGit.js
index ac59729..e8d7759 100644
--- a/src/composables/useGit.js
+++ b/src/composables/useGit.js
@@ -5,6 +5,7 @@ const state = reactive({
   statusOutput: '',
   statusFiles: [],
   remoteUrl: '',
+  branch: '',
   loading: false
 });
 
@@ -17,6 +18,18 @@ export function useGit() {
         // 自动获取一次状态
         await getStatus(rootDir);
         await getRemoteUrl(rootDir);
+        await getBranch(rootDir);
+    }
+  };
+
+  const getBranch = async (rootDir) => {
+    try {
+      const res = await window.services.gitBranch(rootDir);
+      if (res.success) {
+        state.branch = res.stdout.trim();
+      }
+    } catch (e) {
+      console.error("Failed to get branch", e);
     }
   };
 
@@ -97,6 +110,7 @@ export function useGit() {
     checkGitRepo,
     getStatus,
     getRemoteUrl,
+    getBranch,
     openRemoteUrl,
     commit,
     push,