github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-08 02:44:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix primitive values for JSON code input (#12703)

Browse Source
This commit is contained in:
Azri Kahar
2022-04-12 19:50:56 +08:00
committed by GitHub
parent 48ae9f870f
commit 7b0de4eb9b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/interfaces/input-code/input-code.vue
View File

@@ -37,7 +37,7 @@ export default defineComponent({
default: false,
},
value: {
type: [String, Object, Array] as PropType<string | Record<string, any> | any[]>,
type: [String, Object, Array, Number, Boolean] as PropType<string | Record<string, any> | any[]>,
default: null,
},
altOptions: {
@@ -104,7 +104,9 @@ export default defineComponent({
}
try {
emit('input', JSON.parse(content));
const parsedJson = JSON.parse(content);
if (typeof parsedJson !== 'string') return emit('input', parsedJson);
return emit('input', content);
} catch {
// We won't stage invalid JSON
}
@@ -118,7 +120,7 @@ export default defineComponent({
const stringValue = computed<string>(() => {
if (props.value === null) return '';
if (typeof props.value === 'object') {
if (props.type === 'json' || typeof props.value === 'object') {
return JSON.stringify(props.value, null, 4);
}
@@ -133,6 +135,9 @@ export default defineComponent({
);
watch(stringValue, () => {
// prevent setting redundantly stringified json value when it's actually the same value
if (props.type === 'json' && codemirror?.getValue() === props.value) return;
if (codemirror?.getValue() !== stringValue.value) {
codemirror?.setValue(stringValue.value || '');
}