Browse Source

Merge pull request #6887 from gitstart/NCDBOSS-103

feat: Monday as first day of week in calendar popup
nc-fix/date-picker
Pranav C 1 year ago committed by GitHub
parent
commit
387e0f03bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      packages/nc-gui/components/cell/DatePicker.vue
  2. 6
      packages/nc-gui/components/cell/DateTimePicker.vue

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

@ -1,5 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import dayjs from 'dayjs' import dayjs from 'dayjs'
import updateLocale from 'dayjs/plugin/updateLocale'
import { import {
ActiveCellInj, ActiveCellInj,
CellClickHookInj, CellClickHookInj,
@ -22,8 +23,11 @@ interface Props {
} }
const { modelValue, isPk } = defineProps<Props>() const { modelValue, isPk } = defineProps<Props>()
const emit = defineEmits(['update:modelValue']) const emit = defineEmits(['update:modelValue'])
dayjs.extend(updateLocale)
dayjs.updateLocale('en', {
weekStart: 1,
})
const { t } = useI18n() const { t } = useI18n()

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

@ -1,6 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import dayjs from 'dayjs' import dayjs from 'dayjs'
import { isSystemColumn } from 'nocodb-sdk' import { isSystemColumn } from 'nocodb-sdk'
import updateLocale from 'dayjs/plugin/updateLocale'
import { import {
ActiveCellInj, ActiveCellInj,
CellClickHookInj, CellClickHookInj,
@ -25,8 +26,11 @@ interface Props {
} }
const { modelValue, isPk, isUpdatedFromCopyNPaste } = defineProps<Props>() const { modelValue, isPk, isUpdatedFromCopyNPaste } = defineProps<Props>()
const emit = defineEmits(['update:modelValue']) const emit = defineEmits(['update:modelValue'])
dayjs.extend(updateLocale)
dayjs.updateLocale('en', {
weekStart: 1,
})
const { isMssql, isXcdbBase } = useBase() const { isMssql, isXcdbBase } = useBase()

Loading…
Cancel
Save