From 940478ae545bde375436a8757a673ac15aa34f04 Mon Sep 17 00:00:00 2001 From: mertmit Date: Tue, 11 Oct 2022 11:33:44 +0300 Subject: [PATCH] fix: PR requested changes Signed-off-by: mertmit --- packages/nc-gui/components/cell/MultiSelect.vue | 8 +++++--- packages/nc-gui/components/cell/SingleSelect.vue | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index bc8c89bde9..aec566eca1 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -149,8 +149,9 @@ watch(isOpen, (n, _o) => { {{ op.title }} + {{ op.title }} + @@ -159,7 +160,7 @@ watch(isOpen, (n, _o) => { v-if="options.find((el) => el.title === val)" class="rounded-tag" :style="{ display: 'flex', alignItems: 'center' }" - :color="(options.find((el) => el.title === val) as SelectOptionType).color" + :color="options.find((el) => el.title === val)?.color" :closable="active && (vModel.length > 1 || !column?.rqd)" :close-icon="h(MdiCloseCircle, { class: ['ms-close-icon'] })" @close="onClose" @@ -167,8 +168,9 @@ watch(isOpen, (n, _o) => { {{ val }} + {{ val }} + diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue index f707277a28..aca6af09ee 100644 --- a/packages/nc-gui/components/cell/SingleSelect.vue +++ b/packages/nc-gui/components/cell/SingleSelect.vue @@ -86,8 +86,9 @@ watch(isOpen, (n, _o) => { {{ op.title }} + {{ op.title }} +