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

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__)) {
-            // 防止表单自动聚焦
+            MessageBox.confirm(i18n.t('tip.confirmCancel'), {
-            setTimeout(() => {
+              confirmButtonText: i18n.t('tip.yes'),
-              MessageBox.confirm(i18n.t('tip.confirmCancel'), {
+              cancelButtonText: i18n.t('tip.no'),
-                confirmButtonText: i18n.t('tip.yes'),
+              type: 'warning'
-                cancelButtonText: i18n.t('tip.no'),
+            }).then(() => {
-                type: 'warning'
+              if (binding.value.func) {
-              }).then(() => {
+                binding.value.func()
-                if (binding.value.func) {
+              }
-                  binding.value.func()
+            }).catch(err => err)
-                }
-              }).catch(err => err)
-            })
           } else {
             binding.value.func()
           }

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
+      if (!this.isTopo) {
-      this.colors = this.colorVal[item.name] || randomcolor() + 'FF'
+        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