feat(company): add new company creation modal and delete functionality, fix test isolation issue

Yi Bo
1 parent 91d38a5c
Showing 5 changed files with 120 additions and 3 deletions
server/routes/company.js
server/services/company-service.js
server/services/skill-db.js
web/src/components/AppNav.vue
web/src/views/CompanyDashboard.vue
@@ -641,6 +641,13 @@ router.put(&#39;/:companyId&#39;, (req, res) =&gt; {
   res.json({ success: true, company });
 });
  
+// DELETE /api/company/:companyId
+router.delete('/:companyId', (req, res) => {
+  const company = companyService.delete(req.params.companyId);
+  if (!company) return res.status(404).json({ error: '公司不存在' });
+  res.json({ success: true, company });
+});
+
 // POST /api/company/:companyId/shutdown
 router.post('/:companyId/shutdown', (req, res) => {
   const company = companyService.shutdown(req.params.companyId);
@@ -154,6 +154,23 @@ class CompanyService {
     return company;
   }
  
+  /**
+   * 删除公司 (仅删除 company.json 定义即可，暂时不清理目录数据)
+   */
+  delete(companyId) {
+    const company = this.get(companyId);
+    if (!company) return null;
+
+    const fp = path.join(DATA_DIR, companyId, 'company.json');
+    if (fs.existsSync(fp)) {
+      // 通过重命名或者直接删除 company.json 来让 list 无法读取
+      fs.renameSync(fp, path.join(DATA_DIR, companyId, 'company.deleted.json'));
+    }
+
+    console.log(`[Company] 🗑️ 删除公司: ${companyId}`);
+    return company;
+  }
+
   // ═══════════════════════════════════════
   //  Agent 招聘系统 (Hiring Pipeline)
   // ═══════════════════════════════════════
@@ -18,7 +18,7 @@ const config = require(&#39;../config&#39;);
 const { initSkillDir, getTargetDir, resolveSkillDir } = require('./skill-dir-manager');
  
 const DATA_DIR = path.resolve(__dirname, '../../../data');
-const DB_PATH = path.join(DATA_DIR, 'skills.sqlite');
+const DB_PATH = process.env.SKILLS_DB_PATH || path.join(DATA_DIR, 'skills.sqlite');
  
 let db = null;
  
@@ -41,8 +41,8 @@
             <div v-if="companies.length === 0" class="nav-dropdown-item text-muted">暂无公司</div>
           </div>
           <div class="nav-dropdown-divider"></div>
-          <div class="nav-dropdown-item create-action" style="cursor:default; border:none; opacity: 0.6;">
-             请唤醒 MasterBot 自动创建
+          <div class="nav-dropdown-item create-action clickable" @click="showNewCompanyModal = true; showDropdown = false">
+             ＋ 新增公司
           </div>
         </div>
       </div>
@@ -79,12 +79,44 @@
       </button>
       <span class="nav-version">v5.0</span>
     </div>
+
+    <!-- New Company Modal -->
+    <div v-if="showNewCompanyModal" class="nav-modal-overlay" @click="showNewCompanyModal = false">
+      <div class="nav-modal-content" @click.stop>
+        <div class="nav-modal-header">
+          <h3>新增空壳公司</h3>
+          <button class="nav-modal-close" @click="showNewCompanyModal = false">✕</button>
+        </div>
+        <div class="nav-modal-body">
+          <div class="form-group">
+            <label>公司 ID (小写字母/数字)</label>
+            <input v-model="newCompanyForm.id" placeholder="例如: my-company" />
+          </div>
+          <div class="form-group">
+            <label>公司名称</label>
+            <input v-model="newCompanyForm.name" placeholder="例如: 柠檬科技有限公司" />
+          </div>
+          <div class="form-group">
+            <label>公司简介</label>
+            <textarea v-model="newCompanyForm.description" placeholder="简要描述公司的主要业务..." rows="3"></textarea>
+          </div>
+          <p class="nav-modal-tip">创建成功后将是空壳公司，需唤醒 MasterBot 招聘员工。</p>
+        </div>
+        <div class="nav-modal-footer">
+          <button class="nav-btn-cancel" @click="showNewCompanyModal = false">取消</button>
+          <button class="nav-btn-submit" :disabled="isCreatingCompany" @click="submitNewCompany">
+            {{ isCreatingCompany ? '⏳ 创建中...' : '🎉 确认创建' }}
+          </button>
+        </div>
+      </div>
+    </div>
   </nav>
 </template>
  
 <script setup>
 import { ref, computed, watch, onMounted, onUnmounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import axios from 'axios'
 import { useTheme } from '@/composables/useTheme'
 import { useCompanies } from '@/composables/useCompanies'
  
@@ -94,6 +126,9 @@ const { themeMode, cycleTheme } = useTheme()
 const { companies, loadCompanies, activeCompanyId, setActiveCompany } = useCompanies()
  
 const showDropdown = ref(false)
+const showNewCompanyModal = ref(false)
+const isCreatingCompany = ref(false)
+const newCompanyForm = ref({ id: '', name: '', description: '' })
  
 const themeIcon = computed(() => {
   if (themeMode.value === 'light') return '☀️'
@@ -135,6 +170,24 @@ onMounted(async () =&gt; {
 onUnmounted(() => {
   document.removeEventListener('click', closeDropdown)
 })
+
+async function submitNewCompany() {
+  if (!newCompanyForm.value.id || !newCompanyForm.value.name) return alert('请填写公司ID和名称')
+  isCreatingCompany.value = true
+  try {
+    const res = await axios.post('/api/company/create', newCompanyForm.value)
+    if (res.data.success) {
+      alert('创建成功')
+      showNewCompanyModal.value = false
+      await loadCompanies()
+      router.push(`/${res.data.company.id}/overview`)
+      newCompanyForm.value = { id: '', name: '', description: '' }
+    }
+  } catch(e) {
+    alert('创建失败: ' + (e.response?.data?.error || e.message))
+  }
+  isCreatingCompany.value = false
+}
 </script>
  
 <style scoped>
@@ -198,4 +251,23 @@ onUnmounted(() =&gt; {
 }
 .theme-btn:hover { background: var(--bg-surface-hover); transform: scale(1.1); }
 .nav-version { font-size: 10px; color: var(--text-faint); padding: 2px 6px; border: 1px solid var(--border-primary); border-radius: 4px; font-weight:600;}
+
+/* Modal */
+.nav-modal-overlay { position: fixed; top: 0; left: 0; width: 100vw; height: 100vh; background: rgba(0,0,0,0.5); display: flex; align-items: center; justify-content: center; z-index: 2000; backdrop-filter: blur(4px); }
+.nav-modal-content { background: var(--bg-primary); border-radius: 12px; width: 400px; padding: 20px; box-shadow: 0 10px 40px rgba(0,0,0,0.2); border: 1px solid var(--border-primary); }
+.nav-modal-header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 16px; }
+.nav-modal-header h3 { margin: 0; font-size: 16px; color: var(--text-primary); }
+.nav-modal-close { background: transparent; border: none; font-size: 16px; cursor: pointer; color: var(--text-secondary); }
+.nav-modal-body .form-group { margin-bottom: 12px; }
+.nav-modal-body label { display: block; font-size: 13px; font-weight: 600; color: var(--text-secondary); margin-bottom: 6px; }
+.nav-modal-body input, .nav-modal-body textarea { width: 100%; padding: 8px 10px; border: 1px solid var(--border-primary); border-radius: 6px; background: var(--bg-surface); color: var(--text-primary); font-size: 13px; box-sizing: border-box; }
+.nav-modal-body input:focus, .nav-modal-body textarea:focus { outline: none; border-color: var(--accent); }
+.nav-modal-tip { font-size: 12px; color: var(--text-muted); margin-top: 12px; }
+.nav-modal-footer { display: flex; justify-content: flex-end; gap: 12px; margin-top: 24px; }
+.nav-btn-cancel { padding: 6px 16px; border-radius: 6px; border: 1px solid var(--border-primary); background: var(--bg-surface); cursor: pointer; color: var(--text-secondary); font-size: 13px; font-weight: 600; transition: all 0.2s; }
+.nav-btn-cancel:hover { background: var(--bg-surface-hover); }
+.nav-btn-submit { padding: 6px 16px; border-radius: 6px; border: none; background: var(--accent); cursor: pointer; color: white; font-size: 13px; font-weight: 600; transition: all 0.2s; }
+.nav-btn-submit:hover { background: var(--accent-hover); }
+.nav-btn-submit:disabled { opacity: 0.6; cursor: not-allowed; }
+.create-action.clickable { opacity: 1; cursor: pointer; border: 1px dashed var(--border-active); }
 </style>
@@ -105,6 +105,11 @@
                 {{ isStopping ? '⏳ 关闭中...' : '🛑 关闭公司' }}
               </button>
               <button class="btn-refresh" @click="loadCompanyStatus(selectedCompany.id)">🔄 刷新状态</button>
+              <button 
+                class="btn-delete" 
+                style="background-color: var(--status-failed-bg); color: var(--status-failed); border: 1px solid var(--status-failed-bg); padding: 4px 12px; border-radius: 6px; font-size: 13px; font-weight: 600; cursor: pointer; margin-left: auto;" 
+                @click="deleteCompany(selectedCompany.id)"
+              >🗑️ 删除公司</button>
             </div>
           </div>
  
@@ -1060,6 +1065,22 @@ async function stopCompany() {
   isStopping.value = false
 }
  
+async function deleteCompany(companyId) {
+  if (!confirm('确认要删除该公司吗？该操作仅会从列表中移除公司声明。')) return
+  try {
+    await axios.delete(`/api/company/${companyId}`)
+    await loadCompanies()
+    if (companies.value.length > 0) {
+      router.push(`/${companies.value[0].id}/overview`)
+    } else {
+      router.push(`/company`)
+    }
+  } catch (e) {
+    console.error(e)
+    alert('删除失败: ' + (e.response?.data?.error || e.message))
+  }
+}
+
 function formatDate(isoStr) {
   if (!isoStr) return '-'
   return new Date(isoStr).toLocaleString('zh-CN', { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' })