From 2a99584a33edb0929424f3e8dcdcf7ad9a5fc60a Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 3 Aug 2022 22:05:37 +0530 Subject: [PATCH] fix(gui-v2): show icons on cell hover Signed-off-by: Pranav C --- .../components/smartsheet/VirtualCell.vue | 22 +------------------ .../components/virtual-cell/BelongsTo.vue | 12 ++++++++-- .../components/virtual-cell/HasMany.vue | 14 +++++++++--- .../components/virtual-cell/ManyToMany.vue | 18 ++++++++++----- packages/nc-gui-v2/context/index.ts | 2 +- 5 files changed, 35 insertions(+), 33 deletions(-) diff --git a/packages/nc-gui-v2/components/smartsheet/VirtualCell.vue b/packages/nc-gui-v2/components/smartsheet/VirtualCell.vue index 6ab9fc31a2..77546d9933 100644 --- a/packages/nc-gui-v2/components/smartsheet/VirtualCell.vue +++ b/packages/nc-gui-v2/components/smartsheet/VirtualCell.vue @@ -22,7 +22,7 @@ provide(ColumnInj, column) provide(ValueInj, value) provide(ActiveCellInj, active) provide(RowInj, row) -provide(ValueInj, value) +provide(ValueInj, toRef(props, 'modelValue')) const { isLookup, isBt, isRollup, isMm, isHm, isFormula, isCount } = useVirtualCell(column) @@ -42,23 +42,3 @@ const { isLookup, isBt, isRollup, isMm, isHm, isFormula, isCount } = useVirtualC - - diff --git a/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue b/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue index 9b5fb2ba04..16b3975800 100644 --- a/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue +++ b/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue @@ -23,14 +23,22 @@ await loadRelatedTableMeta() + diff --git a/packages/nc-gui-v2/components/virtual-cell/HasMany.vue b/packages/nc-gui-v2/components/virtual-cell/HasMany.vue index 81a3349252..b093bf0ea7 100644 --- a/packages/nc-gui-v2/components/virtual-cell/HasMany.vue +++ b/packages/nc-gui-v2/components/virtual-cell/HasMany.vue @@ -25,7 +25,7 @@ await loadRelatedTableMeta() + diff --git a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue index b3707d4f32..dfad9d76fd 100644 --- a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue +++ b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue @@ -26,8 +26,7 @@ await loadRelatedTableMeta() + diff --git a/packages/nc-gui-v2/context/index.ts b/packages/nc-gui-v2/context/index.ts index c459452198..6a3b562efe 100644 --- a/packages/nc-gui-v2/context/index.ts +++ b/packages/nc-gui-v2/context/index.ts @@ -17,7 +17,7 @@ export const ChangePageInj: InjectionKey['changeP export const IsFormInj: InjectionKey = Symbol('is-form-injection') export const IsGridInj: InjectionKey = Symbol('is-grid-injection') export const IsLockedInj: InjectionKey = Symbol('is-locked-injection') -export const ValueInj: InjectionKey = Symbol('value-injection') +export const ValueInj: InjectionKey> = Symbol('value-injection') export const ActiveViewInj: InjectionKey> = Symbol('active-view-injection') export const ReadonlyInj: InjectionKey = Symbol('readonly-injection') export const ReloadViewDataHookInj: InjectionKey> = Symbol('reload-view-data-injection')