gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-2569 fix：时间选择器检验错误

Browse Source
This commit is contained in:
zyh
2023-02-16 09:54:06 +08:00
parent 0e0cc061da
commit 5677102d56
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/components/chart/chartList.vue
View File

@@ -344,6 +344,13 @@ export default {
this.$store.commit('setChartLastPosition', position)
})
}
this.copyDataList.forEach(item => {
this.tempList.forEach(subItem => {
if (item.id == subItem.id) {
subItem.y = item.y
}
})
})
},
onScroll (scrollTop = 0, groupTop = 0) {
if (!this.variablesInit) { // 变量未加载完成 不请求数据
@@ -613,7 +620,7 @@ export default {
if (item.type === 'group' && repeatVariable && this.$loadsh.get(this.showHidden[item.id], 'visibility') !== 'hidden' && repeatEnable) {
const itemPrev = arr[index - 1]
const repeatPrevVariable = this.$loadsh.get(itemPrev.param.repeat, 'variable')
const repeatPrevEnable = this.$loadsh.get(item.param.enable, 'repeat')
const repeatPrevEnable = this.$loadsh.get(itemPrev.param.enable, 'repeat')
if (itemPrev && itemPrev.type === 'group' && repeatPrevVariable === repeatVariable && repeatPrevEnable) {
const arr = variablesRepeat[repeatVariable]
arr[arr.length - 1].repeatArr.push(item)

4
nezha-fronted/src/components/common/timePicker.vue
View File

@@ -411,10 +411,11 @@ export default {
this.oldSearchTime[1] = bus.timeFormate(this.oldSearchTime[1])
}
}
// console.log(moment(this.oldSearchTime[0], timeFormatMain).isValid(), moment(this.oldSearchTime[1], timeFormatMain).isValid(), !moment(this.oldSearchTime[0]).isBefore(this.oldSearchTime[1]))
if (moment(this.oldSearchTime[0], timeFormatMain).isValid() && moment(this.oldSearchTime[1], timeFormatMain).isValid() && !moment(this.oldSearchTime[0]).isBefore(this.oldSearchTime[1])) {
this.oldSearchTimeError[0] = true
this.inputError = this.$t('date.fromGreaterTo')
} else if (moment(this.oldSearchTime[0], timeFormatMain).isValid() && moment(this.oldSearchTime[1], timeFormatMain).isValid() && moment(this.oldSearchTime[0]).isBefore(this.oldSearchTime[1])) {
this.oldSearchTimeError[0] = false
}
},
dateChange () {
@@ -422,7 +423,6 @@ export default {
this.oldSearchTimeError[1] = false
},
setCustomTime (timeGroup, timeRange) {
console.log(timeGroup)
if (timeGroup) {
this.showTime = this.nowTimeType = this.timeData.find(
(item) => item.id == timeGroup.id