center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #1514 from dataease/pr@dev@fix_dynamic_date

Browse Source 
fix: 动态日期逻辑
This commit is contained in:
fit2cloud-chenyw 2021-12-24 17:11:25 +08:00 committed by GitHub
commit 084ce57a12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ class TimeDateServiceImpl extends WidgetService {
} }
if (element.options.attrs.default.dkey === 3) { if (element.options.attrs.default.dkey === 3) {
const dynamicPrefix = element.options.attrs.default.dynamicPrefix const dynamicPrefix = parseInt(element.options.attrs.default.dynamicPrefix)
const dynamicInfill = element.options.attrs.default.dynamicInfill const dynamicInfill = element.options.attrs.default.dynamicInfill
const dynamicSuffix = element.options.attrs.default.dynamicSuffix const dynamicSuffix = element.options.attrs.default.dynamicSuffix
@ -130,7 +130,8 @@ class TimeDateServiceImpl extends WidgetService {
const nowMonth = now.getMonth() const nowMonth = now.getMonth()
const nowYear = now.getFullYear() const nowYear = now.getFullYear()
const nowDate = now.getDate() const nowDate = now.getDate()
return new Date(nowYear - 1, nowMonth, nowDate).getTime()
return new Date(dynamicSuffix === 'before' ? (nowYear - dynamicPrefix) : (nowYear + dynamicPrefix), nowMonth, nowDate).getTime()
} }
} }
} }

4
frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue
View File

@ -98,6 +98,10 @@ export default {
}, },
dynamicPrefixChange(value) { dynamicPrefixChange(value) {
if (value < 1) {
value = 1
this.element.options.attrs.default.dynamicPrefix = 1
}
this.setDval() this.setDval()
}, },
dynamicInfillChange(value) { dynamicInfillChange(value) {