diff --git a/editor/src/editor.js b/editor/src/editor.js index 1a92dae..278d559 100644 --- a/editor/src/editor.js +++ b/editor/src/editor.js @@ -279,7 +279,7 @@ function Editor(holder, input) { if (col.children && col.children.length > 0) { value = col.children[0].text } - transform(typeof value === 'string' ? value.replace(/^:/, '=') : '', $(td), id, editor, rowData) + transform(typeof value === 'string' ? value.replace(/^:/, '=') : '', $(td), id, editor, {row: rowData}) return td }) ]) @@ -365,6 +365,7 @@ function Editor(holder, input) { element.html(converted) }) + .catch(e => console.warn(e)) } else { let re = /^([A-Z0-9 ]+)::\s*(.*)$/i; let res = text.match(re) @@ -633,22 +634,21 @@ function Editor(holder, input) { let query = $input.val() - Promise.any([ - match(query, /{{query(!?):\s*([^}]+)}}/) - ]).then(res => { - if (res[1] === '!') { - return search.startQuery(res[2]) - .then(hits => _.uniqBy(_.flatMap(hits, formatTitleResult), _.property('text'))) - .then(results => editor.replaceChildren(id, results)) - .finally(() => editor.render()) - } else { - return search.startQuery(res[2]) - .then(hits => _.groupBy(hits, (it) => it.title)) - .then(hits => _.flatMap(hits, formatLineResult)) - .then(results => editor.replaceChildren(id, results)) - .finally(() => editor.render()) - } - }).catch(() => console.log('match error')) + match(query, /{{query(!?):\s*([^}]+)}}/) + .then(res => { + if (res[1] === '!') { + return search.startQuery(res[2]) + .then(hits => _.uniqBy(_.flatMap(hits, formatTitleResult), _.property('text'))) + .then(results => editor.replaceChildren(id, results)) + .finally(() => editor.render()) + } else { + return search.startQuery(res[2]) + .then(hits => _.groupBy(hits, (it) => it.title)) + .then(hits => _.flatMap(hits, formatLineResult)) + .then(results => editor.replaceChildren(id, results)) + .finally(() => editor.render()) + } + }) }); return editor }) diff --git a/editor/src/formula.js b/editor/src/formula.js index 8b87a51..8892616 100644 --- a/editor/src/formula.js +++ b/editor/src/formula.js @@ -1,4 +1,6 @@ import moment from "moment"; +import "moment/locale/nl" +moment.locale('nl') /** * @param {string|moment.Moment} x @@ -13,6 +15,10 @@ function date(x) { if (r) { return moment(r[1], "DD MMM YYYY") } + return moment(x, "DD MMM YYYY") + } + if (_.isObject(x) && _.has(x, 'title')) { + return moment(x.title, "DD MMM YYYY") } return moment(x, "YYYY-MM-DD"); }