diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js index a430a8312..6d0b864a0 100644 --- a/nezha-fronted/src/components/common/js/tools.js +++ b/nezha-fronted/src/components/common/js/tools.js @@ -39,18 +39,15 @@ export const clickoutside = { if (oldValue) { // const newValue = JSON.parse(JSON.stringify(binding.value.obj)) if (unsavedChange == 'on' && !isEqual(oldValue, el.__newValue__)) { - // 防止表单自动聚焦 - setTimeout(() => { - MessageBox.confirm(i18n.t('tip.confirmCancel'), { - confirmButtonText: i18n.t('tip.yes'), - cancelButtonText: i18n.t('tip.no'), - type: 'warning' - }).then(() => { - if (binding.value.func) { - binding.value.func() - } - }).catch(err => err) - }) + MessageBox.confirm(i18n.t('tip.confirmCancel'), { + confirmButtonText: i18n.t('tip.yes'), + cancelButtonText: i18n.t('tip.no'), + type: 'warning' + }).then(() => { + if (binding.value.func) { + binding.value.func() + } + }).catch(err => err) } else { binding.value.func() } diff --git a/nezha-fronted/src/components/common/nezhaColor.vue b/nezha-fronted/src/components/common/nezhaColor.vue index 9266e5aa9..420997fdf 100644 --- a/nezha-fronted/src/components/common/nezhaColor.vue +++ b/nezha-fronted/src/components/common/nezhaColor.vue @@ -82,18 +82,7 @@ export default { } }, watch: { - valueArr: { - handler (n) { - if (!this.isTopo) { - this.keyName = this.valueArr[0].name - this.colors = this.valueArr[0].value || randomcolor() + 'FF' - } else { - this.keyName = this.valueArr[0].name - this.colors = this.valueArr[0].value - } - }, - deep: true - } + }, data () { return { @@ -156,8 +145,13 @@ export default { // }, colorTabChange (item) { - this.keyName = item.name - this.colors = this.colorVal[item.name] || randomcolor() + 'FF' + if (!this.isTopo) { + this.keyName = item.name + this.colors = this.colorVal[item.name] || randomcolor() + 'FF' + } else { + this.keyName = item.name + this.colors = this.colorVal[item.name] + } }, exitColor () { this.showColorPicker = false