From 9e0de1f1ee32511cf5c9b3b19accad354c3fda92 Mon Sep 17 00:00:00 2001 From: bobzel Date: Thu, 1 Feb 2024 10:41:35 -0500 Subject: enabled lists to be entered via dashfieldview. changed code/text import to allow data to be inserted into template. --- src/client/views/nodes/formattedText/RichTextRules.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/client/views/nodes/formattedText') diff --git a/src/client/views/nodes/formattedText/RichTextRules.ts b/src/client/views/nodes/formattedText/RichTextRules.ts index ce2c33fb4..2fdd6374a 100644 --- a/src/client/views/nodes/formattedText/RichTextRules.ts +++ b/src/client/views/nodes/formattedText/RichTextRules.ts @@ -289,7 +289,7 @@ export class RichTextRules { // [[fieldKey=value]] => show field and also set its value // [[fieldKey:docTitle]] => show field of doc new InputRule( - new RegExp(/\[\[([a-zA-Z_\? \-0-9]*)(=[a-zA-Z_@\? /\-0-9]*)?(:[a-zA-Z_@:\.\? \-0-9]+)?\]\]$/), + new RegExp(/\[\[([a-zA-Z_\? \-0-9]*)(=[a-z,A-Z_@\? /\-0-9]*)?(:[a-zA-Z_@:\.\? \-0-9]+)?\]\]$/), (state, match, start, end) => { const fieldKey = match[1]; const docTitle = match[3]?.replace(':', ''); @@ -325,7 +325,11 @@ export class RichTextRules { } return state.tr; } - if (value !== '' && value !== undefined) { + if (value?.includes(',')) { + const values = value.split(','); + const strs = values.some(v => !v.match(/^[-]?[0-9.]$/)); + this.Document[DocData][fieldKey] = strs ? new List(values) : new List(values.map(v => Number(v))); + } else if (value !== '' && value !== undefined) { const num = value.match(/^[0-9.]$/); this.Document[DocData][fieldKey] = value === 'true' ? true : value === 'false' ? false : num ? Number(value) : value; } -- cgit v1.2.3-70-g09d2