Merge pull request #2148 from lhzzforever/dev/develop_ci

Dev/develop ci
TencentBlueKing · Jul 31, 2023 · b0ff691 · b0ff691
2 parents 78bd5d2 + 3d7d84a
commit b0ff691
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
@@ -706,7 +706,6 @@ const store = new Vuex.Store({
         const results = data.results || [];
         results.forEach((item) => {
           if (item.type === 'system_manager') {
-            console.log(window.CUR_LANGUAGE, 444);
             const langManager = ['zh-cn'].includes(window.CUR_LANGUAGE) ? '系统管理员' : ' system administrator';
             item.name = `${item.name}${langManager}`;
           }

diff --git a/frontend/src/views/group/components/iam-add-member.vue b/frontend/src/views/group/components/iam-add-member.vue
@@ -111,6 +111,7 @@
                     :key="infiniteTreeKey"
                     :is-disabled="isAll"
                     :empty-data="emptyData"
+                    :has-selected-users="hasSelectedUsers"
                     :has-selected-departments="hasSelectedDepartments"
                     @async-load-nodes="handleRemoteLoadNode"
                     @expand-node="handleExpanded"

diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/components/iam-add-member.vue b/frontend/src/views/manage-spaces/secondary-manage-space/components/iam-add-member.vue
@@ -106,6 +106,8 @@
                     data-test-id="group_addGroupMemberDialog_tree_member"
                     :all-data="treeList"
                     :empty-data="emptyData"
+                    :has-selected-users="hasSelectedUsers"
+                    :has-selected-departments="hasSelectedDepartments"
                     style="height: 309px;"
                     :is-rating-manager="curIsRatingManager"
                     :key="infiniteTreeKey"

diff --git a/frontend/src/views/my-manage-space/add-member-boundary/index.vue b/frontend/src/views/my-manage-space/add-member-boundary/index.vue
@@ -86,6 +86,8 @@
                       data-test-id="group_addGroupMemberDialog_tree_member"
                       :all-data="treeList"
                       :empty-data="emptyData"
+                      :has-selected-users="hasSelectedUsers"
+                      :has-selected-departments="hasSelectedDepartments"
                       :style="{ height: `${contentHeight - 52}px` }"
                       :is-rating-manager="curIsRatingManager"
                       :key="infiniteTreeKey"

diff --git a/frontend/src/views/user/index.vue b/frontend/src/views/user/index.vue
@@ -69,6 +69,8 @@
             :style="contentStyle"
             :is-sync="isSync"
             :empty-data="emptyData"
+            :has-selected-users="hasSelectedUsers"
+            :has-selected-departments="hasSelectedDepartments"
             location="page"
             @async-load-nodes="handleRemoteLoadNode"
             @expand-node="handleExpanded"