From f3b46bd72a6f214b72486777d4c49b5acdea3613 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Sat, 9 Mar 2024 11:51:10 +0000 Subject: [PATCH] fix(nc-gui): grayed out shared form field if prefilled fields are locked --- .../nc-gui/components/cell/MultiSelect.vue | 2 +- .../nc-gui/components/cell/SingleSelect.vue | 2 +- packages/nc-gui/components/cell/User.vue | 1 + .../dlg/share-and-collaborate/SharePage.vue | 2 +- .../composables/useSharedFormViewStore.ts | 29 +++----- packages/nc-gui/lang/en.json | 3 +- .../index/[typeOrId]/form/[viewId]/index.vue | 10 +-- .../[typeOrId]/form/[viewId]/index/index.vue | 71 ++++++++++--------- .../[typeOrId]/form/[viewId]/index/survey.vue | 67 +++++++++-------- 9 files changed, 94 insertions(+), 93 deletions(-) diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index 5c5a205f2a..333a35c01f 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -394,7 +394,7 @@ const onFocus = () => { @click="toggleMenu" >
- + { @keydown.enter.stop.prevent="toggleMenu" >
- + { div { @apply !bg-transparent; } @@ -110,7 +114,7 @@ p { input, textarea, &.nc-virtual-cell { - @apply bg-white dark:(bg-slate-500 text-white); + @apply bg-white dark:(bg-slate-500 text-white) disabled:bg-transparent; .ant-btn { @apply dark:(bg-slate-300); @@ -120,9 +124,7 @@ p { @apply dark:(bg-slate-700 text-white); } } - &:not(.layout-list) > div { - @apply bg-white dark:(bg-slate-500 text-white); - } + &.layout-list > div { .ant-btn { @apply dark:(bg-slate-300); diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue index 6c929fec4a..6658252457 100644 --- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue +++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId]/index/index.vue @@ -180,40 +180,45 @@ const onDecode = async (scannedCodeValue: string) => {
- - + + - - -
- -
-
-
+ + + + + +
+ +
+
+
+