Merge pull request #2580 from TencentBlueKing/develop

Develop
TencentBlueKing · Mar 22, 2024 · 3fc702d · 3fc702d
2 parents 6feedef + 0078303
commit 3fc702d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/frontend/src/components/choose-ip/topology-tree.vue b/frontend/src/components/choose-ip/topology-tree.vue
@@ -97,7 +97,7 @@
                 >
                   <template v-if="item.type === 'node'">
                     <Icon
-                      v-if="item.async"
+                      v-if="item.async && !item.isExpandNoData"
                       bk
                       :type="item.expanded ? 'down-shape' : 'right-shape'"
                       :class="[
@@ -1468,6 +1468,9 @@
       },
 
       handleNodeChange (newVal, oldVal, localVal, node, index) {
+        if (node.isExpandNoData) {
+          node.async = false;
+        }
         if (this.isShiftBeingPress) {
           this.pressIndex = index;
           this.pressLevels.push(node.level);

diff --git a/saas/backend/apps/role/views/group_member.py b/saas/backend/apps/role/views/group_member.py
@@ -107,7 +107,7 @@ def get_queryset(self):
             RoleGroupMember.objects.filter(role_id=self.request.role.id, group_id__in=group_ids)
             .values("subject_type", "subject_id")
             .distinct()
-            .order_by("subject_type", "subject_id")
+            .order_by("-subject_type", "subject_id")
         )
 
         slz = RoleGroupMemberSearchSLZ(data=self.request.data)