Browse Source

fix: render display value in blue - date, dateTime, time, year

pull/7361/head
Ramesh Mane 8 months ago
parent
commit
eb3d2b0a3a
  1. 4
      packages/nc-gui/components/cell/DatePicker.vue
  2. 4
      packages/nc-gui/components/cell/DateTimePicker.vue
  3. 4
      packages/nc-gui/components/cell/TimePicker.vue
  4. 4
      packages/nc-gui/components/cell/YearPicker.vue
  5. 2
      packages/nc-gui/components/virtual-cell/components/ListItem.vue

4
packages/nc-gui/components/cell/DatePicker.vue

@ -243,7 +243,7 @@ const clickHandler = () => {
:picker="picker" :picker="picker"
:tabindex="0" :tabindex="0"
:bordered="false" :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 }" :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
:format="dateFormat" :format="dateFormat"
:placeholder="placeholder" :placeholder="placeholder"
@ -260,7 +260,7 @@ const clickHandler = () => {
</template> </template>
<style scoped> <style scoped>
:deep(.ant-picker-input > input[disabled]) { :deep(.ant-picker-input > input) {
@apply !text-current; @apply !text-current;
} }
</style> </style>

4
packages/nc-gui/components/cell/DateTimePicker.vue

@ -296,7 +296,7 @@ const isColDisabled = computed(() => {
:disabled="isColDisabled" :disabled="isColDisabled"
:show-time="true" :show-time="true"
:bordered="false" :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 }" :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
:format="dateTimeFormat" :format="dateTimeFormat"
:placeholder="placeholder" :placeholder="placeholder"
@ -313,7 +313,7 @@ const isColDisabled = computed(() => {
</template> </template>
<style scoped> <style scoped>
:deep(.ant-picker-input > input[disabled]) { :deep(.ant-picker-input > input) {
@apply !text-current; @apply !text-current;
} }
</style> </style>

4
packages/nc-gui/components/cell/TimePicker.vue

@ -133,7 +133,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
:bordered="false" :bordered="false"
use12-hours use12-hours
format="HH:mm" 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 }" :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
:placeholder="placeholder" :placeholder="placeholder"
:allow-clear="!readOnly && !localState && !isPk" :allow-clear="!readOnly && !localState && !isPk"
@ -148,7 +148,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
</template> </template>
<style scoped> <style scoped>
:deep(.ant-picker-input > input[disabled]) { :deep(.ant-picker-input > input) {
@apply !text-current; @apply !text-current;
} }
</style> </style>

4
packages/nc-gui/components/cell/YearPicker.vue

@ -119,7 +119,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
:tabindex="0" :tabindex="0"
picker="year" picker="year"
:bordered="false" :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 }" :class="{ 'nc-null': modelValue === null && showNull, '!px-2': isExpandedFormOpen, '!px-0': !isExpandedFormOpen }"
:placeholder="placeholder" :placeholder="placeholder"
:allow-clear="(!readOnly && !localState && !isPk) || isEditColumn" :allow-clear="(!readOnly && !localState && !isPk) || isEditColumn"
@ -136,7 +136,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
</template> </template>
<style scoped> <style scoped>
:deep(.ant-picker-input > input[disabled]) { :deep(.ant-picker-input > input) {
@apply !text-current; @apply !text-current;
} }
</style> </style>

2
packages/nc-gui/components/virtual-cell/components/ListItem.vue

@ -103,7 +103,7 @@ const attachments: ComputedRef<Attachment[]> = computed(() => {
<div class="flex flex-col m-[.75rem] gap-1 flex-grow justify-center overflow-hidden"> <div class="flex flex-col m-[.75rem] gap-1 flex-grow justify-center overflow-hidden">
<div class="flex justify-between xs:gap-x-2"> <div class="flex justify-between xs:gap-x-2">
<span class="font-semibold text-gray-800 nc-display-value xs:(truncate)"> <span class="font-semibold text-brand-500 nc-display-value xs:(truncate)">
{{ row[relatedTableDisplayValueProp] }} {{ row[relatedTableDisplayValueProp] }}
</span> </span>
<div <div

Loading…
Cancel
Save