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

Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6

Browse Source
This commit is contained in:
zhangyu
2022-11-18 16:19:19 +08:00
parent 7b2420cff3 913118c5df
commit 42f6d4ddc4
9 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/build/webpack.prod.conf.js
View File

@@ -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/')
]
},

2
nezha-fronted/src/assets/css/components/page/config/system.scss
View File

@@ -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 {

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

@@ -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(() => {

6
nezha-fronted/src/components/common/rightBox/agentBox.vue
View File

@@ -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: {},

2
nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
View File

@@ -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
}

2
nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
View File

@@ -76,7 +76,7 @@
</div>
<transition name="el-zoom-in-top">
<el-row v-show="expressionsShow[index-1].show">
<el-form-item :prop="'elements.' + (index -1) + '.expression'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}">
<el-form-item :prop="'elements.' + (index -1) + '.expression'" :rules="{ required: true, message: $t('validate.required'), trigger: 'change'}">
<promql-input
:from-father-data="true"
:metricOptionsParent="metricOptions"

2
nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
View File

@@ -627,7 +627,7 @@
<el-form-item
:label="'Format'"
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.format'"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'change' }]"
>
<!-- <el-input v-model="item2.format" placeholder="key" size="mini"></el-input> -->
<el-select v-model="item2.format" :id="'timestamp' + index +'-' + index2" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">

2
nezha-fronted/src/components/common/rightBox/ipamBox.vue
View File

@@ -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: []

2
nezha-fronted/src/components/common/rightBox/moduleBox.vue
View File

@@ -609,7 +609,7 @@
<el-form-item
:label="'Format'"
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.format'"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'change' }]"
>
<el-select v-model="item2.format" :id="'timestamp' + index +'-' + index2" class="right-box__select" placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
<el-option v-for="item in timestampList" :id="'module-timestamp-'+item" :key="item" :label="item" :value="item"></el-option>