From 424d23f2cbc516fd9802c506af5617e377a90102 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Sat, 3 Dec 2022 13:45:44 +0800
Subject: [PATCH] chore(nc-gui): resolve PR comments

---
 packages/nc-gui/components/cell/TextArea.vue                  | 2 +-
 packages/nc-gui/components/smartsheet/Grid.vue                | 2 +-
 .../nc-gui/components/smartsheet/toolbar/SortListMenu.vue     | 4 ++--
 packages/nc-gui/components/smartsheet/toolbar/ViewActions.vue | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index e19aee883e..d5bd1c4479 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -3,7 +3,7 @@ import type { VNodeRef } from '@vue/runtime-core'
 import { EditModeInj, inject, useVModel } from '#imports'
 
 const props = defineProps<{
-  modelValue?: string | number | string[]
+  modelValue?: string | number
 }>()
 
 const emits = defineEmits(['update:modelValue'])
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 74a2c8bc5c..0243f4613e 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -298,7 +298,7 @@ function scrollToCell(row?: number | null, col?: number | null) {
   row = row ?? selectedCell.row
   col = col ?? selectedCell.col
 
-  if (row && col) {
+  if (row !== undefined && col !== undefined && row !== null && col !== null) {
     // get active cell
     const rows = tbodyEl.value?.querySelectorAll('tr')
     const cols = rows?.[row].querySelectorAll('td')
diff --git a/packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue
index 6b018c32fd..ce48d10fd0 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue
@@ -40,7 +40,7 @@ const columnByID = computed(() =>
   }, {} as Record<string, ColumnType>),
 )
 
-const getColumnByID = (key?: string) => {
+const getColumnUidtByID = (key?: string) => {
   if (!key) return ''
   return columnByID.value[key]?.uidt || ''
 }
@@ -100,7 +100,7 @@ useMenuCloseOnEsc(open)
               @select="saveOrUpdate(sort, i)"
             >
               <a-select-option
-                v-for="(option, j) of getSortDirectionOptions(getColumnByID(sort.fk_column_id))"
+                v-for="(option, j) of getSortDirectionOptions(getColumnUidtByID(sort.fk_column_id))"
                 :key="j"
                 :value="option.value"
               >
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewActions.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewActions.vue
index 004a257873..d182980b12 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewActions.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewActions.vue
@@ -48,7 +48,7 @@ const { isUIAllowed } = useUIPermission()
 
 const { isSharedBase } = useProject()
 
-const Icon = $computed(() => {
+const Icon = computed(() => {
   switch (selectedView.value?.lock_type) {
     case LockType.Personal:
       return MdiAccountIcon