From 6fe55b60aa218825be4c5de1664b5b3f97176eda Mon Sep 17 00:00:00 2001 From: Pranav C Balan Date: Tue, 1 Jun 2021 18:50:42 +0530 Subject: [PATCH] fix(gui): search field selection fixes search filed selection issue which breaks entire ui. fix #210 Signed-off-by: Pranav C Balan --- .../nc-gui/components/project/spreadsheet/mixins/spreadsheet.js | 2 +- .../nc-gui/components/project/spreadsheet/rowsXcDataTable.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js b/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js index 5b94dc58d6..85d7b301aa 100644 --- a/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js +++ b/packages/nc-gui/components/project/spreadsheet/mixins/spreadsheet.js @@ -85,7 +85,7 @@ export default { concatenatedXWhere() { let where = ''; if (this.searchField && this.searchQuery.trim()) { - if (['text', 'string'].includes(this.sqlUi.getAbstractType(this.availableColumns.find(({_cn}) => _cn === this.searchField)))) { + if (['text', 'string'].includes(this.sqlUi.getAbstractType(this.availableColumns.find(({_cn}) => _cn === this.searchField) || this.availableColumns[0]))) { where = `(${this.searchField},like,%${this.searchQuery.trim()}%)` } else { where = `(${this.searchField},eq,${this.searchQuery.trim()})` diff --git a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue index eaec263121..86d06010d7 100644 --- a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue +++ b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue @@ -19,7 +19,7 @@ + @click="searchField = col._cn"> {{ col._cn }}