From f4057424d8eef3b5d9431ea672a700de0a0abf0f Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 10 Aug 2022 11:15:08 +0530 Subject: [PATCH 1/3] fix(gui-v2): ignore only mm and hm fields in fields re #3063 Signed-off-by: Pranav C --- .../smartsheet-toolbar/FieldListAutoCompleteDropdown.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldListAutoCompleteDropdown.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldListAutoCompleteDropdown.vue index 20fd185de0..2266c38b05 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldListAutoCompleteDropdown.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldListAutoCompleteDropdown.vue @@ -54,7 +54,7 @@ const options = computed(() => ?.filter((c: ColumnType) => { /** ignore hasmany and manytomany relations if it's using within sort menu */ if (isSort) { - return ( + return !( c.uidt === UITypes.LinkToAnotherRecord && (c.colOptions as LinkToAnotherRecordType).type !== RelationTypes.BELONGS_TO ) /** ignore vutual fields which are system fields ( mm relation ) */ From c8be09ec61cb87c431a10cbd5e4c50631fcc5cbd Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 10 Aug 2022 11:25:11 +0530 Subject: [PATCH 2/3] fix(gui-v2): add relative position to menu item element re #3053 Signed-off-by: Pranav C --- packages/nc-gui-v2/assets/style-v2.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui-v2/assets/style-v2.scss b/packages/nc-gui-v2/assets/style-v2.scss index 9bc1f12ce1..5c55ae5c33 100644 --- a/packages/nc-gui-v2/assets/style-v2.scss +++ b/packages/nc-gui-v2/assets/style-v2.scss @@ -75,7 +75,7 @@ html { // menu item styling .nc-menu-item { - @apply cursor-pointer text-xs flex items-center gap-2 px-4 py-3 after:(content-[''] absolute top-0 left-0 bottom-0 w-full h-full right-0 bg-current opacity-0 transition transition-opactity duration-100) hover:(after:(opacity-5)); + @apply cursor-pointer text-xs flex items-center gap-2 px-4 py-3 relative after:(content-[''] absolute top-0 left-0 bottom-0 w-full h-full right-0 bg-current opacity-0 transition transition-opactity duration-100) hover:(after:(opacity-5)); } .nc-sidebar-right-item { From 86a4b5dd6d363397240888cb7a922063263c637f Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 10 Aug 2022 11:31:51 +0530 Subject: [PATCH 3/3] fix(gui-v2): set pointer events to none for after pseudo element re #3064 Signed-off-by: Pranav C --- packages/nc-gui-v2/components/dashboard/TreeView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue index 5723611ff5..ddd290b453 100644 --- a/packages/nc-gui-v2/components/dashboard/TreeView.vue +++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue @@ -294,7 +294,7 @@ const activeTable = computed(() => { } .nc-tree-item { - @apply relative cursor-pointer after:(content-[''] absolute top-0 left-0 w-full h-full right-0 !bg-current transition transition-opactity duration-100 opacity-0); + @apply relative cursor-pointer after:(pointer-events-none content-[''] absolute top-0 left-0 w-full h-full right-0 !bg-current transition transition-opactity duration-100 opacity-0); } .nc-tree-item svg {