clone/nocodb
1
0
Fork 0
mirror of https://github.com/nocodb/nocodb.git synced 2026-05-04 17:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/group-by-menu-ui

Browse Source
This commit is contained in:
աɨռɢӄաօռɢ
2023-12-08 12:10:22 +08:00
parent ec17c9f844 edff2d486b
commit 69d84bcecd
124 changed files with 1086 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/nc-gui/components/cell/DateTimePicker.vue
View File

@@ -1,18 +1,16 @@
<script setup lang="ts">
import dayjs from 'dayjs'
import { isSystemColumn } from 'nocodb-sdk'
import { dateFormats, isSystemColumn, timeFormats } from 'nocodb-sdk'
import {
ActiveCellInj,
CellClickHookInj,
ColumnInj,
EditColumnInj,
ReadonlyInj,
dateFormats,
inject,
isDrawerOrModalExist,
parseProp,
ref,
timeFormats,
useBase,
useSelectedCellKeyupListener,
watch,
@@ -278,7 +276,7 @@ const isColDisabled = computed(() => {
:placeholder="placeholder"
:allow-clear="!readOnly && !localState && !isPk"
:input-read-only="true"
:dropdown-class-name="`${randomClass} nc-picker-datetime ${open ? 'active' : ''}`"
:dropdown-class-name="`${randomClass} nc-picker-datetime children:border-1 children:border-gray-200 ${open ? 'active' : ''}`"
:open="isOpen"
@click="clickHandler"
@ok="open = !open"