From d6b9a77d5924fbbe5bc787c1ac3b862a4e89ece6 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Sun, 7 Aug 2022 23:33:08 +0530 Subject: [PATCH] fix(gui-v2): virtual column header tooltip correction - lookup/rollup Signed-off-by: Pranav C --- .../components/smartsheet-header/VirtualCell.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue b/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue index d3ae873a9d..9b9cdfc801 100644 --- a/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue +++ b/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue @@ -19,8 +19,8 @@ const { isLookup, isBt, isRollup, isMm, isHm, isFormula, isCount } = useVirtualC const colOptions = $computed(() => column.value?.colOptions) const tableTile = $computed(() => meta?.value?.title) -const relationColumn = $computed(() => { - if (isMm || isHm || isBt) { +const relationColumnOptions = $computed(() => { + if (isMm.value || isHm.value || isBt.value) { return column.value?.colOptions as LinkToAnotherRecordType } else if ((column?.value?.colOptions as LookupType | RollupType)?.fk_relation_column_id) { return meta?.value?.columns?.find( @@ -31,18 +31,18 @@ const relationColumn = $computed(() => { }) const relatedTableMeta = $computed( - () => relationColumn && relationColumn?.fk_related_model_id && metas.value?.[relationColumn?.fk_related_model_id as string], + () => relationColumnOptions?.fk_related_model_id && metas.value?.[relationColumnOptions?.fk_related_model_id as string], ) const relatedTableTitle = $computed(() => relatedTableMeta?.title) const childColumn = $computed(() => { if (relatedTableMeta?.columns) { - if (isRollup) { + if (isRollup.value) { const ch = relatedTableMeta?.columns.find((c: ColumnType) => c.id === (colOptions as RollupType).fk_rollup_column_id) return ch } - if (isLookup) { + if (isLookup.value) { const ch = relatedTableMeta?.columns.find((c: ColumnType) => c.id === (colOptions as LookupType).fk_lookup_column_id) return ch }