From b73d796891c5b7c206db7e5af9ffb72f480bd50c Mon Sep 17 00:00:00 2001
From: songlh <song.lhlh@gmail.com>
Date: Wed, 7 Aug 2024 14:41:22 +0800
Subject: [PATCH] fix(ui): dashboard chart config
---
.../cmdb/views/custom_dashboard/chartForm.vue | 22 ++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/cmdb-ui/src/modules/cmdb/views/custom_dashboard/chartForm.vue b/cmdb-ui/src/modules/cmdb/views/custom_dashboard/chartForm.vue
index 15bc13c..6c4c3c7 100644
--- a/cmdb-ui/src/modules/cmdb/views/custom_dashboard/chartForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/custom_dashboard/chartForm.vue
@@ -362,6 +362,7 @@ export default {
commonAttributes: [],
level2children: {},
isShadow: false,
+ changeCITypeRequestValue: null,
}
},
computed: {
@@ -425,6 +426,14 @@ export default {
this.fontColor = fontColor
this.bgColor = bgColor
}
+
+ if (type_ids?.length || type_id) {
+ const requireTypeIds = type_id ? [type_id] : type_ids
+ await getCITypeAttributesByTypeIds({ type_ids: requireTypeIds.join(',') }).then((res) => {
+ this.attributes = res.attributes
+ })
+ }
+
if (type_ids && type_ids.length) {
await getCITypeAttributesByTypeIds({ type_ids: type_ids.join(',') }).then((res) => {
this.attributes = res.attributes
@@ -483,19 +492,26 @@ export default {
changeCIType(value) {
this.form.attr_ids = []
this.commonAttributes = []
+ this.changeCITypeRequestValue = value
if ((Array.isArray(value) && value.length) || (!Array.isArray(value) && value)) {
getCITypeAttributesByTypeIds({ type_ids: Array.isArray(value) ? value.join(',') : value }).then((res) => {
- this.attributes = res.attributes
+ if (this.changeCITypeRequestValue === value) {
+ this.attributes = res.attributes
+ }
})
}
if (!Array.isArray(value) && value) {
getRecursive_level2children(value).then((res) => {
- this.level2children = res
+ if (this.changeCITypeRequestValue === value) {
+ this.level2children = res
+ }
})
}
if ((['bar', 'line', 'pie'].includes(this.chartType) && this.form.category === 1) || this.chartType === 'table') {
getCITypeCommonAttributesByTypeIds({ type_ids: Array.isArray(value) ? value.join(',') : value }).then((res) => {
- this.commonAttributes = res.attributes
+ if (this.changeCITypeRequestValue === value) {
+ this.commonAttributes = res.attributes
+ }
})
}
},