Merge branch 'dev'

- skip条件从state.active判断改为仅判断state.tenant!==总览
- 修复state.active默认为home导致renderHome仍被调用
- 版本号 v1.2.0.3

README.md

@@ -53,3 +53,4 @@ curl http://127.0.0.1:5177/api/health
 - 产品：慰心斋产品路线图中的 5 个产品版本
 - 财务：首版财务样例和原财务 manager 合并方向
 
+# test trigger

backend/routes.py

@@ -666,6 +666,26 @@ def bootstrap():
 
 # ---------- 通用 CRUD ----------
 
+@bp.route("/api/<resource>/list", methods=["GET"])
+@login_required
+def list_resource(resource):
+    """轻量级列表接口，只返回指定 tenant 的记录"""
+    if resource not in TABLES:
+        return jsonify({"error": "unknown resource"}), 404
+    table, _ = TABLES[resource]
+    tenant = request.args.get("tenant", session.get("tenants", [""])[0])
+    allowed = session.get("tenants", [])
+    allowed = [t if t != "总工作台" else "总览" for t in allowed]
+    allowed = [t if t != "学会·无界" else "学术·无界" for t in allowed]
+    if tenant not in allowed:
+        tenant = allowed[0] if allowed else ""
+    conn = db()
+    try:
+        result = rows(conn, f"SELECT * FROM {table} WHERE tenant=? ORDER BY id DESC", [tenant])
+        return jsonify(result)
+    finally:
+        conn.close()
+
 @bp.route("/api/<resource>", methods=["POST"])
 @login_required
 def create_resource(resource):

static/modules/drawer.js

@@ -175,7 +175,9 @@ window.deleteDrawerItem = async (resource, id) => {
       logActivity(resType, id, "删除了「" + name + "」");
     }
     closeDrawer();
-    await load();
+    var rk = resource === 'projectFinances' ? 'projectFinances' : resource === 'planFinances' ? 'planFinances' : null;
+    if (rk) { try { state.data[rk] = await api("/api/" + rk + "/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {} }
+    if (resource === 'projectFinances') renderFinance(); else if (resource === 'planFinances') renderPlan();
   } catch (error) {
     toast("删除失败：" + error.message, "error");
   }
@@ -216,21 +218,26 @@ window.submitComment = async (event, targetType, targetId, resource) => {
   button.disabled = true;
   button.textContent = "发送中…";
   await api(`/api/followups/${targetType}/${targetId}`, { method: "POST", body: JSON.stringify({ data: { content } }) });
-  await load();
+  var ck = resource === 'projectFinances' ? 'projectFinances' : resource === 'planFinances' ? 'planFinances' : null;
+  if (ck) { try { state.data[ck] = await api("/api/" + ck + "/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {} }
   openDrawer(resource, targetId);
 };
 
 window.deleteActivity = async (id) => {
   if (!confirm("确认删除这条动态？")) return;
   await api(`/api/followups/${id}`, { method: "DELETE" });
-  await load();
+  var dk = resource === 'projectFinances' ? 'projectFinances' : resource === 'planFinances' ? 'planFinances' : null;
+  if (dk) { try { state.data[dk] = await api("/api/" + dk + "/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {} }
+  if (resource === 'projectFinances') renderFinance(); else if (resource === 'planFinances') renderPlan();
 };
 
 window.deleteFollowup = async (event, followupId, resource, targetId) => {
   event.stopPropagation();
   if (!confirm("确认删除这条评论？")) return;
   await api(`/api/followups/${followupId}`, { method: "DELETE" });
-  await load();
+  var fkey2 = resource === 'projectFinances' ? 'projectFinances' : resource === 'planFinances' ? 'planFinances' : null;
+  if (fkey2) { try { state.data[fkey2] = await api("/api/" + fkey2 + "/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {} }
+  if (resource === 'projectFinances') renderFinance(); else if (resource === 'planFinances') renderPlan();
   openDrawer(resource, targetId);
 };
 

static/modules/finance.js

@@ -908,7 +908,8 @@ window.createFinance = async (event) => {
     document.querySelector("#pf-id-input").value = "";
     document.querySelector("#financeModalTitle").textContent = "新增项目财务";
     closeFinanceModal();
-    await load();
+    state.data.projectFinances = await api("/api/projectFinances/list?tenant=" + encodeURIComponent(state.tenant));
+    renderFinance();
   } catch (error) {
     toast("保存失败：" + error.message, "error");
   }
@@ -923,7 +924,8 @@ window.deleteFinanceItem = async () => {
   try {
     await api(`/api/projectFinances/${pfId}`, { method: "DELETE" });
     closeFinanceModal();
-    await load();
+    state.data.projectFinances = await api("/api/projectFinances/list?tenant=" + encodeURIComponent(state.tenant));
+    renderFinance();
     toast("已删除", "success");
   } catch (error) {
     toast("删除失败：" + error.message, "error");
@@ -1033,9 +1035,9 @@ function renderFinanceOverview() {
   var cfCard = card('<h3 class="text-sm font-bold text-slate-700">业务线现金流</h3><p class="text-xs text-slate-400 mb-3">项目现金流 - 平台费用（支出）= 业务线现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + deptThead + '</thead><tbody>' + cfTbody + '</tbody></table></div>', 'p-4');
 
   document.querySelector("#financeOverview").innerHTML = '<div class="grid gap-2.5">' +
-    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务月度概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 支出</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
     deptCard +
     cfCard +
+    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务月度概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 支出</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
     '<div class="grid grid-cols-3 gap-2.5">' +
       card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度签约趋势</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="finChartSign"></canvas></div>', 'p-4') +
       card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度确收与毛利</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="finChartRev"></canvas></div>', 'p-4') +

static/modules/plan.js

@@ -718,7 +718,7 @@ window.planEditSignMonth = (event, pfId) => {
 };
 
 window.switchPlanTab = (tab) => {
-  document.querySelectorAll(".plan-tab").forEach(b => b.classList.toggle("active", b.dataset.tab === tab));
+  document.querySelectorAll("#planModal .finance-tab").forEach(b => b.classList.toggle("active", b.dataset.tab === tab));
   document.querySelector("#plan_financeTabInfo").classList.toggle("hidden", tab !== "info");
   document.querySelector("#plan_financeTabRevpay").classList.toggle("hidden", tab !== "revpay");
   document.querySelector("#plan_financeTabCost").classList.toggle("hidden", tab !== "cost");
@@ -945,7 +945,8 @@ window.createPlanFinance = async (event) => {
     document.querySelector("#plan_pf-id-input").value = "";
     document.querySelector("#planModalTitle").textContent = "新增项目财务";
     closePlanModal();
-    await load();
+    state.data.planFinances = await api("/api/planFinances/list?tenant=" + encodeURIComponent(state.tenant));
+    renderPlan();
   } catch (error) {
     toast("刷新失败：" + error.message, "error");
   }
@@ -960,7 +961,8 @@ window.deletePlanItem = async () => {
   try {
     await api(`/api/planFinances/${pfId}`, { method: "DELETE" });
     closePlanModal();
-    await load();
+    state.data.planFinances = await api("/api/planFinances/list?tenant=" + encodeURIComponent(state.tenant));
+    renderPlan();
     toast("已删除", "success");
   } catch (error) {
     toast("删除失败：" + error.message, "error");
@@ -1109,9 +1111,9 @@ function renderPlanOverview() {
   var cfCard = card('<h3 class="text-sm font-bold text-slate-700">业务线现金流</h3><p class="text-xs text-slate-400 mb-3">项目现金流 - 平台费用（已付）= 业务线现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + deptThead + '</thead><tbody>' + cfTbody + '</tbody></table></div>', 'p-4');
 
   document.querySelector("#planOverview").innerHTML = '<div class="grid gap-2.5">' +
-    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 已付</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
     deptCard +
     cfCard +
+    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 已付</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
     '<div class="grid grid-cols-3 gap-2.5">' +
       card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度签约趋势</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="planChartSign"></canvas></div>', 'p-4') +
       card('<div class="mb-3 flex items-center justify-between"><h2 class="text-sm font-bold text-slate-600">月度确收与毛利</h2><span class="text-xs text-slate-400">2026</span></div><div style="position:relative;height:200px"><canvas id="planChartRev"></canvas></div>', 'p-4') +
@@ -1244,9 +1246,9 @@ function renderPlanQuarterlyOverview() {
   }
 
   document.querySelector("#planQuarterlyOverview").innerHTML = '<div class="grid gap-2.5">' +
-    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务季度概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 支出 → 回款 → 项目现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
     card('<h3 class="text-sm font-bold text-slate-700">业务线经营情况</h3><p class="text-xs text-slate-400 mb-3">毛利 - 平台费用 = 利润</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + deptThead + '</thead><tbody>' + deptTbody + '</tbody></table></div>', 'p-4') +
     card('<h3 class="text-sm font-bold text-slate-700">业务线现金流</h3><p class="text-xs text-slate-400 mb-3">项目现金流 - 平台费用（已付）= 业务线现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + deptThead + '</thead><tbody>' + cfTbody + '</tbody></table></div>', 'p-4') +
+    card('<h3 class="text-sm font-bold text-slate-700">业务（项目）财务季度概览</h3><p class="text-xs text-slate-400 mb-3">合同 → 确收 → 毛利 → 成本 → 支出 → 回款 → 项目现金流</p><div class="overflow-x-auto"><table class="w-full text-sm"><thead>' + thead + '</thead><tbody>' + tbody + '</tbody></table></div>', 'p-4') +
     '</div>';
   if (window.lucide) window.lucide.createIcons();
 }
@@ -1285,7 +1287,8 @@ function planInlineSelect(name, pfId, field, currentVal, options) {
 window.planInlineUpdate = async (pfId, field, value) => {
   try {
     await api("/api/planFinances/" + pfId, { method: "PUT", body: JSON.stringify({ data: { [field]: value } }) });
-    await load();
+    state.data.planFinances = await api("/api/planFinances/list?tenant=" + encodeURIComponent(state.tenant));
+    renderPlan();
     toast("已更新", "success");
   } catch (error) {
     toast("更新失败：" + error.message, "error");

static/modules/plan_expense.js

@@ -114,7 +114,7 @@ function renderPlanExpense() {
 
   var modal = '<div id="planExpenseModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closePlanExpModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-lg mx-4" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-6 py-4 flex items-center justify-between"><h3 class="text-lg font-bold text-slate-800" id="planExpenseModalTitle">新增费用</h3><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="planExpDeleteBtn" onclick="deletePlanExpItem()">删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closePlanExpModal()"><i data-lucide="x"></i></button></div></div><form onsubmit="savePlanExpense(event)" class="p-6 grid gap-4" novalidate><input type="hidden" name="expense_id" value=""><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用类型 <span class="text-red-500">*</span></span><select name="expense_type" required class="form-ctrl bg-white"><option value="">请选择</option>';
   EXPENSE_TYPES.forEach(function(t) { modal += '<option>' + t + '</option>'; });
-  modal += '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">月份 <span class="text-red-500">*</span></span><select name="expense_month" required class="form-ctrl bg-white">' + modalMonthOpts + '</select></label></div><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">金额（元）</span><input name="amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">已发生金额（元）</span><input name="incurred_amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label></div><label class="block"><span class="text-sm text-slate-500 mb-1 block">状态</span><select name="status" class="form-ctrl bg-white">' + statusOpts + '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用说明</span><textarea name="notes" class="form-ctrl" rows="3" placeholder="备注信息"></textarea></label><div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closePlanExpModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>';
+  modal += '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">月份 <span class="text-red-500">*</span></span><select name="expense_month" required class="form-ctrl bg-white">' + modalMonthOpts + '</select></label></div><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用计提（元）</span><input name="amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">已发生费用计提（元）</span><input name="incurred_amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label></div><label class="block"><span class="text-sm text-slate-500 mb-1 block">状态</span><select name="status" class="form-ctrl bg-white">' + statusOpts + '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用说明</span><textarea name="notes" class="form-ctrl" rows="3" placeholder="备注信息"></textarea></label><div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closePlanExpModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>';
 
   var target = document.querySelector("#planExpenseModule") || document.querySelector("#planExpenseModule") || document.querySelector("#planExpenseContent");
   if (!target) return;
@@ -123,10 +123,10 @@ function renderPlanExpense() {
     '<div class="grid grid-cols-3 gap-3">' +
       '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">费用记录</span><strong class="mt-2 block text-xl">' + filtered.length + '</strong></div>' +
       '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">总费用</span><strong class="mt-2 block text-xl">' + money(totalAmount) + '</strong></div>' +
-      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">已发生金额</span><strong class="mt-2 block text-xl">' + money(totalIncurred) + '</strong></div>' +
+      '<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">现金支出</span><strong class="mt-2 block text-xl">' + money(totalIncurred) + '</strong></div>' +
     '</div>' +
     modal +
-    '<div class="card p-4"><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'expense_month\')">月份' + sortArrow('expense_month') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'expense_type\')">费用类型' + sortArrow('expense_type') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'status\')">状态' + sortArrow('status') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'amount\')">金额' + sortArrow('amount') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'incurred_amount\')">已发生金额' + sortArrow('incurred_amount') + '</th><th class="p-2 text-center font-semibold">费用说明</th></tr></thead><tbody>' + tableRows + '</tbody></table></div></div>' +
+    '<div class="card p-4"><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'expense_month\')">月份' + sortArrow('expense_month') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'expense_type\')">费用类型' + sortArrow('expense_type') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'status\')">状态' + sortArrow('status') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'amount\')">金额' + sortArrow('amount') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="togglePlanExpSort(\'incurred_amount\')">现金支出' + sortArrow('incurred_amount') + '</th><th class="p-2 text-center font-semibold">费用说明</th></tr></thead><tbody>' + tableRows + '</tbody></table></div></div>' +
   '</div>';
 
   if (window.lucide) window.lucide.createIcons();
@@ -199,8 +199,10 @@ window.savePlanExpense = async function(event) {
     return;
   }
   closePlanExpModal();
-  await load();
+  try {
-  renderPlanExpense();
+    state.data.planExpense = await api("/api/planExpense/list?tenant=" + encodeURIComponent(state.tenant));
+    renderPlanExpense();
+  } catch (e) { /* non-critical */ }
 };
 
 window.deletePlanExpItem = async function() {
@@ -213,6 +215,8 @@ window.deletePlanExpItem = async function() {
     return;
   }
   closePlanExpModal();
-  await load();
+  try {
-  renderPlanExpense();
+    state.data.planExpense = await api("/api/planExpense/list?tenant=" + encodeURIComponent(state.tenant));
+    renderPlanExpense();
+  } catch (e) { /* non-critical */ }
 };

static/modules/products.js

@@ -19,7 +19,7 @@ async function createResource(event, resource) {
     const name = data.project_name || data.target_customer || data.customer_or_project_name || data.product_name || "";
     if (result.id && name) logActivity(resType, result.id, "创建了" + name);
     form.reset();
-    await load();
+    try { state.data.products = await api("/api/products/list?tenant=" + encodeURIComponent(state.tenant)); renderProducts(); } catch(e) {}
   } catch (error) {
     toast("创建失败：" + error.message, "error");
   }
@@ -141,7 +141,7 @@ window.submitProductDrawer = async (event) => {
     form.reset();
     closeProductDrawer();
     if (result.id) logActivity("product", result.id, "创建了产品版本「" + data.product_name + " " + data.version + "」");
-    await load();
+    try { state.data.products = await api("/api/products/list?tenant=" + encodeURIComponent(state.tenant)); renderProducts(); } catch(e) {}
   } catch (error) {
     toast("创建失败：" + error.message, "error");
   }

static/modules/projects.js

@@ -67,19 +67,58 @@ function updateTenantLabel() {
   };
   const container = document.querySelector("#tenantList");
   if (container) {
-    container.innerHTML = tenants.map(t => {
+    var currentShort = (state.tenant || '').replace("·无界", "");
-      const shortName = t.replace("·无界", "");
+    var currentIcon = tenantIcons[state.tenant] || 'circle';
-      const isActive = t === state.tenant;
+    container.innerHTML = '<div class="flex flex-col items-center cursor-pointer hover:bg-slate-800 rounded-lg py-2 px-1 w-14 transition-colors" onclick="toggleTenantMenu(event)" title="切换工作台">' +
-      var icon = tenantIcons[t] || 'circle';
+      '<i data-lucide="' + currentIcon + '" style="width:20px;height:20px;color:#60a5fa"></i>' +
-      return '<div class="flex flex-col items-center cursor-pointer rounded-lg py-1.5 px-1 w-14 transition-colors ' + (isActive ? 'bg-blue-600' : 'hover:bg-slate-800') + '" onclick="switchTenantFromMenu(\'' + t.replace(/'/g, "\\'") + '\')" title="' + esc(t) + '">' +
+      '<span class="text-[10px] mt-1 max-w-[56px] truncate text-center text-slate-300">' + esc(currentShort) + '</span>' +
-        '<i data-lucide="' + icon + '" style="width:20px;height:20px;color:' + (isActive ? '#fff' : '#94a3b8') + '"></i>' +
+      '<i data-lucide="chevron-down" style="width:12px;height:12px;color:#64748b;margin-top:2px"></i>' +
-        '<span class="text-[10px] mt-1 max-w-[56px] truncate text-center ' + (isActive ? 'text-white' : 'text-slate-400') + '">' + esc(shortName) + '</span>' +
+      '</div>';
-        '</div>';
-    }).join('');
     if (window.lucide) window.lucide.createIcons();
   }
 }
 
+window.toggleTenantMenu = (event) => {
+  event.stopPropagation();
+  let menu = document.getElementById("tenantMenu");
+  if (menu) { menu.remove(); return; }
+  const btn = event.currentTarget;
+  const rect = btn.getBoundingClientRect();
+  const tenants = (state.allowedTenants || []).slice().sort(function(a, b) { var order = ['总览','学术·无界','MCN·无界','科普·无界','医患·无界','科研·无界']; var ai = order.indexOf(a); var bi = order.indexOf(b); if (ai < 0) ai = 99; if (bi < 0) bi = 99; return ai - bi; });
+  var tenantIcons = {
+    '学术·无界': 'graduation-cap',
+    'MCN·无界': 'video',
+    '科普·无界': 'flask-conical',
+    '医患·无界': 'stethoscope',
+    '科研·无界': 'microscope',
+    '总览': 'layout-dashboard'
+  };
+  menu = document.createElement("div");
+  menu.id = "tenantMenu";
+  menu.className = "fixed bg-white rounded-lg shadow-xl border border-slate-200 py-1 min-w-[180px] z-[9999]";
+  menu.style.left = Math.min(rect.left - 8, window.innerWidth - 200) + "px";
+  menu.style.top = rect.bottom + 6 + "px";
+  menu.innerHTML = '<div class="px-4 py-2 border-b border-slate-100"><p class="text-xs font-semibold text-slate-500 uppercase tracking-wider">切换工作台</p></div>' +
+    tenants.map(t => {
+      const shortName = t.replace("·无界", "");
+      const isActive = t === state.tenant;
+      var icon = tenantIcons[t] || 'circle';
+      return '<button class="w-full text-left px-4 py-2.5 text-sm hover:bg-slate-50 transition-colors flex items-center gap-3 ' + (isActive ? 'text-blue-600 font-medium bg-blue-50' : 'text-slate-700') + '" onclick="switchTenantFromMenu(\'' + t.replace(/'/g, "\\'") + '\')">' +
+        '<i data-lucide="' + icon + '" style="width:16px;height:16px;color:' + (isActive ? '#2563eb' : '#94a3b8') + '"></i>' +
+        '<span class="flex-1">' + esc(shortName) + '</span>' +
+        (isActive ? '<i data-lucide="check" style="width:14px;height:14px;color:#2563eb"></i>' : '') +
+        '</button>';
+    }).join('');
+  document.body.appendChild(menu);
+  if (window.lucide) window.lucide.createIcons();
+  setTimeout(() => {
+    document.addEventListener("click", function closeMenu() {
+      menu.remove();
+      document.removeEventListener("click", closeMenu);
+    }, { once: true });
+  }, 10);
+};
+
 window.toggleUserMenu = (user) => {
   let menu = document.getElementById("userMenu");
   if (menu) { menu.remove(); return; }
@@ -226,7 +265,7 @@ window.duplicateProject = async () => {
       });
     }
     toast("已创建副本", "success");
-    await load();
+    try { state.data.operations = await api("/api/operations/list?tenant=" + encodeURIComponent(state.tenant)); renderProjects(); } catch(e) {}
   } catch (error) {
     toast("创建副本失败：" + error.message, "error");
   }
@@ -463,7 +502,7 @@ window.submitTaskForm = async (event, projectId) => {
       const result = await api("/api/tasks", { method: "POST", body: JSON.stringify({ data }) });
       if (result.id && data.task) logActivity("task", result.id, "创建了任务「" + data.task + "」");
       closeTaskDrawer(projectId);
-      await load();
+      try { state.data.tasks = await api("/api/tasks/list?tenant=" + encodeURIComponent(state.tenant)); } catch(e) {}
     }
   } catch (error) {
     toast("保存失败：" + error.message, "error");

static/modules/proposals.js

@@ -32,7 +32,8 @@ async function ensureStandardProposals() {
       });
     } catch (e) { /* ignore */ }
   }
-  await load();
+  state.data.proposals = await api("/api/proposals/list?tenant=" + encodeURIComponent(state.tenant));
+  renderProposals();
 }
 
 window.switchProposalTab = (tab) => {
@@ -183,7 +184,7 @@ window.submitStandardComment = async (event, targetId) => {
   button.disabled = true;
   button.textContent = "发送中…";
   await api(`/api/followups/proposal/${targetId}`, { method: "POST", body: JSON.stringify({ data: { content } }) });
-  await load();
+  try { state.data.proposals = await api("/api/proposals/list?tenant=" + encodeURIComponent(state.tenant)); renderProposals(); } catch(e) {}
   openStandardProposalDrawer(targetId);
 };
 
@@ -207,7 +208,7 @@ window.submitProposal = async (event) => {
     if (result.id && data.customer_or_project_name) logActivity("proposal", result.id, "创建了方案「" + data.customer_or_project_name + "」");
     form.reset();
     closeProposalModal();
-    await load();
+    try { state.data.proposals = await api("/api/proposals/list?tenant=" + encodeURIComponent(state.tenant)); renderProposals(); } catch(e) {}
   } catch (error) {
     toast("保存失败：" + error.message, "error");
   }

static/modules/utils.js

@@ -115,18 +115,85 @@ function renderTable(headers, rows, rowClicks) {
   `);
 }
 
+var _loadingSteps = [
+  { fn: 'renderHome', label: '正在加载首页仪表盘（指标卡片+图表）', skip: function() { return state.tenant !== '总览'; } },
+  { fn: 'renderProjects', label: '正在加载业务机会列表' },
+  { fn: 'renderProposals', label: '正在加载业务方案列表' },
+  { fn: 'renderProducts', label: '正在加载产品迭代列表' },
+  { fn: 'renderPerformance', label: '正在加载绩效管理' },
+  { fn: 'renderFinance', label: '正在加载执行模块（表格+总览+图表）' },
+  { fn: 'renderPlan', label: '正在加载预算模块' },
+];
+
+function showLoadingOverlay(steps) {
+  var existing = document.getElementById('_loadingOverlay');
+  if (existing) existing.remove();
+  var stepsHtml = steps.map(function(s, i) {
+    return '<div id="_loadingStep_' + i + '" class="flex items-center gap-3 py-1.5 text-sm ' + (i === 0 ? 'text-blue-600 font-medium' : 'text-slate-400') + '">' +
+      '<span class="w-4 h-4 flex items-center justify-center">' + (i === 0 ? '<svg class="animate-spin" width="14" height="14" viewBox="0 0 24 24" fill="none"><circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="3" opacity="0.25"/><path d="M12 2a10 10 0 0 1 10 10" stroke="currentColor" stroke-width="3" stroke-linecap="round"/></svg>' : '<span class="w-2 h-2 rounded-full bg-slate-300"></span>') + '</span>' +
+      '<span>' + s.label + '</span>' +
+      '</div>';
+  }).join('');
+  var overlay = document.createElement('div');
+  overlay.id = '_loadingOverlay';
+  overlay.className = 'fixed inset-0 z-[99999] flex items-center justify-center bg-black/50';
+  overlay.innerHTML = '<div class="bg-white rounded-2xl shadow-2xl px-8 py-6 w-full max-w-md">' +
+    '<h3 class="text-base font-bold text-slate-800 mb-1">正在加载工作台</h3>' +
+    '<p class="text-xs text-slate-400 mb-4">共 ' + steps.length + ' 个模块，请稍候…</p>' +
+    '<div id="_loadingSteps">' + stepsHtml + '</div>' +
+    '<div class="mt-4 h-1 bg-slate-100 rounded-full overflow-hidden"><div id="_loadingProgress" class="h-full bg-blue-600 transition-all duration-300" style="width:0%"></div></div>' +
+    '</div>';
+  document.body.appendChild(overlay);
+}
+
+function updateLoadingStep(idx, total) {
+  var stepEl = document.getElementById('_loadingStep_' + idx);
+  if (stepEl) {
+    stepEl.className = 'flex items-center gap-3 py-1.5 text-sm text-green-600 font-medium';
+    stepEl.querySelector('span:first-child').innerHTML = '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="3" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"></polyline></svg>';
+  }
+  var nextEl = document.getElementById('_loadingStep_' + (idx + 1));
+  if (nextEl) {
+    nextEl.className = 'flex items-center gap-3 py-1.5 text-sm text-blue-600 font-medium';
+    nextEl.querySelector('span:first-child').innerHTML = '<svg class="animate-spin" width="14" height="14" viewBox="0 0 24 24" fill="none"><circle cx="12" cy="12" r="10" stroke="currentColor" stroke-width="3" opacity="0.25"/><path d="M12 2a10 10 0 0 1 10 10" stroke="currentColor" stroke-width="3" stroke-linecap="round"/></svg>';
+  }
+  var progress = document.getElementById('_loadingProgress');
+  if (progress) progress.style.width = Math.round((idx + 1) / total * 100) + '%';
+}
+
+function hideLoadingOverlay() {
+  var overlay = document.getElementById('_loadingOverlay');
+  if (overlay) overlay.remove();
+}
+
 async function load() {
+  showLoadingOverlay(_loadingSteps);
   state.data = await api(`/api/bootstrap?tenant=${encodeURIComponent(state.tenant)}`);
   // 首次加载时确保标准资料库 7 项已初始化
   if (typeof ensureStandardProposals === "function") {
     const existing = (state.data.proposals || []).filter(p => p.proposal_type === "标准资料");
     const missingCount = 7 - existing.length;
     if (missingCount > 0) {
+      hideLoadingOverlay();
       await ensureStandardProposals();
       return;  // ensureStandardProposals 内部会再次 render
     }
   }
-  render();
+  // 逐步渲染
+  for (var i = 0; i < _loadingSteps.length; i++) {
+    var step = _loadingSteps[i];
+    if (step.skip && step.skip()) {
+      updateLoadingStep(i, _loadingSteps.length);
+      continue;
+    }
+    if (typeof window[step.fn] === 'function') {
+      window[step.fn]();
+    }
+    updateLoadingStep(i, _loadingSteps.length);
+    await new Promise(function(r) { setTimeout(r, 50); });
+  }
+  if (window.lucide) window.lucide.createIcons();
+  setTimeout(hideLoadingOverlay, 300);
 }
 
 function switchTab(tab) {
@@ -157,7 +224,7 @@ function updateSidebarTabs() {
 
 function render() {
   if (!state.data) return;
-  renderHome();
+  if (state.tenant === '总览') renderHome();
   renderProjects();
   renderProposals();
   renderProducts();

templates/index.html

@@ -45,13 +45,13 @@
             <i data-lucide="trending-up" style="width:20px;height:20px"></i>
             <span class="text-[10px] mt-1">部门</span>
           </div>
-          <div class="sidebar-tab" data-tab="plan" onclick="switchTab('plan')" title="计划">
+          <div class="sidebar-tab" data-tab="plan" onclick="switchTab('plan')" title="预算">
             <i data-lucide="calendar-range" style="width:20px;height:20px"></i>
-            <span class="text-[10px] mt-1">计划</span>
+            <span class="text-[10px] mt-1">预算</span>
           </div>
-          <div class="sidebar-tab" data-tab="finance" onclick="switchTab('finance')" title="实际">
+          <div class="sidebar-tab" data-tab="finance" onclick="switchTab('finance')" title="执行">
             <i data-lucide="folder-open-dot" style="width:20px;height:20px"></i>
-            <span class="text-[10px] mt-1">实际</span>
+            <span class="text-[10px] mt-1">执行</span>
           </div>
           <div class="sidebar-tab" data-tab="projects" onclick="switchTab('projects')" title="Focus">
             <i data-lucide="file-text" style="width:20px;height:20px"></i>
@@ -76,7 +76,7 @@
     <header class="topbar border-b border-slate-200 bg-white px-8 py-5">
       <div class="flex items-center gap-3 w-full">
         <div class="flex-1">
-          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.0.0.36</span></p>
+          <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.2.0.3</span></p>
           <div class="flex items-center gap-4 mt-1">
             <h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1>
             <div class="hidden sm:flex items-center gap-1.5 bg-gradient-to-r from-blue-50 to-indigo-50 border border-blue-100 rounded-full px-4 py-1.5">