zen-gitsync 2.0.4 → 2.0.5

package/package.json

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

package/src/ui/client/components.d.ts

@@ -9,6 +9,7 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     CommitForm: typeof import('./src/components/CommitForm.vue')['default']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElDialog: typeof import('element-plus/es')['ElDialog']

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

@@ -4,7 +4,7 @@ import GitStatus from './components/GitStatus.vue'
 import CommitForm from './components/CommitForm.vue'
 import LogList from './components/LogList.vue'
 import { ElMessage } from 'element-plus'
-import { Plus } from '@element-plus/icons-vue'
+import { Plus, Setting } from '@element-plus/icons-vue'
 import logo from './assets/logo.svg'
 import { useGitStore } from './stores/gitStore'
 
@@ -81,40 +81,6 @@ onMounted(async () => {
   }
 })
 
-// 处理提交成功事件
-function handleCommitSuccess() {
-  // 不再调用gitLogStore.fetchLog()，改用更新LogList组件
-  
-  // 刷新Git状态
-  if (gitStatusRef.value) {
-    gitStatusRef.value.refreshStatus()
-  }
-  
-  // 直接刷新提交历史
-  if (logListRef.value) {
-    logListRef.value.refreshLog()
-  }
-}
-
-// 处理推送成功事件
-function handlePushSuccess() {
-  // 不再调用gitLogStore.fetchLog()，改用更新LogList组件
-  gitStore.getCurrentBranch()
-  
-  // 直接刷新提交历史
-  if (logListRef.value) {
-    logListRef.value.refreshLog()
-  }
-}
-
-// 处理状态更新事件
-function handleStatusUpdate() {
-  // 刷新Git状态
-  if (gitStatusRef.value) {
-    gitStatusRef.value.refreshStatus()
-  }
-}
-
 const createBranchDialogVisible = ref(false)
 const newBranchName = ref('')
 const selectedBaseBranch = ref('')
@@ -164,6 +130,40 @@ async function handleBranchChange(branch: string) {
     }
   }
 }
+
+// 添加用户设置相关状态
+const userSettingsDialogVisible = ref(false)
+const tempUserName = ref('')
+const tempUserEmail = ref('')
+
+// 打开用户设置对话框
+function openUserSettingsDialog() {
+  tempUserName.value = gitStore.userName
+  tempUserEmail.value = gitStore.userEmail
+  userSettingsDialogVisible.value = true
+}
+
+// 保存用户设置
+async function saveUserSettings() {
+  if (!tempUserName.value || !tempUserEmail.value) {
+    ElMessage.warning('用户名和邮箱不能为空')
+    return
+  }
+
+  const success = await gitStore.restoreUserConfig(tempUserName.value, tempUserEmail.value)
+  if (success) {
+    userSettingsDialogVisible.value = false
+  }
+}
+
+// 清除用户配置
+async function clearUserSettings() {
+  const success = await gitStore.clearUserConfig()
+  if (success) {
+    tempUserName.value = ''
+    tempUserEmail.value = ''
+  }
+}
 </script>
 
 <template>
@@ -177,6 +177,28 @@ async function handleBranchChange(branch: string) {
         <span class="user-label">用户:</span>
         <span class="user-name">{{ gitStore.userName }}</span>
         <span class="user-email">&lt;{{ gitStore.userEmail }}&gt;</span>
+        <el-button 
+          type="primary" 
+          size="small" 
+          @click="openUserSettingsDialog"
+          class="user-settings-btn"
+          circle
+        >
+          <el-icon><Setting /></el-icon>
+        </el-button>
+      </div>
+      <div id="user-info" v-else>
+        <span class="user-label">用户: </span>
+        <span class="user-warning">未配置</span>
+        <el-button 
+          type="primary" 
+          size="small" 
+          @click="openUserSettingsDialog"
+          class="user-settings-btn"
+          circle
+        >
+          <el-icon><Setting /></el-icon>
+        </el-button>
       </div>
       <!-- <div id="config-info">{{ configInfo }}</div> -->
     </div>
@@ -203,12 +225,33 @@ async function handleBranchChange(branch: string) {
       
       <!-- 右侧提交表单和历史 -->
       <div class="right-panel" v-if="gitStore.isGitRepo">
-        <CommitForm 
-          @commit-success="handleCommitSuccess" 
-          @push-success="handlePushSuccess"
-          @status-update="handleStatusUpdate"
-        />
-        <LogList ref="logListRef" />
+        <!-- 当用户未配置时显示配置提示 -->
+        <div v-if="!gitStore.userName || !gitStore.userEmail" class="card">
+          <h2>Git用户未配置</h2>
+          <p>请先配置Git用户信息才能进行提交操作。</p>
+          <div class="tips">
+            <h3>您可以通过以下方式配置：</h3>
+            <ol>
+              <li>点击右上角的设置按钮，配置用户名和邮箱</li>
+              <li>或者使用命令行配置：</li>
+              <div class="code-block">
+                git config --global user.name "您的用户名"<br>
+                git config --global user.email "您的邮箱"
+              </div>
+            </ol>
+            <el-button 
+              type="primary" 
+              @click="openUserSettingsDialog"
+            >
+              立即配置
+            </el-button>
+          </div>
+        </div>
+        <!-- 用户已配置显示提交表单 -->
+        <template v-else>
+          <CommitForm />
+          <LogList ref="logListRef" />
+        </template>
       </div>
       <div class="right-panel" v-else>
         <div class="card">
@@ -263,34 +306,80 @@ async function handleBranchChange(branch: string) {
 
   <footer class="main-footer">
     <div class="branch-info" v-if="gitStore.currentBranch">
-      <span class="branch-label">当前分支:</span>
-      <el-select 
-        v-model="gitStore.currentBranch" 
-        size="small" 
-        @change="handleBranchChange"
-        :loading="gitStore.isChangingBranch"
-        class="branch-select"
-      >
-        <el-option 
-          v-for="branch in gitStore.allBranches" 
-          :key="branch" 
-          :label="branch" 
-          :value="branch"
-        />
-      </el-select>
-      <el-button 
-        type="primary" 
-        size="small" 
-        @click="openCreateBranchDialog"
-        style="margin-left: 5px;"
-      >
-        <el-icon><Plus /></el-icon>
-      </el-button>
+      <div class="branch-wrapper">
+        <span class="branch-label">当前分支:</span>
+        <el-select 
+          v-model="gitStore.currentBranch" 
+          size="small" 
+          @change="handleBranchChange"
+          :loading="gitStore.isChangingBranch"
+          class="branch-select"
+        >
+          <el-option 
+            v-for="branch in gitStore.allBranches" 
+            :key="branch" 
+            :label="branch" 
+            :value="branch"
+          />
+        </el-select>
+        <el-button 
+          type="primary" 
+          size="small" 
+          @click="openCreateBranchDialog"
+          class="create-branch-btn"
+        >
+          <el-icon><Plus /></el-icon>
+          新建分支
+        </el-button>
+      </div>
     </div>
     <div class="footer-right">
       <!-- <span>Zen GitSync © 2024</span> -->
     </div>
   </footer>
+
+  <!-- 用户设置对话框 -->
+  <el-dialog
+    v-model="userSettingsDialogVisible"
+    title="Git用户设置"
+    width="30%"
+    destroy-on-close
+  >
+    <el-form>
+      <el-form-item label="用户名">
+        <el-input v-model="tempUserName" placeholder="请输入Git用户名" />
+      </el-form-item>
+      <el-form-item label="邮箱">
+        <el-input v-model="tempUserEmail" placeholder="请输入Git邮箱" />
+      </el-form-item>
+      <el-form-item>
+        <el-alert
+          type="info"
+          :closable="false"
+          show-icon
+        >
+          这些设置将影响全局Git配置，对所有Git仓库生效。
+        </el-alert>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button 
+          type="danger" 
+          @click="clearUserSettings"
+        >
+          清除配置
+        </el-button>
+        <el-button @click="userSettingsDialogVisible = false">取消</el-button>
+        <el-button 
+          type="primary" 
+          @click="saveUserSettings"
+        >
+          保存
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <style>
@@ -443,10 +532,10 @@ h1 {
   font-size: 12px;
 }
 /* 添加分支选择框样式 */
-.branch-select {
+/* .branch-select {
   width: 150px;
   margin-left: 5px;
-}
+} */
 
 /* 调整下拉选择框在深色背景下的样式 */
 .branch-select :deep(.el-input__inner) {
@@ -506,6 +595,15 @@ h1 {
   font-size: 18px;
   color: #606266;
 }
+
+.user-settings-btn {
+  margin-left: 10px;
+}
+
+.user-warning {
+  color: #E6A23C;
+  font-weight: bold;
+}
 </style>
 
 <style scoped>
@@ -528,15 +626,63 @@ h1 {
   left: 0;
   right: 0;
   z-index: 100;
+  box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1);
 }
 
 .branch-info {
   display: flex;
   align-items: center;
+  gap: 10px;
+}
+
+.branch-wrapper {
+  display: flex;
+  align-items: center;
+  background-color: rgba(255, 255, 255, 0.15);
+  border-radius: 4px;
+  padding: 8px 12px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  transition: all 0.3s;
+}
+
+.branch-wrapper:hover {
+  background-color: rgba(255, 255, 255, 0.2);
+}
+
+.branch-label {
+  font-weight: bold;
+  margin-right: 10px;
+  color: #ffffff;
+}
+
+.branch-select {
+  width: 200px;
+  margin-right: 10px;
+}
+
+.create-branch-btn {
+  background-color: #2ea44f;
+  border-color: #2ea44f;
+  transition: all 0.3s;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
+
+.create-branch-btn:hover {
+  background-color: #3bbc63;
+  border-color: #3bbc63;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
 }
 
 .footer-right {
-  color: rgba(255, 255, 255, 0.7);
-  font-size: 12px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  color: rgba(255, 255, 255, 0.9);
+  font-size: 13px;
+  background-color: rgba(255, 255, 255, 0.1);
+  padding: 8px 12px;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
 }
 </style>