Skip to content

fix:修复模型页面排序错误 --bug=159019273 【CMDB】模型拖拽排序错误 #8668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elizabevil wants to merge 1 commit into
base: v3.14.x
Choose a base branch
from
Open

fix:修复模型页面排序错误 --bug=159019273 【CMDB】模型拖拽排序错误 #8668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions src/ui/src/views/model-manage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,12 @@
...classification,
bk_objects: classification.bk_objects
.filter(model => !model.bk_ishidden)
.sort((a, b) => a.bk_ispaused - b.bk_ispaused),
.sort((a, b) => {
if (a.bk_ispaused !== b.bk_ispaused) {
return a.bk_ispaused ? 1 : -1
}
return a.obj_sort_number - b.obj_sort_number
}),
})
})
return allClassifications
Expand Down Expand Up @@ -840,9 +845,25 @@
find(classifications => classifications?.bk_objects?.
find(item => item?.id === id))

if (!group) return

const curGroup = group?.bk_classification_id
const curIndex = newIndex + 1
this.updateModelGroup({ id, curGroup, curIndex })
const curModels = (group.bk_objects || []).filter(model => !model.bk_ishidden)

if (!curModels || curModels.length === 0) return

const sortedModels = curModels.sort((a, b) => {
if (a.bk_ispaused !== b.bk_ispaused) {
return a.bk_ispaused ? 1 : -1
}
return a.obj_sort_number - b.obj_sort_number
})

const targetModel = sortedModels[newIndex]
if (!targetModel) return

const objSortNumber = targetModel.obj_sort_number
this.updateModelGroup({ id, curGroup, objSortNumber })
},
getExportModels() {
return this.currentClassifications
Expand Down Expand Up @@ -1139,12 +1160,12 @@
this.modelDialog.groupId = groupId || ''
this.modelDialog.isShow = true
},
updateModelGroup({ id, curGroup, curIndex }) {
updateModelGroup({ id, curGroup, objSortNumber }) {
return this.updateObject({
id,
params: {
bk_classification_id: curGroup,
obj_sort_number: +curIndex
obj_sort_number: objSortNumber
}
})
.then(() => {
Expand Down