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

Merge pull request #15505 from Budibase/fix/disable-cell-formatting 

Disabling grid cell formatting
This commit is contained in:
Michael Drury 2025-02-07 14:06:08 +00:00 committed by GitHub
parent b4086e1187 e9e1eb7a2d
commit ad55f88756
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/client/manifest.json
View File

@ -3089,12 +3089,6 @@
"type": "tableConditions", "type": "tableConditions",
"label": "Conditions", "label": "Conditions",
"key": "conditions" "key": "conditions"
},
{
"type": "text",
"label": "Format",
"key": "format",
"info": "Changing format will display values as text"
} }
] ]
}, },
@ -7691,8 +7685,7 @@
{ {
"type": "columns/grid", "type": "columns/grid",
"key": "columns", "key": "columns",
"resetOn": "table", "resetOn": "table"
"nested": true
} }
] ]
}, },

16
packages/client/src/components/app/GridBlock.svelte
View File

@ -5,7 +5,7 @@
import { get, derived, readable } from "svelte/store" import { get, derived, readable } from "svelte/store"
import { featuresStore } from "stores" import { featuresStore } from "stores"
import { Grid } from "@budibase/frontend-core" import { Grid } from "@budibase/frontend-core"
import { processStringSync } from "@budibase/string-templates" // import { processStringSync } from "@budibase/string-templates"
// table is actually any datasource, but called table for legacy compatibility // table is actually any datasource, but called table for legacy compatibility
export let table export let table
@ -105,7 +105,7 @@
order: idx, order: idx,
conditions: column.conditions, conditions: column.conditions,
visible: !!column.active, visible: !!column.active,
format: createFormatter(column), // format: createFormatter(column),
} }
if (column.width) { if (column.width) {
overrides[column.field].width = column.width overrides[column.field].width = column.width
@ -114,12 +114,12 @@
return overrides return overrides
} }
const createFormatter = column => { // const createFormatter = column => {
if (typeof column.format !== "string" || !column.format.trim().length) { // if (typeof column.format !== "string" || !column.format.trim().length) {
return null // return null
} // }
return row => processStringSync(column.format, { [id]: row }) // return row => processStringSync(column.format, { [id]: row })
} // }
const enrichButtons = buttons => { const enrichButtons = buttons => {
if (!buttons?.length) { if (!buttons?.length) {