fix: 1.修复report编辑时数据不是最新的问题;2.Time Limit选择customize时,添加开始/结束时间的校验

This commit is contained in:
刘洪洪
2024-05-13 15:29:00 +08:00
parent 38c6a12f5a
commit a417f4a8cc
2 changed files with 14 additions and 13 deletions

View File

@@ -292,15 +292,9 @@ export default {
if (time.getTime() > new Date()) {
return true
}
if (startTime.value !== '' && startTime.value > time) {
return true
}
}
const startDisabledDate = (time) => {
if (time.getTime() > new Date()) {
return true
}
if (endTime.value !== '' && endTime.value < time) {
if (time.getTime() > (new Date()).getTime()) {
return true
}
}
@@ -323,14 +317,14 @@ export default {
}
const startTimeValidator = (rule, value, callback) => {
const form = proxy.$refs.reportForm
if (form.model && form.model.config && form.model.config.endTime) {
if (proxy.endTime || (proxy.editObject && proxy.editObject.config && proxy.editObject.config.endTime)) {
form.validateField('config.endTime', () => null)
}
callback()
}
const endTimeValidator = (rule, value, callback) => {
let validate = true
if (startTime.value !== '' && value <= startTime.value) {
if (startTime.value !== '' && endTime.value <= startTime.value) {
validate = false
}
return validate