public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 22:08:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 动态日期过滤组件月份逻辑

Browse Source
This commit is contained in:
fit2cloud-chenyw
2022-01-10 12:06:42 +08:00
parent 15bbafc2d5
commit 44ba1f8db6
4 changed files with 76 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
View File

@@ -159,18 +159,10 @@ class TimeDateRangeServiceImpl extends WidgetService {
const nowYear = now.getFullYear()
const nowDate = now.getDate()
const tarYear = nowYear
if (dynamicSuffix === 'before') {
const deffMonth = nowMonth - dynamicPrefix
let diffYear = deffMonth / 12
if (deffMonth < 0) {
diffYear -= 1
}
return new Date(tarYear + diffYear, nowMonth - dynamicPrefix % 12, nowDate).getTime()
return new Date(nowYear, nowMonth - dynamicPrefix, nowDate).getTime()
} else {
const deffMonth = nowMonth + dynamicPrefix
const diffYear = deffMonth / 12
return new Date(tarYear + diffYear, deffMonth % 12, nowDate).getTime()
return new Date(nowYear, nowMonth + dynamicPrefix, nowDate).getTime()
}
}
if (dynamicInfill === 'year') {

22
frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
View File

@@ -1,4 +1,6 @@
import { WidgetService } from '../service/WidgetService'
import {
WidgetService
} from '../service/WidgetService'
const leftPanel = {
icon: 'iconfont icon-ri',
@@ -45,7 +47,9 @@ const drawPanel = {
class TimeDateServiceImpl extends WidgetService {
constructor(options = {}) {
Object.assign(options, { name: 'timeDateWidget' })
Object.assign(options, {
name: 'timeDateWidget'
})
super(options)
this.filterDialog = true
this.showSwitch = false
@@ -111,16 +115,10 @@ class TimeDateServiceImpl extends WidgetService {
const nowYear = now.getFullYear()
const nowDate = now.getDate()
const tarYear = nowYear
if (dynamicSuffix === 'before') {
const deffMonth = nowMonth - dynamicPrefix
const diffYear = Math.floor(deffMonth / 12)
return new Date(tarYear + diffYear, nowMonth - dynamicPrefix % 12, nowDate).getTime()
return new Date(nowYear, nowMonth - dynamicPrefix, nowDate).getTime()
} else {
const deffMonth = nowMonth + dynamicPrefix
const diffYear = deffMonth / 12
return new Date(tarYear + diffYear, deffMonth % 12, nowDate).getTime()
return new Date(nowYear, nowMonth + dynamicPrefix, nowDate).getTime()
}
}
if (dynamicInfill === 'year') {
@@ -134,5 +132,7 @@ class TimeDateServiceImpl extends WidgetService {
}
}
}
const timeDateServiceImpl = new TimeDateServiceImpl({ name: 'timeDateWidget' })
const timeDateServiceImpl = new TimeDateServiceImpl({
name: 'timeDateWidget'
})
export default timeDateServiceImpl