Merge pull request TencentBlueKing#11463 from vhwweng/issue_11444

feat：环境-节点管理列表增加执行信息并支持排序 TencentBlueKing#11444
carrywang05 · Feb 28, 2025 · c934a08 · c934a08
2 parents 0b5cf35 + 16d9afd
commit c934a08
Show file tree

Hide file tree

Showing 10 changed files with 772 additions and 243 deletions.
diff --git a/src/frontend/bk-permission/package.json b/src/frontend/bk-permission/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bk-permission",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "",
   "main": "./dist/main.js",
   "scripts": {

diff --git a/src/frontend/bk-permission/src/components/children/permission-manage/group-aside.vue b/src/frontend/bk-permission/src/components/children/permission-manage/group-aside.vue
@@ -324,13 +324,16 @@ export default {
             break;
           case 'submit_add_group_perm':
           case 'submit_delete_group_perm':
-          case 'submit_edit_group_perm':
-          case 'renewal_user_confirm':
-          case 'renewal_template_confirm': {
+          case 'submit_edit_group_perm': {
             const groupId = data.data.id;
             this.syncGroupPermissions(groupId)
             break;
           }
+          case 'renewal_user_confirm':
+          case 'renewal_template_confirm':  {
+            const groupId = data.data.id;
+            this.syncGroupIAM(this.groupList[this.curGroupIndex].groupId)
+          }
         }
       }
     },

diff --git a/src/frontend/devops-environment/src/components/empty-table-status.vue b/src/frontend/devops-environment/src/components/empty-table-status.vue
@@ -0,0 +1,55 @@
+<template>
+    <bk-exception
+        :type="type"
+        scene="part"
+    >
+        <div style="font-size: 14px;">{{ typeMap[type] }}</div>
+        <template v-if="type === 'search-empty'">
+            <div class="empty-tips">
+                {{ $t('environment.可以尝试 调整关键词 或') }}
+                <button
+                    class="bk-text-button"
+                    @click="handleClear"
+                >
+                    {{ $t('environment.清空筛选条件') }}
+                </button>
+            </div>
+        </template>
+    </bk-exception>
+</template>
+
+<script>
+    export default {
+        name: 'EmptyTableStatus',
+        props: {
+            type: {
+                type: String,
+                default: 'empty'
+            }
+        },
+        data () {
+            return {
+                typeMap: {
+                    empty: this.$t('environment.暂无数据'),
+                    'search-empty': this.$t('environment.搜索结果为空')
+                }
+            }
+        },
+        methods: {
+            handleClear () {
+                this.$emit('clear')
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    ::v-deep .bk-exception-img.part-img {
+        margin-top: 15%;
+    }
+    .empty-tips {
+        margin-top: 8px;
+        font-size: 12px;
+        color: #979BA5;
+    }
+</style>
diff --git a/src/frontend/devops-environment/src/components/envTabs/nodeTab.vue b/src/frontend/devops-environment/src/components/envTabs/nodeTab.vue
@@ -430,12 +430,15 @@
                 try {
                     const res = await this.$store.dispatch('environment/requestNodeList', {
                         projectId: this.projectId,
-                        envHashId: this.envHashId
+                        envHashId: this.envHashId,
+                        params: {
+                            page: -1
+                        }
                     })
 
                     this.importNodeList.splice(0, this.importNodeList.length)
 
-                    res.forEach(item => {
+                    res.records.forEach(item => {
                         item.isChecked = false
                         item.isDisplay = true
                         this.importNodeList.push(item)

diff --git a/src/frontend/devops-environment/src/store/actions.js b/src/frontend/devops-environment/src/store/actions.js
@@ -82,8 +82,8 @@ const actions = {
     /**
      * 节点列表
      */
-    requestNodeList ({ commit }, { projectId }) {
-        return vue.$ajax.get(`${prefix}/user/envnode/${projectId}`).then(response => {
+    requestNodeList ({ commit }, { projectId, params }) {
+        return vue.$ajax.get(`${prefix}/user/envnode/${projectId}/listNew`, { params }).then(response => {
             return response
         })
     },
@@ -294,8 +294,22 @@ const actions = {
         return vue.$ajax.post(`${prefix}/user/environment/thirdPartyAgent/projects/${projectId}/nodes/${nodeHashId}/dockerParallelTaskCount?count=${count}`).then(response => {
             return response
         })
-    }
+    },
+    /**
+     * 获取构建机最近执行记录
+     */
+    getLatestBuildPipelineList ({ commit }, { projectId }) {
+        return vue.$ajax.get(`${prefix}/user/environment/thirdPartyAgent/projects/${projectId}/listLatestBuildPipelines`)
+    },
 
+    exportNodeListCSV ({ commit }, { projectId, params }) {
+        const queryString = new URLSearchParams(params).toString()
+        return vue.$ajax.post(`${prefix}/user/envnode/${projectId}/listNew_export?${queryString}`, {}, {
+            originalResponse: true
+        }).then(response => {
+            return response
+        })
+    }
 }
 
 export default actions
diff --git a/src/frontend/devops-environment/src/views/create_env.vue b/src/frontend/devops-environment/src/views/create_env.vue
@@ -632,12 +632,15 @@
 
                 try {
                     const res = await this.$store.dispatch('environment/requestNodeList', {
-                        projectId: this.projectId
+                        projectId: this.projectId,
+                        params: {
+                            page: -1
+                        }
                     })
 
                     this.nodeList.splice(0, this.nodeList.length)
 
-                    res.forEach(item => {
+                    res.records.forEach(item => {
                         item.isChecked = false
 
                         if (this.createEnvForm.envType === 'BUILD') {