1
0
Fork 0
mirror of synced 2024-06-02 02:25:17 +12:00

Update table component to use new settings component and support new column config setting structure

This commit is contained in:
Andrew Kingston 2022-02-10 16:42:15 +00:00
parent b22cfb8a3f
commit 5f11684069
2 changed files with 14 additions and 7 deletions

View file

@ -2680,11 +2680,10 @@
"defaultValue": 8
},
{
"type": "multifield",
"type": "columns",
"label": "Columns",
"key": "columns",
"dependsOn": "dataProvider",
"placeholder": "All columns"
"dependsOn": "dataProvider"
},
{
"type": "select",

View file

@ -40,7 +40,8 @@
// Check for an invalid column selection
let invalid = false
customColumns?.forEach(column => {
if (schema[column] == null) {
const columnName = typeof column === "string" ? column : column.name
if (schema[columnName] == null) {
invalid = true
}
})
@ -75,9 +76,16 @@
}
fields.forEach(field => {
newSchema[field] = schema[field]
if (schema[field] && UnsortableTypes.indexOf(schema[field].type) !== -1) {
newSchema[field].sortable = false
const columnName = typeof field === "string" ? field : field.name
if (!schema[columnName]) {
return
}
newSchema[columnName] = schema[columnName]
if (UnsortableTypes.includes(schema[columnName].type)) {
newSchema[columnName].sortable = false
}
if (field?.displayName) {
newSchema[columnName].displayName = field?.displayName
}
})
return newSchema