From 367bfb93f8fcd4e4cc8c1544126cc11a450e0481 Mon Sep 17 00:00:00 2001 From: mertmit Date: Sat, 30 Apr 2022 10:57:58 +0300 Subject: [PATCH 1/2] fix: monaco editor dialog closes on click Signed-off-by: mertmit --- .../components/project/spreadsheet/views/xcGridView.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue index 5516d09b9f..e5faaf2893 100644 --- a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue +++ b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue @@ -729,9 +729,12 @@ export default { }, onClickOutside() { if ( - this.meta.columns && + (this.meta.columns && this.meta.columns[this.selected.col] && - this.meta.columns[this.selected.col].virtual + this.meta.columns[this.selected.col].virtual) || + (this.availableColumns && + this.availableColumns[this.editEnabled.col] && + this.availableColumns[this.editEnabled.col].uidt === "JSON") ) { return; } From 4a63a31d03eb3e1d5e61341a397b5d421099e294 Mon Sep 17 00:00:00 2001 From: mertmit Date: Sat, 30 Apr 2022 18:39:39 +0300 Subject: [PATCH 2/2] fix: base isJSON on uiType only Signed-off-by: mertmit --- packages/nc-gui/components/project/spreadsheet/mixins/cell.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js index 696c0347d3..c6fbccca6e 100644 --- a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js +++ b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js @@ -45,7 +45,7 @@ export default { return this.abstractType === 'datetime' || this.uiDatatype === 'DateTime' }, isJSON() { - return this.abstractType === 'json' || this.uiDatatype === 'JSON' + return this.uiDatatype === 'JSON' }, isEnum() { return this.uiDatatype === 'SingleSelect'