MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/ts-store-conversions-pc

This commit is contained in:
Peter Clement 2024-12-31 13:43:55 +00:00 committed by GitHub
parent 34e5c1ff91 ed1c9d08cc
commit 694657c90e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/frontend-core/src/components/grid/stores/columns.ts
View File

@ -161,7 +161,7 @@ export const initialise = (context: StoreContext) => {
columns.set([]) columns.set([])
return return
} }
const $columns = get(columns)
const $displayColumn = get(displayColumn) const $displayColumn = get(displayColumn)
// Find primary display // Find primary display
@ -176,16 +176,15 @@ export const initialise = (context: StoreContext) => {
Object.keys($enrichedSchema) Object.keys($enrichedSchema)
.map(field => { .map(field => {
const fieldSchema = $enrichedSchema[field] const fieldSchema = $enrichedSchema[field]
const oldColumn = $columns?.find(col => col.name === field)
const column: UIColumn = { const column: UIColumn = {
type: fieldSchema.type, type: fieldSchema.type,
name: field, name: field,
label: fieldSchema.displayName || field, label: fieldSchema.displayName || field,
schema: fieldSchema, schema: fieldSchema,
width: fieldSchema.width || oldColumn?.width || DefaultColumnWidth, width: fieldSchema.width || DefaultColumnWidth,
visible: fieldSchema.visible ?? true, visible: fieldSchema.visible ?? true,
readonly: fieldSchema.readonly, readonly: fieldSchema.readonly,
order: fieldSchema.order ?? oldColumn?.order, order: fieldSchema.order,
conditions: fieldSchema.conditions, conditions: fieldSchema.conditions,
related: fieldSchema.related, related: fieldSchema.related,
calculationType: fieldSchema.calculationType, calculationType: fieldSchema.calculationType,