url統一定義

2026-10-22 09:09:13 +08:00
1 parent 69046e827c
commit c6eb00b406
@@ -38,6 +38,7 @@ import familyTreeService from "@/service/master/familyTreeService";
 import dmsFileService from "@/service/master/dmsFileService";
 import { useLoginProfileStore } from "@/stores";
 import { chooseFiles } from "@/utils/chooseFiles";
+import { absoluteFileUrl } from "@/utils/fileUrl";

 /** ready：组件挂载完成通知（时序口径见文件底部 onMounted 注释） */
 const emit = defineEmits<{ (e: "ready"): void }>();
@@ -259,13 +260,17 @@ function canAmendPerson(personId: string): boolean {
 const spouseMaps = computed(() => data.value.CurrentPerson?.FamilyTreeSpouseMaps ?? []);
 const childMaps = computed(() => data.value.CurrentPerson?.FamilyTreeChildrenMaps ?? []);

-/** 关系行头像查表：Spouse/Children 视图字段不带头像，回查全族人员档案拿 AvatarUrl（谱系图 getAvatar 同款口径） */
+/**
+ * 关系行头像查表：Spouse/Children 视图字段不带头像，回查全族人员档案拿 AvatarUrl（谱系图 getAvatar 同款口径）。
+ * 后端 AvatarUrl 按请求 Host 拼绝对地址，UAT 反代未传原始 Host 时会拼成内网 IP（如 https://10.1.1.163/...），
+ * 一律过 absoluteFileUrl 归一（H5 锁回公网 origin，App 跟随当前线路）。
+ */
 function personAvatar(personId?: string): string {
  if (!personId) {
    return "";
  }
  const persons = (data.value.CurrentPerson?.FamilyTreePersons ?? []) as any[];
-  return persons.find(p => p?.PersonId === personId)?.AvatarUrl ?? "";
+  return absoluteFileUrl(persons.find(p => p?.PersonId === personId)?.AvatarUrl ?? "");
 }

 /** 谱系图同款性别判定（family-tree-chart isMale 字面一致）：空性别按男兜底 */
@@ -1535,7 +1540,7 @@ defineExpose({
            <view class="home-card__glow" />
            <image class="home-card__mark" :src="brandGlyph" mode="aspectFit" />
            <view class="home-card__avatar" @tap="onUploadAvatar">
-              <image v-if="storage.AvatarUrl" class="home-card__avatar-img" :src="storage.AvatarUrl"
+              <image v-if="storage.AvatarUrl" class="home-card__avatar-img" :src="absoluteFileUrl(storage.AvatarUrl)"
                mode="aspectFill" />
              <text v-else class="home-card__avatar-ph">{{ displayName ? displayName.slice(0, 1) : "?" }}</text>
              <view class="home-card__avatar-cam">
@@ -1564,7 +1569,7 @@ defineExpose({
                <text class="home-card__stitle">{{ t("storage.title") }}</text>
              </view>
              <text class="home-card__spct" :class="{ 'home-card__spct--over': storageOver }">{{ storagePercentText
-                }}</text>
+              }}</text>
            </view>
            <view class="home-card__bar">
              <view class="home-card__bar-fill" :class="{ 'home-card__bar-fill--over': storageOver }"
@@ -1660,7 +1665,7 @@ defineExpose({
                      <u-switch v-if="data.IsManager" :model-value="tree.PublicIndc === 'Y'" size="40"
                        :active-color="primary" @change="onPublicToggle" />
                      <text v-if="data.IsManager" class="ft-badge ft-badge--admin">{{ t("FamilyTreePage.managerTag")
-                        }}</text>
+                      }}</text>
                    </view>
                  </view>
                </view>
@@ -1717,8 +1722,8 @@ defineExpose({
                    <view class="person-hero">
                      <view class="person-hero__avatar"
                        :style="avatarFallbackStyle(!!ancestorPerson.AvatarUrl, ancestorPerson.Gender)">
-                        <image v-if="ancestorPerson.AvatarUrl" class="person-hero__img" :src="ancestorPerson.AvatarUrl"
-                          mode="aspectFill" />
+                        <image v-if="ancestorPerson.AvatarUrl" class="person-hero__img"
+                          :src="absoluteFileUrl(ancestorPerson.AvatarUrl)" mode="aspectFill" />
                        <u-icon v-else name="account" size="56" :color="genderTheme(ancestorPerson.Gender)" />
                      </view>
                      <view class="person-hero__main">
@@ -1767,12 +1772,12 @@ defineExpose({
                <!-- 当前族员：从概览移入，夫妻/子女列表都是相对此人 -->
                <view v-if="loaded && currentPerson" class="ft-card">
                  <view class="ft-card__head"><text class="ft-card__title">{{ t("FamilyTreePage.currentPerson")
-                      }}</text></view>
+                  }}</text></view>
                  <view class="person-hero">
                    <view class="person-hero__avatar"
                      :style="avatarFallbackStyle(!!currentPerson?.AvatarUrl, currentPerson?.Gender)">
-                      <image v-if="currentPerson?.AvatarUrl" class="person-hero__img" :src="currentPerson.AvatarUrl"
-                        mode="aspectFill" />
+                      <image v-if="currentPerson?.AvatarUrl" class="person-hero__img"
+                        :src="absoluteFileUrl(currentPerson.AvatarUrl)" mode="aspectFill" />
                      <u-icon v-else name="account" size="56" :color="genderTheme(currentPerson?.Gender)" />
                    </view>
                    <view class="person-hero__main">
@@ -1782,7 +1787,7 @@ defineExpose({
                      </view>
                      <view class="person-hero__chips">
                        <text v-if="currentPerson?.PersonId" class="person-hero__chip">{{ personChipText(currentPerson)
-                          }}</text>
+                        }}</text>
                      </view>
                    </view>
                  </view>
@@ -1825,12 +1830,12 @@ defineExpose({
                  <!-- 新增入口与行尾操作同一把闸：当前锚点不可编（未绑定/出支系）时隐藏 -->
                  <view class="ft-card__head">
                    <view class="ft-card__title-group"><text class="ft-card__title">{{ t("FamilyTreePage.spouseTitle")
-                        }}</text><text class="ft-card__count">{{ spouseMaps.length }}</text></view>
+                    }}</text><text class="ft-card__count">{{ spouseMaps.length }}</text></view>
                    <view v-if="data.IsCanAmend" class="ft-card__add" @tap="openQuickCreate('spouse')"><u-icon
                        name="plus" size="26" :color="primary" /><text>{{ t("FamilyTreePage.addSpouse") }}</text></view>
                  </view>
                  <view v-if="!visibleSpouses.length" class="ft-empty"><text>{{ t("FamilyTreePage.spouseEmpty")
-                      }}</text></view>
+                  }}</text></view>
                  <view v-for="record in visibleSpouses" :key="record.SpouseId" class="ft-mrow">
                    <view class="ft-av"
                      :style="avatarFallbackStyle(!!personAvatar(record.SpouseId), personGender(record.SpouseId, record.Gender))">
@@ -1866,13 +1871,13 @@ defineExpose({
                <view class="ft-card">
                  <view class="ft-card__head">
                    <view class="ft-card__title-group"><text class="ft-card__title">{{ t("FamilyTreePage.childTitle")
-                        }}</text><text class="ft-card__count">{{ childMaps.length }}</text></view>
+                    }}</text><text class="ft-card__count">{{ childMaps.length }}</text></view>
                    <view v-if="data.IsCanAmend" class="ft-card__add" @tap="openQuickCreate('child')"><u-icon
                        name="plus" size="26" :color="primary" /><text>{{ t("FamilyTreePage.addChildBtn") }}</text>
                    </view>
                  </view>
                  <view v-if="!visibleChildren.length" class="ft-empty"><text>{{ t("FamilyTreePage.childEmpty")
-                      }}</text></view>
+                  }}</text></view>
                  <view v-for="record in visibleChildren" :key="record.ChildrenId" class="ft-mrow">
                    <view class="ft-av"
                      :style="avatarFallbackStyle(!!personAvatar(record.ChildrenId), personGender(record.ChildrenId, record.Gender))">
@@ -1912,7 +1917,7 @@ defineExpose({
                <view v-if="data.IsManager && pendingPermissions.length" class="ft-card">
                  <view class="ft-card__head">
                    <view class="ft-card__title-group"><text class="ft-card__title">{{ t("FamilyTreePage.permPending")
-                        }}</text><text class="ft-card__count">{{ pendingPermissions.length }}</text></view>
+                    }}</text><text class="ft-card__count">{{ pendingPermissions.length }}</text></view>
                  </view>
                  <view v-for="record in pendingPermissions" :key="record.UserName" class="ft-perm-row">
                    <view class="ft-perm-row__main"><text class="ft-perm-row__name">{{ record.UserLocalName ||
@@ -1936,10 +1941,10 @@ defineExpose({
                <view v-if="data.IsManager" class="ft-card">
                  <view class="ft-card__head">
                    <view class="ft-card__title-group"><text class="ft-card__title">{{ t("FamilyTreePage.permManager")
-                        }}</text><text class="ft-card__count">{{ managerPermissions.length }}</text></view>
+                    }}</text><text class="ft-card__count">{{ managerPermissions.length }}</text></view>
                  </view>
                  <view v-if="!managerPermissions.length" class="ft-empty"><text>{{ t("FamilyTreePage.permEmpty")
-                      }}</text></view>
+                  }}</text></view>
                  <view v-for="record in managerPermissions" :key="record.UserName" class="ft-perm-row">
                    <view class="ft-perm-row__main"><text class="ft-perm-row__name">{{ record.UserLocalName ||
                      record.UserName
@@ -2093,8 +2098,8 @@ defineExpose({
                <view class="person-hero">
                  <view class="person-hero__avatar"
                    :style="avatarFallbackStyle(!!currentPerson?.AvatarUrl, currentPerson?.Gender)">
-                    <image v-if="currentPerson?.AvatarUrl" class="person-hero__img" :src="currentPerson.AvatarUrl"
-                      mode="aspectFill" />
+                    <image v-if="currentPerson?.AvatarUrl" class="person-hero__img"
+                      :src="absoluteFileUrl(currentPerson.AvatarUrl)" mode="aspectFill" />
                    <u-icon v-else name="account" size="56" :color="genderTheme(currentPerson?.Gender)" />
                  </view>
                  <view class="person-hero__main">
@@ -2174,7 +2179,7 @@ defineExpose({
                      <view class="person-hero__line">
                        <text class="rel-name">{{ record.SpouseSurname }}{{ record.SpouseGenealogyName }}</text>
                        <text class="person-hero__gender">{{ genderText(personGender(record.SpouseId, record.Gender))
-                        }}</text>
+                          }}</text>
                      </view>
                      <view class="person-hero__chips">
                        <text class="person-hero__chip">
@@ -2211,7 +2216,7 @@ defineExpose({
                          <text class="sub-label">{{ t("FamilyTreePage.marryDate") }}</text>
                          <view class="sub-picker">
                            <text class="sub-picker-text">{{ datePart(record.MarryDate) || t("AdminPage.notSetTip")
-                              }}</text>
+                            }}</text>
                            <u-icon name="arrow-right" size="24" color="#c4c8cf" />
                          </view>
                        </view>
@@ -2227,7 +2232,7 @@ defineExpose({
                          <view class="sub-picker">
                            <text class="sub-picker-text">{{
                              datePart(record.DivorceDate) || t("AdminPage.notSetTip")
-                              }}</text>
+                            }}</text>
                            <u-icon name="arrow-right" size="24" color="#c4c8cf" />
                          </view>
                        </view>
@@ -2313,7 +2318,7 @@ defineExpose({
                      <view class="person-hero__line">
                        <text class="rel-name">{{ record.ChildrenSurname }}{{ record.ChildrenGenealogyName }}</text>
                        <text class="person-hero__gender">{{ genderText(personGender(record.ChildrenId, record.Gender))
-                        }}</text>
+                          }}</text>
                      </view>
                      <view class="person-hero__chips">
                        <text class="person-hero__chip">
@@ -2424,7 +2429,7 @@ defineExpose({
                    <text class="rel-name">{{ record.UserLocalName || record.UserName }}</text>
                    <text class="rel-sub">{{
                      record.ManagerIndc === "Y" ? t("FamilyTreePage.managerTag") : t("FamilyTreePage.memberTag")
-                      }}</text>
+                    }}</text>
                  </view>
                  <view class="perm-ops">
                    <view class="perm-op perm-op--danger" @tap="rejectPermission(record)">
@@ -2449,7 +2454,7 @@ defineExpose({
        <template #row="{ row }">
          <view class="pick-person">
            <view class="ft-av" :style="avatarFallbackStyle(!!row.AvatarUrl, row.Gender)">
-              <image v-if="row.AvatarUrl" class="ft-av__img" :src="row.AvatarUrl" mode="aspectFill" />
+              <image v-if="row.AvatarUrl" class="ft-av__img" :src="absoluteFileUrl(row.AvatarUrl)" mode="aspectFill" />
              <u-icon v-else name="account" size="40" :color="genderTheme(row.Gender)" />
            </view>
            <view class="ft-mrow__main">
@@ -2601,7 +2606,7 @@ defineExpose({
              <!-- 服务器文件列表限高滚动：文件多了不挤掉密码框/警告/按钮 -->
              <scroll-view v-if="!localFileName" scroll-y class="ft-exchange__list">
                <view v-if="importFilesLoading" class="ft-empty"><text>{{ t("FamilyTreePage.exchangeFileLoading")
-                    }}</text></view>
+                }}</text></view>
                <view v-else-if="!importFiles.length" class="ft-empty"><text>{{ t(imScope === "SUB" ?
                  "FamilyTreePage.exchangeFileEmptySub" : "FamilyTreePage.exchangeFileEmpty") }}</text></view>
                <view v-for="file in importFiles" :key="file.FileName" class="ft-exchange__row"
@@ -2622,7 +2627,7 @@ defineExpose({
                <view v-if="backupLoading" class="ft-empty"><text>{{ t("FamilyTreePage.exchangeFileLoading") }}</text>
                </view>
                <view v-else-if="!backupFiles.length" class="ft-empty"><text>{{ t("FamilyTreePage.exchangeBackupEmpty")
-                    }}</text></view>
+                }}</text></view>
                <view v-for="bk in backupFiles" :key="bk.FileName" class="ft-exchange__row"
                  :class="{ 'ft-exchange__row--on': pickedBackup === bk.FileName }" @tap="pickedBackup = bk.FileName">
                  <view class="ft-exchange__row-main">
@@ -2688,7 +2693,7 @@ defineExpose({
          <view class="ft-sheet__foot">
            <view class="ft-sheet__btn" @tap="cancelTreeEdit"><text>{{ t("AdminPage.cancelBut") }}</text></view>
            <view class="ft-sheet__btn ft-sheet__btn--primary" @tap="saveTreeEdit"><text>{{ t("AdminPage.saveBut")
-                }}</text>
+            }}</text>
            </view>
          </view>
        </view>