dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(查询组件): 时间组件默认值希望增加月底 #10776

Browse Source
This commit is contained in:
dataeaseShu 2024-11-18 15:05:45 +08:00
parent 79cb6a4473
commit 14f5932f80
7 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
View File

@ -126,6 +126,10 @@ const relativeToCurrentList = computed(() => {
label: t('dynamic_time.firstOfMonth'),
value: 'monthBeginning'
},
{
label: t('dynamic_time.endOfMonth'),
value: 'monthEnd'
},
{
label: t('dynamic_time.firstOfYear'),
value: 'yearBeginning'
@ -146,6 +150,10 @@ const relativeToCurrentList = computed(() => {
label: t('dynamic_time.firstOfMonth'),
value: 'monthBeginning'
},
{
label: t('dynamic_time.endOfMonth'),
value: 'monthEnd'
},
{
label: t('dynamic_time.firstOfYear'),
value: 'yearBeginning'

4
core/core-frontend/src/custom-component/v-query/DynamicTime.vue
View File

@ -10,6 +10,7 @@ import {
getToday,
getYesterday,
getMonthBeginning,
getMonthEnd,
getYearBeginning,
getCustomTime
} from './time-format'
@ -141,6 +142,9 @@ const init = () => {
case 'monthBeginning':
selectValue.value = getMonthBeginning()
break
case 'monthEnd':
selectValue.value = getMonthEnd()
break
case 'yearBeginning':
selectValue.value = getYearBeginning()
break

8
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@ -1873,6 +1873,10 @@ const relativeToCurrentList = computed(() => {
label: t('dynamic_time.firstOfMonth'),
value: 'monthBeginning'
},
{
label: t('dynamic_time.endOfMonth'),
value: 'monthEnd'
},
{
label: t('dynamic_time.firstOfYear'),
value: 'yearBeginning'
@ -1893,6 +1897,10 @@ const relativeToCurrentList = computed(() => {
label: t('dynamic_time.firstOfMonth'),
value: 'monthBeginning'
},
{
label: t('dynamic_time.endOfMonth'),
value: 'monthEnd'
},
{
label: t('dynamic_time.firstOfYear'),
value: 'yearBeginning'

8
core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
View File

@ -138,6 +138,10 @@ const relativeToCurrentList = computed(() => {
label: t('dynamic_time.firstOfMonth'),
value: 'monthBeginning'
},
{
label: t('dynamic_time.endOfMonth'),
value: 'monthEnd'
},
{
label: t('dynamic_time.firstOfYear'),
value: 'yearBeginning'
@ -158,6 +162,10 @@ const relativeToCurrentList = computed(() => {
label: t('dynamic_time.firstOfMonth'),
value: 'monthBeginning'
},
{
label: t('dynamic_time.endOfMonth'),
value: 'monthEnd'
},
{
label: t('dynamic_time.firstOfYear'),
value: 'yearBeginning'

12
core/core-frontend/src/custom-component/v-query/time-format.ts
View File

@ -1,4 +1,5 @@
import type { ManipulateType } from 'dayjs'
import dayjs from 'dayjs'
function getThisYear() {
return new Date(`${new Date().getFullYear()}/1`)
}
@ -41,6 +42,10 @@ function getMonthBeginning() {
return new Date(`${date.getFullYear()}/${date.getMonth() + 1}/1`)
}
function getMonthEnd() {
return new Date(dayjs().endOf('month').format('YYYY/MM/DD HH:mm:ss'))
}
function getYearBeginning() {
const date = new Date()
return new Date(`${date.getFullYear()}/1/1`)
@ -211,6 +216,12 @@ function getDynamicRange({
isDateTime ? monthBeginningVal : monthBeginningVal + 24 * 3600 * 1000 - 1000
]
break
case 'monthEnd':
const monthEndVal = getMonthEnd().getTime()
selectValue = isDateTime
? [monthEndVal, monthEndVal]
: [monthEndVal - 24 * 3600 * 1000 + 1000, monthEndVal]
break
case 'yearBeginning':
const yearBeginningVal = getYearBeginning().getTime()
selectValue = [
@ -251,6 +262,7 @@ export {
getToday,
getYesterday,
getMonthBeginning,
getMonthEnd,
getYearBeginning,
getCustomTime,
getDynamicRange

1
core/core-frontend/src/locales/zh-CN.ts
View File

@ -407,6 +407,7 @@ export default {
today: '今天',
yesterday: '昨天',
firstOfMonth: '月初',
endOfMonth: '月底',
firstOfYear: '年初',
custom: '自定义',
date: '日',

2
core/core-frontend/src/style/index.less
View File

@ -605,5 +605,5 @@ strong {
}
.ed-message .ed-message__closeBtn:hover {
background: #ebebebe6;
background: #ebebebe6 !important;
}