完成70%

pages/tree/t03-member-profile.vue

@@ -93,11 +93,11 @@
 
 <script setup>
 import { computed, reactive, ref } from "vue";
-import { onBackPress, onLoad, onShow } from "@dcloudio/uni-app";
+import { onBackPress, onLoad, onShow, onUnload } from "@dcloudio/uni-app";
 import AppLoading from "@/components/AppLoading.vue";
 import ModulePageBackground from "@/components/ModulePageBackground.vue";
 import PageHeader from "@/components/PageHeader.vue";
-import { findTreeMemberPresentationFixture } from "@/data/mock.js";
+import { appApi, createRequestController, isRequestCancelled } from "@/utils/api.js";
 import {
   consumeNavigationResult,
   handleBackPress,
@@ -113,13 +113,25 @@ const errorMessage = ref("");
 const genealogyName = ref("汤氏家谱");
 const memberTrail = reactive([]);
 const trailIndex = ref(-1);
+const memberRequestController = createRequestController();
+let loadSequence = 0;
 
 const details = computed(() => member.value ? [
+  { label: "别名", value: member.value.aliasName },
   { label: "字辈", value: member.value.generationName },
+  { label: "性别（字典值）", value: member.value.sex },
+  { label: "人物状态（字典值）", value: member.value.personStatus },
   { label: "出生日期", value: member.value.status === "forbidden" ? "按权限隐藏" : member.value.birthDate },
+  { label: "出生农历", value: member.value.status === "forbidden" ? "按权限隐藏" : member.value.birthLunar },
   { label: "生卒信息", value: member.value.years },
-  { label: "祖居地", value: member.value.status === "forbidden" ? "按权限隐藏" : member.value.birthplace },
+  { label: "出生地", value: member.value.status === "forbidden" ? "按权限隐藏" : member.value.birthplace },
+  { label: "逝世农历", value: member.value.status === "forbidden" ? "按权限隐藏" : member.value.deathLunar },
+  { label: "逝世地", value: member.value.status === "forbidden" ? "按权限隐藏" : member.value.deathPlace },
+  { label: "安葬地", value: member.value.status === "forbidden" ? "按权限隐藏" : member.value.burialPlace },
+  { label: "配偶", value: member.value.spouseNames },
   { label: "所属支系", value: member.value.branch },
+  { label: "生平", value: member.value.status === "forbidden" ? "按权限隐藏" : member.value.biography },
+  { label: "备注", value: member.value.remark },
 ] : []);
 const canPreviewEdit = computed(() => memberState.value === "detail");
 const restrictedCopy = computed(() =>
@@ -146,40 +158,59 @@ const memberContextDescription = computed(() => ({
   error: "请重新选择成员",
 }[memberState.value] || "请重新选择成员"));
 
-const loadMember = async (nextPersonId) => {
+const loadMember = async (nextPersonId, { preserveCurrent = false } = {}) => {
   const normalizedPersonId = String(nextPersonId || "");
-  const fixture = findTreeMemberPresentationFixture(genealogyId.value, normalizedPersonId);
-  if (!fixture) {
-    errorMessage.value = "这位成员不存在或已不属于当前家谱。";
+  const activeLoad = ++loadSequence;
+  const previous = {
+    personId: personId.value,
+    member: member.value,
+    state: memberState.value,
+    errorMessage: errorMessage.value,
+    genealogyName: genealogyName.value,
+  };
+  const restorePrevious = () => {
+    personId.value = previous.personId;
+    member.value = previous.member;
+    memberState.value = previous.state;
+    errorMessage.value = previous.errorMessage;
+    genealogyName.value = previous.genealogyName;
+  };
+
+  memberState.value = "loading";
+  errorMessage.value = "";
+  try {
+    const nextMember = await appApi.getPerson(
+      genealogyId.value,
+      normalizedPersonId,
+      { requestController: memberRequestController },
+    );
+    if (activeLoad !== loadSequence) return false;
+    personId.value = nextMember.id;
+    member.value = nextMember;
+    genealogyName.value = nextMember.genealogyName;
+    memberState.value = "detail";
+    return true;
+  } catch (error) {
+    if (activeLoad !== loadSequence || isRequestCancelled(error)) {
+      if (preserveCurrent && activeLoad === loadSequence) restorePrevious();
+      return false;
+    }
+    if (preserveCurrent) {
+      restorePrevious();
+      return false;
+    }
+    member.value = null;
+    memberState.value = "error";
+    errorMessage.value = error?.message || "这位成员不存在或已不属于当前家谱。";
     return false;
   }
-  const restricted = ["privacy", "forbidden"].includes(fixture.status);
-  const relatives = restricted ? [] : fixture.relatives
-    .map((relative) => {
-      const relativeMember = findTreeMemberPresentationFixture(
-        genealogyId.value,
-        relative.personId,
-      );
-      return relativeMember
-        ? { id: relativeMember.id, name: relativeMember.name, relation: relative.relation }
-        : null;
-    })
-    .filter(Boolean);
-  personId.value = normalizedPersonId;
-  member.value = {
-    ...fixture,
-    relatives,
-  };
-  errorMessage.value = "";
-  memberState.value = restricted ? "restricted" : "detail";
-  return true;
 };
 
 const initializeMemberTrail = async (initialPersonId) => {
   memberTrail.splice(0, memberTrail.length);
   trailIndex.value = -1;
   const normalizedPersonId = String(initialPersonId || "");
-  const loaded = await loadMember(normalizedPersonId);
+  const loaded = await loadMember(normalizedPersonId, { preserveCurrent: true });
   if (!loaded) return false;
   memberTrail.splice(0, memberTrail.length, normalizedPersonId);
   trailIndex.value = 0;
@@ -204,7 +235,7 @@ const popMemberTrail = async () => {
   while (trailIndex.value > 0) {
     const targetIndex = trailIndex.value - 1;
     const historicalPersonId = memberTrail[targetIndex];
-    const loaded = await loadMember(historicalPersonId);
+    const loaded = await loadMember(historicalPersonId, { preserveCurrent: true });
     if (loaded) {
       trailIndex.value = targetIndex;
       return true;
@@ -235,11 +266,7 @@ onLoad((query) => {
       : "当前家谱上下文无效，请重新进入。";
     return;
   }
-  void initializeMemberTrail(initialPersonId).then((loaded) => {
-    if (loaded) return;
-    member.value = null;
-    memberState.value = "error";
-  });
+  void initializeMemberTrail(initialPersonId);
 });
 
 onShow(() => {
@@ -251,6 +278,11 @@ onShow(() => {
 
 onBackPress((event) => handleBackPress(event, requestBack));
 
+onUnload(() => {
+  loadSequence += 1;
+  memberRequestController.abort();
+});
+
 const toEdit = () => {
   if (!canPreviewEdit.value) return false;
   return openPage("T05", { genealogyId: genealogyId.value, personId: personId.value }, "T03");