修改完成待测试
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import { createRequestError } from './request-client.js'
|
||||
import { normalizeBusinessFileAccess } from './business-file-contract.js'
|
||||
|
||||
const lineageTreeError = (message) =>
|
||||
createRequestError(message, 'LINEAGE_TREE_RESPONSE_INVALID')
|
||||
@@ -60,6 +61,7 @@ export const normalizeLineageTree = (value) => {
|
||||
throw lineageTreeError('世系树人物世代无效')
|
||||
}
|
||||
const generationName = normalizeLineageText(node.generationName, '字辈')
|
||||
const rankName = normalizeLineageText(node.rankName, '排行名称')
|
||||
const relationName = normalizeLineageText(node.relationName, '人物关系')
|
||||
const birthDate = lineageDatePart(node.birthDate, '出生日期')
|
||||
const deathDate = lineageDatePart(node.deathDate, '逝世日期')
|
||||
@@ -70,15 +72,22 @@ export const normalizeLineageTree = (value) => {
|
||||
name: normalizeLineageText(node.name, '人物姓名', { required: true }),
|
||||
relation:
|
||||
relationOverride ||
|
||||
rankName ||
|
||||
(parentId
|
||||
? (relationName && relationName !== '配偶' ? relationName : '后代')
|
||||
? (relationName && relationName !== '配偶' ? relationName : '排行待补')
|
||||
: relationName || '始祖'),
|
||||
rankName,
|
||||
generation: node.generation,
|
||||
branch: generationName
|
||||
? (generationName.endsWith('字辈') ? generationName : `${generationName}字辈`)
|
||||
: '字辈待补',
|
||||
years: birthDate || deathDate ? `${birthDate}—${deathDate}` : '生卒待补',
|
||||
treeYears: compactLineageYears(birthDate, deathDate),
|
||||
avatarFile: normalizeBusinessFileAccess(
|
||||
node.avatarFile,
|
||||
'世系人物头像',
|
||||
'LINEAGE_TREE_RESPONSE_INVALID'
|
||||
),
|
||||
sex: normalizeLineageText(node.sex, '性别'),
|
||||
personStatus: normalizeLineageText(node.personStatus, '人物状态')
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user