From c75f1964837aabe3af2f48ca097caf7092af3a50 Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Tue, 21 Nov 2023 12:38:08 +0000 Subject: [PATCH 1/2] fix: Fixed issue with Cell icon not taking column prop with column injection is provided --- packages/nc-gui/components/smartsheet/header/CellIcon.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/header/CellIcon.ts b/packages/nc-gui/components/smartsheet/header/CellIcon.ts index c279f43435..da3afd5966 100644 --- a/packages/nc-gui/components/smartsheet/header/CellIcon.ts +++ b/packages/nc-gui/components/smartsheet/header/CellIcon.ts @@ -112,9 +112,9 @@ export default defineComponent({ const abstractType = computed(() => column.value && sqlUi.value.getAbstractType(column.value)) return () => { - if (!column.value) return null + if (!column.value && !columnMeta.value) return null - return h(renderIcon(column.value, abstractType.value), { + return h(renderIcon((columnMeta.value ?? column.value)!, abstractType.value), { class: 'text-inherit mx-1', }) } From cce10a8ad4b0df24f1e382b4d9828127fbd91641 Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Tue, 21 Nov 2023 12:38:09 +0000 Subject: [PATCH 2/2] fix: Fixed issue with Cell icon not taking column prop with column injection is provided --- packages/nc-gui/components/smartsheet/header/CellIcon.ts | 4 +++- .../nc-gui/components/smartsheet/header/VirtualCellIcon.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/header/CellIcon.ts b/packages/nc-gui/components/smartsheet/header/CellIcon.ts index da3afd5966..9c4da211ce 100644 --- a/packages/nc-gui/components/smartsheet/header/CellIcon.ts +++ b/packages/nc-gui/components/smartsheet/header/CellIcon.ts @@ -103,7 +103,9 @@ export default defineComponent({ setup(props) { const columnMeta = toRef(props, 'columnMeta') - const column = inject(ColumnInj, columnMeta) + const injectedColumn = inject(ColumnInj, columnMeta) + + const column = computed(() => columnMeta.value ?? injectedColumn.value) const { sqlUis } = storeToRefs(useBase()) diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts index cfe2347ea0..e7e71286c4 100644 --- a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts +++ b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts @@ -78,7 +78,9 @@ export default defineComponent({ setup(props) { const columnMeta = toRef(props, 'columnMeta') - const column = inject(ColumnInj, columnMeta) as Ref + const injectedColumn = inject(ColumnInj, columnMeta) as Ref + + const column = computed(() => columnMeta.value ?? injectedColumn.value) let relationColumn: ColumnType