diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js index e0f678577..24144ddff 100644 --- a/nezha-fronted/build/webpack.prod.conf.js +++ b/nezha-fronted/build/webpack.prod.conf.js @@ -367,6 +367,7 @@ if (process.env.NODE_ENV == 'development') { { delete: [ path.join(__dirname, '../dist', '/config.json'), + path.join(__dirname, '../dist', '/*.js'), path.join(__dirname, '../.cache/') ] }, diff --git a/nezha-fronted/src/assets/css/components/page/config/system.scss b/nezha-fronted/src/assets/css/components/page/config/system.scss index 217d15af0..030fc7b8c 100644 --- a/nezha-fronted/src/assets/css/components/page/config/system.scss +++ b/nezha-fronted/src/assets/css/components/page/config/system.scss @@ -62,7 +62,7 @@ margin: 0; } .vue-tags-input.interface-name .ti-input .ti-new-tag-input-wrapper { - padding-left: 7px; + padding: 5px 0px 5px 7px; } } .system-config-form { diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 8e8a06182..545ef4234 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -570,6 +570,16 @@ export default { if (item.repeatIndex > 0) { this.copyDataList.splice(index, 1) index-- + } else if (item.repeatIndex == 0) { + // 置为原来的数据 + delete item.repeatIndex + delete item.repeatVariable + delete item.repeatValue + item.children.forEach(children => { + delete children.repeatIndex + delete children.repeatVariable + delete children.repeatValue + }) } } this.$nextTick(() => { diff --git a/nezha-fronted/src/components/common/rightBox/agentBox.vue b/nezha-fronted/src/components/common/rightBox/agentBox.vue index 835e90384..61c221fb1 100644 --- a/nezha-fronted/src/components/common/rightBox/agentBox.vue +++ b/nezha-fronted/src/components/common/rightBox/agentBox.vue @@ -119,6 +119,12 @@ export default { ], type: [ { required: true, message: this.$t('validate.required'), trigger: 'change' } + ], + token: [ + { required: true, message: this.$t('validate.required'), trigger: 'blur' } + ], + protocol: [ + { required: true, message: this.$t('validate.required'), trigger: 'change' } ] }, editPromServer: {}, diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index a19488491..f3ca52d5a 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -311,7 +311,7 @@ export default { rangeTimeCallback () { if (this.editAlertSilence.time) { const num = new Date(this.editAlertSilence.endAt).getTime() - new Date(this.editAlertSilence.startAt).getTime() - this.rangeTime = num / (60 * 60 * 1000)// 以小时为单位 + this.rangeTime = parseInt(num / (60 * 60 * 1000))// 以小时为单位 } else { this.rangeTime = null } diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 50a350491..6318ea178 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -76,7 +76,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/ipamBox.vue b/nezha-fronted/src/components/common/rightBox/ipamBox.vue index d73167696..9769a7533 100644 --- a/nezha-fronted/src/components/common/rightBox/ipamBox.vue +++ b/nezha-fronted/src/components/common/rightBox/ipamBox.vue @@ -132,7 +132,7 @@ export default { { required: true, message: this.$t('validate.required'), trigger: 'blur' } ], 'dc.name': [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } + { required: true, message: this.$t('validate.required'), trigger: 'change' } ] }, dcData: [] diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index ad5139ade..91e7854cd 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -609,7 +609,7 @@