NEZ-1941 fix:修复颜色选择器tab异常切换

This commit is contained in:
zyh
2022-06-16 17:54:08 +08:00
parent 765ec5d74b
commit 494a54d330
2 changed files with 17 additions and 26 deletions

View File

@@ -39,8 +39,6 @@ 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'),
@@ -50,7 +48,6 @@ export const clickoutside = {
binding.value.func()
}
}).catch(err => err)
})
} else {
binding.value.func()
}

View File

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