From eb3d2b0a3a07fca79a96575194db65d01542e2a5 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Thu, 4 Jan 2024 11:07:52 +0000 Subject: [PATCH] fix: render display value in blue - date, dateTime, time, year --- packages/nc-gui/components/cell/DatePicker.vue | 4 ++-- packages/nc-gui/components/cell/DateTimePicker.vue | 4 ++-- packages/nc-gui/components/cell/TimePicker.vue | 4 ++-- packages/nc-gui/components/cell/YearPicker.vue | 4 ++-- .../nc-gui/components/virtual-cell/components/ListItem.vue | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue index f137d7ef63..e39344c91e 100644 --- a/packages/nc-gui/components/cell/DatePicker.vue +++ b/packages/nc-gui/components/cell/DatePicker.vue @@ -243,7 +243,7 @@ const clickHandler = () => { :picker="picker" :tabindex="0" :bordered="false" - class="!w-full !py-1 !border-none" + class="!w-full !py-1 !border-none !text-current" :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }" :format="dateFormat" :placeholder="placeholder" @@ -260,7 +260,7 @@ const clickHandler = () => { diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue index 381feff1bb..173c063f0b 100644 --- a/packages/nc-gui/components/cell/DateTimePicker.vue +++ b/packages/nc-gui/components/cell/DateTimePicker.vue @@ -296,7 +296,7 @@ const isColDisabled = computed(() => { :disabled="isColDisabled" :show-time="true" :bordered="false" - class="!w-full !py-1 !border-none" + class="!w-full !py-1 !border-none !text-current" :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }" :format="dateTimeFormat" :placeholder="placeholder" @@ -313,7 +313,7 @@ const isColDisabled = computed(() => { diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue index 3757f4a131..34081a1e1e 100644 --- a/packages/nc-gui/components/cell/TimePicker.vue +++ b/packages/nc-gui/components/cell/TimePicker.vue @@ -133,7 +133,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => { :bordered="false" use12-hours format="HH:mm" - class="!w-full !py-1 !border-none" + class="!w-full !py-1 !border-none !text-current" :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }" :placeholder="placeholder" :allow-clear="!readOnly && !localState && !isPk" @@ -148,7 +148,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => { diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue index 3b7ab61455..090845cb17 100644 --- a/packages/nc-gui/components/cell/YearPicker.vue +++ b/packages/nc-gui/components/cell/YearPicker.vue @@ -119,7 +119,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => { :tabindex="0" picker="year" :bordered="false" - class="!w-full !py-1 !border-none" + class="!w-full !py-1 !border-none !text-current" :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }" :placeholder="placeholder" :allow-clear="(!readOnly && !localState && !isPk) || isEditColumn" @@ -136,7 +136,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => { diff --git a/packages/nc-gui/components/virtual-cell/components/ListItem.vue b/packages/nc-gui/components/virtual-cell/components/ListItem.vue index 8dd8ef034a..0e83c33e08 100644 --- a/packages/nc-gui/components/virtual-cell/components/ListItem.vue +++ b/packages/nc-gui/components/virtual-cell/components/ListItem.vue @@ -103,7 +103,7 @@ const attachments: ComputedRef = computed(() => {
- + {{ row[relatedTableDisplayValueProp] }}