Format strings
This commit is contained in:
parent
58a51207f3
commit
cbd82bcf6a
|
@ -56,11 +56,11 @@ export const deriveStores = context => {
|
||||||
...row,
|
...row,
|
||||||
__idx: idx,
|
__idx: idx,
|
||||||
...customColumns.reduce((acc, c) => {
|
...customColumns.reduce((acc, c) => {
|
||||||
const isSingle =
|
const fromSingle =
|
||||||
$enrichedSchema[c.related.field].relationshipType ===
|
$enrichedSchema[c.related.field].relationshipType ===
|
||||||
RelationshipType.ONE_TO_MANY
|
RelationshipType.ONE_TO_MANY
|
||||||
|
|
||||||
acc[c.name] = getRelatedTableValues(row, c, isSingle)
|
acc[c.name] = getRelatedTableValues(row, c, fromSingle)
|
||||||
return acc
|
return acc
|
||||||
}, {}),
|
}, {}),
|
||||||
}))
|
}))
|
||||||
|
|
|
@ -61,10 +61,10 @@ export function enrichSchemaWithRelColumns(schema) {
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getRelatedTableValues(row, field, isSingle) {
|
export function getRelatedTableValues(row, field, fromSingle) {
|
||||||
let result = ""
|
let result = ""
|
||||||
try {
|
try {
|
||||||
if (isSingle) {
|
if (fromSingle) {
|
||||||
result = row[field.related.field]?.[0]?.[field.related.subField]
|
result = row[field.related.field]?.[0]?.[field.related.subField]
|
||||||
} else {
|
} else {
|
||||||
const parser =
|
const parser =
|
||||||
|
@ -75,7 +75,18 @@ export function getRelatedTableValues(row, field, isSingle) {
|
||||||
parser(r[field.related.subField], field)
|
parser(r[field.related.subField], field)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
).join(", ")
|
)
|
||||||
|
|
||||||
|
if (
|
||||||
|
[
|
||||||
|
FieldType.STRING,
|
||||||
|
FieldType.NUMBER,
|
||||||
|
FieldType.BIGINT,
|
||||||
|
FieldType.BOOLEAN,
|
||||||
|
].includes(field.type)
|
||||||
|
) {
|
||||||
|
result = result.join(", ")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
result = "Not rendable"
|
result = "Not rendable"
|
||||||
|
|
Loading…
Reference in New Issue