From b33cdd97b41d2235f1cfe9418481991307600b11 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 2 Sep 2022 16:41:00 +0530
Subject: [PATCH] fix(gui-v2): keep font color normal even in readonly mode

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/components/cell/DatePicker.vue     | 6 +++++-
 packages/nc-gui-v2/components/cell/DateTimePicker.vue | 6 +++++-
 packages/nc-gui-v2/components/cell/TimePicker.vue     | 6 +++++-
 packages/nc-gui-v2/components/cell/YearPicker.vue     | 6 ++++++
 packages/nc-gui-v2/components/virtual-cell/Lookup.vue | 9 +++++++--
 packages/nc-gui-v2/composables/useViewData.ts         | 2 +-
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui-v2/components/cell/DatePicker.vue b/packages/nc-gui-v2/components/cell/DatePicker.vue
index bda3ee48c2..381d643831 100644
--- a/packages/nc-gui-v2/components/cell/DatePicker.vue
+++ b/packages/nc-gui-v2/components/cell/DatePicker.vue
@@ -75,4 +75,8 @@ const placeholder = computed(() => (isDateInvalid ? 'Invalid date' : ''))
   </a-date-picker>
 </template>
 
-<style scoped></style>
+<style scoped>
+:deep(.ant-picker-input > input[disabled]) {
+  @apply !text-current;
+}
+</style>
diff --git a/packages/nc-gui-v2/components/cell/DateTimePicker.vue b/packages/nc-gui-v2/components/cell/DateTimePicker.vue
index 43d507ba4a..bdc30a158e 100644
--- a/packages/nc-gui-v2/components/cell/DateTimePicker.vue
+++ b/packages/nc-gui-v2/components/cell/DateTimePicker.vue
@@ -77,4 +77,8 @@ watch(
   </a-date-picker>
 </template>
 
-<style scoped></style>
+<style scoped>
+:deep(.ant-picker-input > input[disabled]) {
+  @apply !text-current;
+}
+</style>
diff --git a/packages/nc-gui-v2/components/cell/TimePicker.vue b/packages/nc-gui-v2/components/cell/TimePicker.vue
index a41d06c9b1..87a64a06c8 100644
--- a/packages/nc-gui-v2/components/cell/TimePicker.vue
+++ b/packages/nc-gui-v2/components/cell/TimePicker.vue
@@ -87,4 +87,8 @@ watch(
   </a-time-picker>
 </template>
 
-<style scoped></style>
+<style scoped>
+:deep(.ant-picker-input > input[disabled]) {
+  @apply !text-current;
+}
+</style>
diff --git a/packages/nc-gui-v2/components/cell/YearPicker.vue b/packages/nc-gui-v2/components/cell/YearPicker.vue
index 7f86fa3c22..b06bfa2db3 100644
--- a/packages/nc-gui-v2/components/cell/YearPicker.vue
+++ b/packages/nc-gui-v2/components/cell/YearPicker.vue
@@ -73,3 +73,9 @@ const placeholder = computed(() => (isYearInvalid ? 'Invalid year' : ''))
     <template #suffixIcon></template>
   </a-date-picker>
 </template>
+
+<style scoped>
+:deep(.ant-picker-input > input[disabled]) {
+  @apply !text-current;
+}
+</style>
diff --git a/packages/nc-gui-v2/components/virtual-cell/Lookup.vue b/packages/nc-gui-v2/components/virtual-cell/Lookup.vue
index a3c34dabc5..8c3544f063 100644
--- a/packages/nc-gui-v2/components/virtual-cell/Lookup.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/Lookup.vue
@@ -37,7 +37,7 @@ const lookupColumnMetaProps = useColumn(lookupColumn)
 </script>
 
 <template>
-  <div class=" h-full flex gap-1">
+  <div class="h-full flex gap-1">
     <template v-if="lookupColumn">
       <!-- Render virtual cell -->
       <div v-if="isVirtualCol(lookupColumn)">
@@ -63,7 +63,12 @@ const lookupColumnMetaProps = useColumn(lookupColumn)
           v-for="(v, i) of arrValue"
           :key="i"
           class="min-w-max"
-          :class="{ 'bg-gray-100 px-1 rounded-full flex-1': !lookupColumnMetaProps.isAttachment , ' border-gray-200 rounded border-1' : ![UITypes.Attachment, UITypes.MultiSelect, UITypes.SingleSelect].includes(lookupColumn.uidt) }"
+          :class="{
+            'bg-gray-100 px-1 rounded-full flex-1': !lookupColumnMetaProps.isAttachment,
+            ' border-gray-200 rounded border-1': ![UITypes.Attachment, UITypes.MultiSelect, UITypes.SingleSelect].includes(
+              lookupColumn.uidt,
+            ),
+          }"
         >
           <SmartsheetCell :model-value="v" :column="lookupColumn" :edit-enabled="false" :virtual="true" />
         </div>
diff --git a/packages/nc-gui-v2/composables/useViewData.ts b/packages/nc-gui-v2/composables/useViewData.ts
index 09005a623d..42bc1ed74f 100644
--- a/packages/nc-gui-v2/composables/useViewData.ts
+++ b/packages/nc-gui-v2/composables/useViewData.ts
@@ -162,7 +162,7 @@ export function useViewData(
   async function loadData(params: Parameters<Api<any>['dbViewRow']['list']>[4] = {}) {
     if ((!project?.value?.id || !meta?.value?.id || !viewMeta?.value?.id) && !isPublic.value) return
     const response = !isPublic.value
-      ? await api.dbViewRow.list('noco', project.value.id!, meta?.value.id!, viewMeta!.value.id, {
+      ? await api.dbViewRow.list('noco', project.value.id!, meta!.value.id!, viewMeta!.value.id, {
           ...params,
           ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
           ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),