diff --git a/backend/app/services/oa_related_approval.py b/backend/app/services/oa_related_approval.py
index 557cc5fb..8a20ad7e 100644
--- a/backend/app/services/oa_related_approval.py
+++ b/backend/app/services/oa_related_approval.py
@@ -37,16 +37,46 @@ def _schema_rules(schema: Any) -> List[dict]:
return out
+def _extract_upload_urls(raw: Any) -> List[str]:
+ """Normalize FormCreate upload / 业务附件值为 URL 列表。"""
+ if raw is None or raw == "" or raw == []:
+ return []
+ if isinstance(raw, list):
+ items: List[Any] = raw
+ elif isinstance(raw, str):
+ items = [x.strip() for x in raw.split(",") if x.strip()]
+ elif isinstance(raw, dict):
+ items = [raw]
+ else:
+ items = [raw]
+ urls: List[str] = []
+ for it in items:
+ if it is None or it == "":
+ continue
+ if isinstance(it, dict):
+ u = it.get("url") or it.get("fileUrl") or ""
+ resp = it.get("response")
+ if not u and isinstance(resp, dict):
+ data = resp.get("data") if isinstance(resp.get("data"), dict) else {}
+ u = resp.get("url") or resp.get("fileUrl") or data.get("url") or data.get("fileUrl") or ""
+ u = str(u or "").strip()
+ if u:
+ urls.append(u)
+ continue
+ s = str(it).strip()
+ if s:
+ urls.append(s)
+ return urls
+
+
def _format_value(typ: str, raw: Any) -> Tuple[str, bool]:
"""returns (text, fullWidth)"""
if typ in UPLOAD_TYPES:
- if raw is None or raw == "" or raw == []:
- n = 0
- elif isinstance(raw, list):
- n = len(raw)
- else:
- n = len([x for x in str(raw).split(",") if x.strip()])
- return f"{n} 个", False
+ urls = _extract_upload_urls(raw)
+ if not urls:
+ return "0 个", False
+ # 展示附件地址(多条用中文顿号);地址较长默认占满一行
+ return "、".join(urls), True
if typ == "relatedApproval":
if isinstance(raw, list):
n = len([x for x in raw if str(x).strip()])
diff --git a/backend/tests/test_oa_related_approval.py b/backend/tests/test_oa_related_approval.py
index 74de55b6..0f820a70 100644
--- a/backend/tests/test_oa_related_approval.py
+++ b/backend/tests/test_oa_related_approval.py
@@ -20,7 +20,7 @@ class TestFlatten(unittest.TestCase):
}
data = {
"reason": "出差",
- "files": ["a.png", "b.png"],
+ "files": ["https://cdn.example.com/a.png", "https://cdn.example.com/b.png"],
"prev": ["id1", "id2"],
"long": "很长很长的说明文字" * 5,
}
@@ -28,10 +28,28 @@ class TestFlatten(unittest.TestCase):
labels = [f["label"] for f in fields]
self.assertNotIn("说明", labels)
self.assertEqual(fields[0], {"label": "事由", "value": "出差"})
- self.assertEqual(fields[1]["value"], "2 个")
+ self.assertEqual(
+ fields[1]["value"],
+ "https://cdn.example.com/a.png、https://cdn.example.com/b.png",
+ )
+ self.assertTrue(fields[1].get("fullWidth"))
self.assertEqual(fields[2]["value"], "已关联 2 条")
self.assertTrue(fields[3].get("fullWidth"))
+ def test_upload_object_list_extracts_url(self):
+ schema = {"rule": [{"type": "upload", "field": "files", "title": "附件"}]}
+ data = {
+ "files": [
+ {"name": "a.pdf", "url": "https://cdn.example.com/a.pdf"},
+ {"name": "b.pdf", "response": {"data": {"fileUrl": "/mini/b.pdf"}}},
+ ]
+ }
+ fields = flatten_form_fields_for_summary(schema, data)
+ self.assertEqual(
+ fields[0]["value"],
+ "https://cdn.example.com/a.pdf、/mini/b.pdf",
+ )
+
def test_extract_links_with_field_key_and_dedupe(self):
schema = {
"rule": [
diff --git a/web-admin/src/components/oa-approval/OaRelatedApproval.vue b/web-admin/src/components/oa-approval/OaRelatedApproval.vue
index c2a67a80..b109119c 100644
--- a/web-admin/src/components/oa-approval/OaRelatedApproval.vue
+++ b/web-admin/src/components/oa-approval/OaRelatedApproval.vue
@@ -63,7 +63,22 @@
:class="{ 'oa-related-approval__field--full': f.fullWidth && expanded.has(item.id) }"
>
{{ f.label }}
- {{ f.value }}
+
+
+
+ {{ displayUrlLabel(u, ui, splitUrls(f.value).length) }}
+
+
+ {{ f.value }}
+
@@ -153,6 +168,7 @@
fetchOaRelatedSummaries,
type OaRelatedSummary
} from '@/api/oaApproval'
+ import { attachmentFullUrl } from '@/composables/useAttachmentActions'
defineOptions({ name: 'relatedApproval' })
@@ -226,6 +242,31 @@
return fields.slice(0, COLLAPSE_FIELD_COUNT)
}
+ /** 顿号/逗号分隔的 URL 列表;非 URL 文本返回空数组走纯文本展示 */
+ function splitUrls(value: string): string[] {
+ const raw = String(value || '').trim()
+ if (!raw) return []
+ const parts = raw
+ .split(/[、,,\s]+/)
+ .map((s) => s.trim())
+ .filter(Boolean)
+ if (!parts.length) return []
+ const looksLikeUrl = parts.every(
+ (p) => /^https?:\/\//i.test(p) || p.startsWith('/') || /\.[a-z0-9]{2,8}(\?|$)/i.test(p)
+ )
+ return looksLikeUrl ? parts : []
+ }
+
+ function toFullUrl(u: string) {
+ return attachmentFullUrl(u) || u
+ }
+
+ function displayUrlLabel(u: string, index: number, total: number) {
+ const name = u.split('?')[0].split('/').filter(Boolean).pop() || u
+ const label = decodeURIComponent(name)
+ return total > 1 ? `${index + 1}. ${label}` : label
+ }
+
function toggleExpand(id: string) {
const next = new Set(expanded.value)
if (next.has(id)) next.delete(id)
@@ -436,10 +477,22 @@
}
.oa-related-approval__field-value {
+ display: inline-flex;
+ flex-wrap: wrap;
+ gap: 4px 10px;
color: var(--mint-text, #334155);
word-break: break-all;
}
+ .oa-related-approval__link {
+ color: var(--primary, #10b981);
+ text-decoration: underline;
+ }
+
+ .oa-related-approval__link:hover {
+ color: var(--primary-dark, #059669);
+ }
+
.oa-related-approval--stack .oa-related-approval__fields {
flex-direction: column;
gap: 4px;