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

This commit is contained in:
zhangyu
2022-07-22 17:54:49 +08:00

View File

@@ -77,7 +77,7 @@ export default {
batchHandler (state) { batchHandler (state) {
for (let index = 0; index < this.custom.length; index++) { for (let index = 0; index < this.custom.length; index++) {
if (this.custom[index].type != 'title') { if (this.custom[index].type != 'title') {
if ((index == 0 || index == 1 || this.custom[index].NotSet || this.custom[index].visibility=='disabled')) { if ((index == 0 || index == 1 || this.custom[index].NotSet || this.custom[index].visibility == 'disabled')) {
this.custom[index].show = true this.custom[index].show = true
} else { } else {
this.custom[index].show = state this.custom[index].show = state
@@ -87,7 +87,7 @@ export default {
}, },
// 单选 // 单选
handler (val, index) { handler (val, index) {
if (!this.allowedAll && !val.allowed && (index == 0 || index == 1 || val.NotSet)) { if (!this.allowedAll && !val.allowed && (index == 0 || index == 1 || val.NotSet || val.visibility == 'disabled')) {
// this.custom[index].show = true; // this.custom[index].show = true;
} else { } else {
this.custom[index].show = !this.custom[index].show this.custom[index].show = !this.custom[index].show