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

Fix order between views

This commit is contained in:
Adria Navarro 2024-12-31 12:43:16 +01:00
parent 71c4d3bc5a
commit 511592bf6c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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,7 +176,6 @@ 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,
@ -185,7 +184,7 @@ export const initialise = (context: StoreContext) => {
width: fieldSchema.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,