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 rework-grid-block-height

This commit is contained in:
Andrew Kingston 2024-05-17 08:57:38 +01:00 committed by GitHub
parent f9c4e901f8 46072e8b27
commit 425dd99c28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.26.3", "version": "2.26.4",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

3
packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
View File

@ -14,9 +14,8 @@
import LinkedRowSelector from "components/common/LinkedRowSelector.svelte" import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
import Editor from "../../integration/QueryEditor.svelte" import Editor from "../../integration/QueryEditor.svelte"
export let defaultValue
export let meta export let meta
export let value = defaultValue || (meta.type === "boolean" ? false : "") export let value
export let readonly export let readonly
export let error export let error

2
packages/server/src/utilities/rowProcessor/index.ts
View File

@ -242,7 +242,7 @@ export async function outputProcessing<T extends Row[] | Row>(
} }
return attachment return attachment
} }
if (typeof row[property] === "string") { if (typeof row[property] === "string" && row[property].length) {
row[property] = JSON.parse(row[property]) row[property] = JSON.parse(row[property])
} }
if (Array.isArray(row[property])) { if (Array.isArray(row[property])) {