diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue index 8ba832c267..2326988f82 100644 --- a/packages/nc-gui/components/cell/SingleSelect.vue +++ b/packages/nc-gui/components/cell/SingleSelect.vue @@ -258,7 +258,7 @@ const handleClose = (e: MouseEvent) => { useEventListener(document, 'click', handleClose, true) const selectedOpt = computed(() => { - return options.value.find((o) => o.value === vModel.value || o.value === vModel.value?.trim()) + return options.value.find((o) => o.value === vModel.value || o.value === vModel.value?.toString()?.trim()) }) const onFocus = () => { diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue index d91eb14f52..e1dd68a6ce 100644 --- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue +++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue @@ -483,12 +483,14 @@ const isReadOnlyVirtualCell = (column: ColumnType) => { watch([expandedFormScrollWrapper, isLoading], () => { if (isMobileMode.value) return - if (expandedFormScrollWrapper.value && !isLoading.value) { - const height = expandedFormScrollWrapper.value.scrollHeight - expandedFormScrollWrapper.value.scrollTop = height + const expandedFormScrollWrapperEl = expandedFormScrollWrapper.value + + if (expandedFormScrollWrapperEl && !isLoading.value) { + const height = expandedFormScrollWrapperEl.scrollHeight + expandedFormScrollWrapperEl.scrollTop = height setTimeout(() => { - expandedFormScrollWrapper.value.scrollTop = 0 + expandedFormScrollWrapperEl.scrollTop = 0 }, 125) } }) diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue index 2754c988c7..0316dd1c2e 100644 --- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue +++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue @@ -387,7 +387,7 @@ useMenuCloseOnEsc(open) - +
@@ -411,7 +411,7 @@ useMenuCloseOnEsc(open) - +
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue index b4dad3e74a..7e56d05d9a 100644 --- a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue +++ b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue @@ -48,7 +48,8 @@ import Text from '~/components/cell/Text.vue' import User from '~/components/cell/User.vue' interface Props { - column: ColumnType + // column could be possibly undefined when the filter is created + column?: ColumnType filter: Filter } diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue index 82795110c7..05d567e9df 100644 --- a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue +++ b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue @@ -142,7 +142,12 @@ const onDelete = async () => { +