@@ -119,6 +119,7 @@ export default {
selectArr: [], // 已被选择的条件
key: '', // 当前被选中的 key
symbol: false, // 当前被选中的 symbol
+ selectSymbolValue: '', // 当前被选中的 symbol 的值
value: '', // 当前被选中的 value
keyShow: false, // key 的下拉
symbolShow: false, // symbol 的下拉 显示根据key的类型 自定义的不包含 大于小于
@@ -209,6 +210,8 @@ export default {
// console.log(e, 'keydown')
if (e.keyCode == 8 && !this.searchStr && this.selectArr.length) {
this.selectArr.pop()
+ } else if (e.keyCode == 8) {
+ console.log(this.oldSearchStr, this.searchStr)
}
// 5
if (e.keyCode == 38) { // 向上
@@ -289,6 +292,7 @@ export default {
},
selectSymbol (item) {
this.symbol = true
+ this.selectSymbolValue = item.value
switch (item.value) {
case '=' :
this.$refs.searchStr.focus()
@@ -412,6 +416,7 @@ export default {
key,
value: [value]
})
+ this.setSearchList()
}
},
removeSelectArr (index) {
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue
index 39e7bcb51..648d0a17c 100644
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -546,6 +546,10 @@ export default {
} else {
this.isPopoverDisabled = false
}
+ },
+ refresh () {
+ this.setSearchTime(this.nowTimeType.type, this.nowTimeType.value, this.searchTime)
+ this.$emit('change', this.searchTime)
}
},
watch: {
@@ -557,6 +561,7 @@ export default {
if (showTime) {
this.showTime = Object.assign({}, showTime)
this.searchTime = this.$parent.searchTime
+ this.nowTimeType = this.showTime
}
if (this.showEmpty && this.defaultPick === 12) {
this.searchTime = []
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index dee29e866..ebda61b6b 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -18,8 +18,8 @@
-
-