zen-gitsync 2.0.5 → 2.0.7

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, onMounted, computed, watch } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { Setting, Edit } from "@element-plus/icons-vue";
+import { Setting, Edit, Check, Upload, RefreshRight, Delete, Position } from "@element-plus/icons-vue";
 import { useGitLogStore } from "../stores/gitLogStore";
 import { useGitStore } from "../stores/gitStore";
 
@@ -10,6 +10,8 @@ const gitStore = useGitStore();
 const commitMessage = ref("");
 const isPushing = ref(false);
 // 添加提交并推送的状态变量
+const showPushSuccess = ref(false);
+// 添加placeholder变量
 const placeholder = ref("输入提交信息...");
 // 添加默认提交信息变量
 const defaultCommitMessage = ref("");
@@ -539,6 +541,14 @@ async function commitChanges() {
   }
 }
 
+// 显示推送成功提示
+function showPushSuccessIndicator() {
+  showPushSuccess.value = true;
+  setTimeout(() => {
+    showPushSuccess.value = false;
+  }, 2000);
+}
+
 // 推送到远程 (git push)
 async function pushToRemote() {
   try {
@@ -550,13 +560,16 @@ async function pushToRemote() {
       // 触发成功事件
       gitStore.getCurrentBranch();
       gitLogStore.fetchLog();
+      
+      // 显示成功动画
+      isPushing.value = false
+      showPushSuccessIndicator();
     }
   } catch (error) {
     ElMessage({
       message: `推送失败: ${(error as Error).message}`,
       type: "error",
     });
-  } finally {
     isPushing.value = false
   }
 }
@@ -599,22 +612,28 @@ async function addCommitAndPush() {
   }
 
   try {
+    isPushing.value = true
     await gitLogStore.addCommitAndPush(finalCommitMessage.value, skipHooks.value);
 
-
     // 清空提交信息
     clearCommitFields();
 
     // 触发成功事件
     gitStore.getCurrentBranch();
+    
+    // 确保通过fetchLog获取的是最新的第1页数据
     gitLogStore.fetchLog();
+    
+    // 显示成功动画
+    isPushing.value = false
+    showPushSuccessIndicator();
 
   } catch (error) {
     ElMessage({
       message: `暂存、提交并推送失败: ${(error as Error).message}`,
       type: "error",
     });
-  } finally {
+    isPushing.value = false
   }
 }
 
@@ -675,255 +694,357 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="card">
-    <h2>提交更改</h2>
-
-    <div class="layout-container">
-      <!-- 如果没有配置Git用户信息，显示提示 -->
-      <div v-if="gitStore.userName === '' || gitStore.userEmail === ''" class="git-config-warning">
-        <el-alert
-          title="Git用户信息未配置"
-          type="warning"
-          :closable="false"
-          show-icon
-        >
-          <p>您需要配置Git用户名和邮箱才能提交代码。请使用以下命令配置：</p>
-          <pre class="config-command">git config --global user.name "Your Name"
-git config --global user.email "your.email@example.com"</pre>
-        </el-alert>
+  <div class="card" :class="{ 'is-pushing': gitLogStore.isPushing || isPushing }">
+    <div class="card-header">
+      <h2>提交更改</h2>
+    </div>
+
+    <!-- 添加推送中指示器 -->
+    <transition name="el-fade-in-linear">
+      <div v-if="isPushing" class="pushing-indicator">
+        <div class="pushing-spinner">
+          <svg viewBox="0 0 50 50" class="circular">
+            <circle class="path" cx="25" cy="25" r="20" fill="none" />
+          </svg>
+        </div>
+        <div class="pushing-text">正在推送...</div>
       </div>
-      
-      <!-- 正常的提交区域，仅在Git用户信息已配置时显示 -->
-      <template v-else>
-        <!-- 左侧：提交表单 -->
-        <div class="commit-section">
-          <div class="commit-options">
-            <div class="options-row">
-              <div class="commit-mode-toggle">
-                <el-switch v-model="isStandardCommit" active-text="标准化提交" inactive-text="普通提交" />
-              </div>
+    </transition>
 
-              <div class="no-verify-toggle">
-                <el-tooltip content="跳过 Git 钩子检查 (--no-verify)" placement="top">
-                  <el-switch v-model="skipHooks" active-text="跳过钩子 (--no-verify)" />
-                </el-tooltip>
+    <!-- 添加推送成功指示器 -->
+    <transition name="el-fade-in-linear">
+      <div v-if="showPushSuccess" class="push-success-indicator">
+        <el-icon class="push-success-icon"><Check /></el-icon>
+        <div class="push-success-text">推送成功!</div>
+      </div>
+    </transition>
+
+    <div class="card-content">
+      <div class="layout-container">
+        <!-- 如果没有配置Git用户信息，显示提示 -->
+        <div v-if="gitStore.userName === '' || gitStore.userEmail === ''" class="git-config-warning">
+          <el-alert
+            title="Git用户信息未配置"
+            type="warning"
+            :closable="false"
+            show-icon
+          >
+            <p>您需要配置Git用户名和邮箱才能提交代码。请使用以下命令配置：</p>
+            <pre class="config-command">git config --global user.name "Your Name"
+git config --global user.email "your.email@example.com"</pre>
+          </el-alert>
+        </div>
+        
+        <!-- 正常的提交区域，仅在Git用户信息已配置时显示 -->
+        <template v-else>
+          <!-- 左侧：提交表单 -->
+          <div class="commit-section">
+            <div class="commit-options">
+              <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>
               </div>
             </div>
-          </div>
-
-          <!-- 普通提交表单 -->
-          <div v-if="!isStandardCommit" class="commit-form">
-            <el-input v-model="commitMessage" :placeholder="placeholder" clearable />
-          </div>
 
-          <!-- 标准化提交表单 -->
-          <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>
+            <!-- 普通提交表单 -->
+            <div v-if="!isStandardCommit" class="commit-form">
+              <el-input v-model="commitMessage" :placeholder="placeholder" clearable />
+            </div>
 
-              <div class="description-container">
-                <el-input v-model="commitDescription" placeholder="简短描述（必填）" class="description-input" clearable />
-                <el-button type="primary" :icon="Setting" circle size="small" class="settings-button"
-                  @click="openDescriptionSettings">
-                </el-button>
+            <!-- 标准化提交表单 -->
+            <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>
+
+                <div class="description-container">
+                  <el-input v-model="commitDescription" placeholder="简短描述（必填）" class="description-input" clearable />
+                  <el-button type="primary" :icon="Setting" circle size="small" class="settings-button"
+                    @click="openDescriptionSettings">
+                  </el-button>
+                </div>
               </div>
-            </div>
 
-            <el-input v-model="commitBody" type="textarea" :rows="4" placeholder="正文（可选）：详细描述本次提交的内容和原因" class="body-input"
-              clearable />
+              <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 class="preview-section">
-              <div class="preview-title">提交信息预览：</div>
-              <pre class="preview-content">{{ finalCommitMessage }}</pre>
+              <div class="preview-section">
+                <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 class="preview-title" style="margin-top: 10px;">Git命令预览：</div>
+                <pre class="preview-content code-command">{{ gitCommandPreview }}</pre>
+              </div>
             </div>
           </div>
-        </div>
 
-        <!-- 右侧：操作区域 -->
-        <div class="actions-section">
-          <h3>Git 操作</h3>
-          <div class="action-groups">
-            <div class="action-group">
-              <div class="group-title">基础操作</div>
-              <div class="group-buttons">
-                <el-button 
-                  type="primary" 
-                  @click="addToStage" 
-                  :loading="gitLogStore.isAddingFiles" 
-                  class="action-button"
-                >
-                  暂存更改
-                  <span class="command-text">git add .</span>
-                </el-button>
-
-                <el-button 
-                  type="primary" 
-                  @click="commitChanges" 
-                  :loading="gitLogStore.isLoadingStatus"
-                  class="action-button"
-                >
-                  提交
-                  <span class="command-text">git commit</span>
-                </el-button>
-
-                <el-button 
-                  type="success" 
-                  @click="pushToRemote" 
-                  :loading="gitLogStore.isPushing"
-                  class="action-button push-button"
-                >
-                  推送
-                  <span class="command-text">git push</span>
-                </el-button>
+          <!-- 右侧：操作区域 -->
+          <div class="actions-section">
+            <h3>Git 操作</h3>
+            <div class="action-groups">
+              <div class="operations-wrapper">
+                <!-- 基础操作 -->
+                <div class="action-group">
+                  <div class="group-title">基础操作</div>
+                  <div class="group-buttons">
+                    <el-tooltip content="git add ." placement="top" effect="light" popper-class="git-cmd-tooltip">
+                      <el-button 
+                        type="primary" 
+                        @click="addToStage" 
+                        :loading="gitLogStore.isAddingFiles" 
+                        class="action-button"
+                      >
+                        暂存更改
+                      </el-button>
+                    </el-tooltip>
+
+                    <el-tooltip content="git commit" placement="top" effect="light" popper-class="git-cmd-tooltip">
+                      <el-button 
+                        type="primary" 
+                        @click="commitChanges" 
+                        :loading="gitLogStore.isLoadingStatus"
+                        class="action-button"
+                      >
+                        提交
+                      </el-button>
+                    </el-tooltip>
+
+                    <el-tooltip content="git push" placement="top" effect="light" popper-class="git-cmd-tooltip">
+                      <el-button 
+                        type="primary"
+                        :icon="Upload"
+                        @click="pushToRemote"
+                        :loading="gitLogStore.isPushing"
+                        :class="['action-button', 'push-button', { 'is-loading': gitLogStore.isPushing || isPushing }]"
+                      >
+                        推送
+                      </el-button>
+                    </el-tooltip>
+                  </div>
+                </div>
+
+                <!-- 组合操作 -->
+                <div class="action-group">
+                  <div class="group-title">组合操作</div>
+                  <div class="group-buttons">
+                    <el-tooltip content="git add + git commit" placement="top" effect="light" popper-class="git-cmd-tooltip">
+                      <el-button 
+                        type="primary"
+                        :icon="Edit"
+                        @click="addAndCommit"
+                        :loading="gitLogStore.isAddingFiles || gitLogStore.isCommiting"
+                        class="action-button"
+                      >
+                        暂存并提交
+                      </el-button>
+                    </el-tooltip>
+
+                    <el-tooltip content="git add + git commit + git push" placement="top" effect="light" popper-class="git-cmd-tooltip">
+                      <el-button 
+                        type="success"
+                        :icon="Position"
+                        @click="addCommitAndPush"
+                        :loading="gitLogStore.isAddingFiles || gitLogStore.isCommiting || gitLogStore.isPushing"
+                        :class="['action-button', 'one-click-push', { 'is-loading': gitLogStore.isAddingFiles || gitLogStore.isCommiting || gitLogStore.isPushing }]"
+                      >
+                        一键推送
+                      </el-button>
+                    </el-tooltip>
+                  </div>
+                </div>
               </div>
-            </div>
 
-            <div class="action-group">
-              <div class="group-title">组合操作</div>
-              <div class="group-buttons">
-                <el-button 
-                  type="warning" 
-                  @click="addAndCommit" 
-                  :loading="gitLogStore.isAddingFiles || gitLogStore.isCommiting"
-                  class="action-button"
-                >
-                  暂存并提交
-                  <span class="command-text">git add + commit</span>
-                </el-button>
-
-                <el-button 
-                  type="danger" 
-                  @click="addCommitAndPush" 
-                  :loading="gitLogStore.isAddingFiles || gitLogStore.isCommiting || gitLogStore.isPushing"
-                  class="action-button"
-                >
-                  一键推送
-                  <span class="command-text command-text-long">git add + commit + push</span>
-                </el-button>
+              <!-- 重置操作 -->
+              <div class="action-group reset-group">
+                <div class="group-title">重置操作</div>
+                <div class="group-buttons">
+                  <el-tooltip content="git reset HEAD" placement="top" effect="light" popper-class="git-cmd-tooltip">
+                    <el-button 
+                      type="warning"
+                      :icon="RefreshRight"
+                      @click="gitLogStore.resetHead"
+                      :loading="gitLogStore.isResetting"
+                      class="action-button reset-button"
+                    >
+                      重置暂存区
+                    </el-button>
+                  </el-tooltip>
+
+                  <el-tooltip content="git reset --hard origin/branch" placement="top" effect="light" popper-class="git-cmd-tooltip">
+                    <el-button 
+                      type="danger"
+                      :icon="Delete"
+                      @click="resetToRemote"
+                      :loading="gitLogStore.isResetting"
+                      class="action-button danger-button"
+                    >
+                      重置到远程
+                    </el-button>
+                  </el-tooltip>
+                </div>
               </div>
             </div>
+          </div>
+        </template>
+      </div>
 
-            <div class="action-group">
-              <div class="group-title">重置操作</div>
-              <div class="group-buttons">
-                <!-- <el-button 
-                  type="info" 
-                  @click="resetHead" 
-                  :loading="gitLogStore.isResetting" 
-                  :icon="Refresh"
-                  class="action-button reset-button"
-                >
-                  重置暂存区
-                  <span class="command-text">git reset HEAD</span>
-                </el-button> -->
-
-                <el-button 
-                  type="info" 
-                  @click="resetToRemote" 
-                  :loading="gitLogStore.isResetting" 
-                  class="action-button reset-button"
-                >
-                  重置到远程
-                  <span class="command-text command-text-long">git reset --hard origin/branch</span>
-                </el-button>
-              </div>
+      <!-- 简短描述设置弹窗 -->
+      <el-dialog title="简短描述模板设置" v-model="descriptionDialogVisible" width="80vw" style="height: 80vh">
+        <div class="template-container">
+          <div class="template-form">
+            <el-input v-model="newTemplateName" :placeholder="isEditingDescription ? '编辑模板内容' : '输入新模板内容'"
+              class="template-input" clearable />
+            <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>
-      </template>
-    </div>
 
-    <!-- 简短描述设置弹窗 -->
-    <el-dialog title="简短描述模板设置" v-model="descriptionDialogVisible" width="80vw" style="height: 80vh">
-      <div class="template-container">
-        <div class="template-form">
-          <el-input v-model="newTemplateName" :placeholder="isEditingDescription ? '编辑模板内容' : '输入新模板内容'"
-            class="template-input" clearable />
-          <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 class="template-list">
+            <h3>已保存模板</h3>
+            <el-empty v-if="descriptionTemplates.length === 0" description="暂无保存的模板" />
+            <el-card v-for="(template, index) in descriptionTemplates" :key="index" class="template-item">
+              <!-- 两端对齐 -->
+              <el-row justify="space-between" align="middle" style="width: 100%">
+                <div class="template-content">{{ template }}</div>
+                <div class="template-actions">
+                  <el-button type="primary" size="small" @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" @click="deleteDescriptionTemplate(template)">删除</el-button>
+                </div>
+              </el-row>
+            </el-card>
           </div>
         </div>
-
-        <div class="template-list">
-          <h3>已保存模板</h3>
-          <el-empty v-if="descriptionTemplates.length === 0" description="暂无保存的模板" />
-          <el-card v-for="(template, index) in descriptionTemplates" :key="index" class="template-item">
-            <!-- 两端对齐 -->
-            <el-row justify="space-between" align="middle" style="width: 100%">
-              <div class="template-content">{{ template }}</div>
-              <div class="template-actions">
-                <el-button type="primary" size="small" @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" @click="deleteDescriptionTemplate(template)">删除</el-button>
-              </div>
-            </el-row>
-          </el-card>
-        </div>
-      </div>
-    </el-dialog>
-
-    <!-- 作用域设置弹窗 -->
-    <el-dialog title="作用域模板设置" v-model="scopeDialogVisible" width="80%" style="height: 80vh">
-      <div class="template-container">
-        <div class="template-form">
-          <el-input v-model="newScopeTemplate" :placeholder="isEditingScope ? '编辑作用域模板内容' : '输入新作用域模板'"
-            class="template-input" clearable />
-          <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>
+      </el-dialog>
+
+      <!-- 作用域设置弹窗 -->
+      <el-dialog title="作用域模板设置" v-model="scopeDialogVisible" width="80%" style="height: 80vh">
+        <div class="template-container">
+          <div class="template-form">
+            <el-input v-model="newScopeTemplate" :placeholder="isEditingScope ? '编辑作用域模板内容' : '输入新作用域模板'"
+              class="template-input" clearable />
+            <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>
 
-        <div class="template-list">
-          <h3>已保存作用域</h3>
-          <el-empty v-if="scopeTemplates.length === 0" description="暂无保存的作用域" />
-          <el-card v-for="(template, index) in scopeTemplates" :key="index" class="template-item">
-            <el-row justify="space-between" align="middle" style="width: 100%">
-              <div class="template-content">{{ template }}</div>
-              <div class="template-actions">
-                <el-button type="primary" size="small" @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" @click="deleteScopeTemplate(template)">删除</el-button>
-              </div>
-            </el-row>
-          </el-card>
+          <div class="template-list">
+            <h3>已保存作用域</h3>
+            <el-empty v-if="scopeTemplates.length === 0" description="暂无保存的作用域" />
+            <el-card v-for="(template, index) in scopeTemplates" :key="index" class="template-item">
+              <el-row justify="space-between" align="middle" style="width: 100%">
+                <div class="template-content">{{ template }}</div>
+                <div class="template-actions">
+                  <el-button type="primary" size="small" @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" @click="deleteScopeTemplate(template)">删除</el-button>
+                </div>
+              </el-row>
+            </el-card>
+          </div>
         </div>
-      </div>
-    </el-dialog>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
 <style scoped>
+/* 添加动画相关的CSS */
+@keyframes snakeBorder {
+  0%, 100% {
+    border-top: 2px solid #409EFF;
+    border-right: 2px solid transparent;
+    border-bottom: 2px solid transparent;
+    border-left: 2px solid transparent;
+  }
+  25% {
+    border-top: 2px solid #409EFF;
+    border-right: 2px solid #67C23A;
+    border-bottom: 2px solid transparent;
+    border-left: 2px solid transparent;
+  }
+  50% {
+    border-top: 2px solid transparent;
+    border-right: 2px solid #67C23A;
+    border-bottom: 2px solid #409EFF;
+    border-left: 2px solid transparent;
+  }
+  75% {
+    border-top: 2px solid transparent;
+    border-right: 2px solid transparent;
+    border-bottom: 2px solid #409EFF;
+    border-left: 2px solid #67C23A;
+  }
+}
+
+@keyframes glowPulse {
+  0%, 100% { box-shadow: 0 0 8px rgba(64, 158, 255, 0.4); }
+  50% { box-shadow: 0 0 12px rgba(103, 194, 58, 0.5); }
+}
+
 .card {
   background-color: white;
-  border-radius: 5px;
-  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
-  margin-bottom: 20px;
-  padding: 20px;
+  border-radius: 8px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.03);
+  border: 1px solid rgba(0, 0, 0, 0.03);
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  position: relative;
+}
+
+.card-header {
+  padding: 8px 16px;
+  border-bottom: 1px solid #f0f0f0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 36px;
+}
+
+.card-header h2 {
+  margin: 0;
+  font-size: 16px;
+  font-weight: 500;
+  color: #303133;
+}
+
+.card-content {
+  padding: 15px;
+  overflow-y: auto;
+  flex: 1;
 }
 
 .layout-container {
   display: flex;
-  gap: 20px;
+  flex-direction: column;
+  gap: 15px;
+  height: 100%;
 }
 
 .commit-section {
@@ -932,45 +1053,41 @@ git config --global user.email "your.email@example.com"</pre>
 }
 
 .actions-section {
-  width: 300px;
+  width: 100%;
   flex-shrink: 0;
 }
 
 .actions-section h3 {
   margin-top: 0;
-  margin-bottom: 15px;
-  padding-bottom: 10px;
+  margin-bottom: 10px;
+  padding-bottom: 8px;
   border-bottom: 1px solid #dcdfe6;
-  font-size: 18px;
+  font-size: 16px;
   color: #303133;
   font-weight: 500;
 }
 
-.commit-form {
+.operations-wrapper {
   display: flex;
-  margin-bottom: 15px;
   gap: 10px;
 }
 
-.git-actions {
-  margin-top: 20px;
-}
-
 .action-groups {
   display: flex;
   flex-direction: column;
-  gap: 15px;
+  gap: 12px;
 }
 
 .action-group {
   background-color: #f9f9f9;
-  border-radius: 8px;
-  padding: 12px 15px;
+  border-radius: 6px;
+  padding: 8px 10px;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-  border-left: 4px solid #409EFF;
-  overflow: hidden; /* 确保子元素不会溢出 */
+  border-left: 3px solid #409EFF;
+  flex: 1;
 }
 
+
 .action-group:nth-child(2) {
   border-left-color: #E6A23C;
 }
@@ -980,73 +1097,51 @@ git config --global user.email "your.email@example.com"</pre>
 }
 
 .group-title {
-  font-size: 14px;
+  font-size: 13px;
   font-weight: bold;
-  margin-bottom: 10px;
+  margin-bottom: 8px;
   color: #606266;
   text-align: left;
   display: block;
   position: relative;
-  padding-left: 10px;
+  padding-left: 6px;
   border-bottom: 1px solid rgba(0, 0, 0, 0.06);
-  padding-bottom: 8px;
+  padding-bottom: 6px;
 }
 
 .group-buttons {
   display: flex;
-  flex-direction: column;
+  flex-direction: row;
+  flex-wrap: wrap;
   gap: 8px;
-  padding: 0 2px;
+  padding: 0;
 }
 
 .action-button {
-  position: relative;
-  padding: 14px 0 24px 0;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  height: auto;
-  text-align: center;
-  font-size: 16px;
-  border-radius: 6px;
-  border: none;
+  font-size: 14px;
+  font-weight: 500;
+  flex: 1;
+  min-width: 100px;
+  border-radius: 4px;
+  height: 36px;
+  padding: 0 10px;
 }
 
 .action-button:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+  transform: translateY(-1px);
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.15);
 }
 
 .action-button:active {
   transform: translateY(0);
 }
 
-.action-button :deep(.el-button__content) {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-}
-
-.action-button :deep(.el-icon) {
-  margin-right: 0;
-  margin-bottom: 4px;
-  font-size: 18px;
-}
-
 .command-text {
-  position: absolute;
-  bottom: 6px;
-  font-size: 14px;
-  font-family: monospace;
-  width: 100%;
-  text-align: center;
-  left: 0;
-  white-space: nowrap;
+  display: none;
+}
 
+.command-text-long {
+  display: none;
 }
 
 .standard-commit-form {
@@ -1178,23 +1273,21 @@ git config --global user.email "your.email@example.com"</pre>
   font-size: 14px;
 }
 
-@media (max-width: 768px) {
+@media (min-width: 768px) {
   .layout-container {
-    flex-direction: column;
+    flex-direction: row;
   }
 
-  .actions-section {
-    width: 100%;
+  .commit-section {
+    flex: 3;
   }
-  
-  .group-buttons {
-    flex-direction: row;
-    flex-wrap: wrap;
+
+  .actions-section {
+    width: 320px;
   }
   
-  .action-button {
-    flex: 1;
-    min-width: 120px;
+  .operations-wrapper {
+    flex-direction: column;
   }
 }
 
@@ -1213,7 +1306,25 @@ git config --global user.email "your.email@example.com"</pre>
   white-space: pre;
 }
 
-/* 特定按钮样式 */
+/* 推送时的动画效果 */
+@keyframes pushing-pulse {
+  0% { box-shadow: 0 0 0 0 rgba(103, 194, 58, 0.4); }
+  70% { box-shadow: 0 0 0 15px rgba(103, 194, 58, 0); }
+  100% { box-shadow: 0 0 0 0 rgba(103, 194, 58, 0); }
+}
+
+@keyframes pushing-border {
+  0% { border-color: #67c23a; }
+  50% { border-color: #85ce61; }
+  100% { border-color: #67c23a; }
+}
+
+.card.is-pushing {
+  animation: pushing-border 1.5s infinite ease-in-out;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+  transition: all 0.3s ease;
+}
+
 .push-button {
   background-color: #67c23a;
   border-color: #67c23a;
@@ -1224,6 +1335,82 @@ git config --global user.email "your.email@example.com"</pre>
   border-color: #85ce61;
 }
 
+.push-button.is-loading, 
+.push-button.is-loading:hover, 
+.push-button.is-loading:focus {
+  animation: pushing-pulse 1.5s infinite;
+  background-color: #67c23a !important;
+  border-color: #67c23a !important;
+}
+
+.el-button.push-button.is-loading .el-loading-spinner {
+  color: #fff !important;
+}
+
+/* 一键推送按钮动画 */
+@keyframes one-click-push-glow {
+  0% { box-shadow: 0 0 5px rgba(103, 194, 58, 0.5); }
+  50% { box-shadow: 0 0 20px rgba(103, 194, 58, 0.8); }
+  100% { box-shadow: 0 0 5px rgba(103, 194, 58, 0.5); }
+}
+
+.action-button.one-click-push {
+  position: relative;
+  overflow: hidden;
+}
+
+.action-button.one-click-push.is-loading, 
+.action-button.one-click-push.is-loading:hover {
+  animation: one-click-push-glow 1.5s infinite;
+  background-color: #67c23a !important;
+  border-color: #67c23a !important;
+}
+
+/* 推送成功动画 */
+@keyframes push-success {
+  0% { transform: scale(1); }
+  50% { transform: scale(1.1); }
+  100% { transform: scale(1); }
+}
+
+.push-success-indicator {
+  position: absolute;
+  inset: 0; /* 同时设置top, right, bottom, left为0 */
+  margin: auto;
+  background-color: rgba(255, 255, 255, 0.95);
+  border-radius: 12px;
+  padding: 20px 30px;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.15);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  animation: push-success 0.5s ease-out;
+  z-index: 9999;
+  width: 200px;
+  height: 200px;
+}
+
+.push-success-icon {
+  font-size: 64px;
+  color: #67c23a;
+  margin-bottom: 16px;
+  animation: bounce 0.8s ease-in-out;
+}
+
+@keyframes bounce {
+  0%, 20%, 50%, 80%, 100% {transform: translateY(0);}
+  40% {transform: translateY(-20px);}
+  60% {transform: translateY(-10px);}
+}
+
+.push-success-text {
+  font-size: 20px;
+  font-weight: bold;
+  color: #303133;
+  text-align: center;
+}
+
 .reset-button {
   background-color: #909399;
   border-color: #909399;
@@ -1236,4 +1423,85 @@ git config --global user.email "your.email@example.com"</pre>
 .el-button+.el-button {
   margin-left: 0;
 }
+
+/* 推送中动画样式 */
+.pushing-indicator {
+  position: absolute;
+  inset: 0;
+  margin: auto;
+  background-color: rgba(64, 158, 255, 0.95);
+  border-radius: 12px;
+  padding: 20px 30px;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.15);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+  width: 200px;
+  height: 200px;
+  color: white;
+}
+
+.pushing-spinner {
+  margin-bottom: 16px;
+}
+
+.pushing-text {
+  font-size: 20px;
+  font-weight: bold;
+  text-align: center;
+}
+
+.circular {
+  height: 64px;
+  width: 64px;
+  animation: pushing-rotate 2s linear infinite;
+}
+
+.path {
+  stroke: white;
+  stroke-width: 4;
+  stroke-linecap: round;
+  stroke-dasharray: 90, 150;
+  stroke-dashoffset: 0;
+  animation: pushing-dash 1.5s ease-in-out infinite;
+}
+
+@keyframes pushing-rotate {
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes pushing-dash {
+  0% {
+    stroke-dasharray: 1, 150;
+    stroke-dashoffset: 0;
+  }
+  50% {
+    stroke-dasharray: 90, 150;
+    stroke-dashoffset: -35;
+  }
+  100% {
+    stroke-dasharray: 90, 150;
+    stroke-dashoffset: -124;
+  }
+}
+</style>
+
+<!-- 添加全局样式 -->
+<style>
+/* Git命令tooltip样式 */
+.git-cmd-tooltip {
+  font-family: 'Consolas', 'Courier New', monospace !important;
+  font-size: 13px !important;
+  font-weight: 500 !important;
+  color: #303133 !important;
+  background-color: #f5f7fa !important;
+  border: 1px solid #dcdfe6 !important;
+  border-radius: 4px !important;
+  padding: 8px 12px !important;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1) !important;
+}
 </style>