--story=121336129 【集群管理】支持配置集群可见范围 (merge request !2198)

Squash merge branch 'fix/skip-lost-id' into 'master' fix: 点击编辑集群可见范围页面卡顿问题 # Reviewed, transaction id: 29321 TAPD: --story=121336129
TencentBlueKing · Jan 15, 2025 · 36569b8 · 36569b8
1 parent 2bb1fa2
commit 36569b8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/bcs-ui/frontend/package.json b/bcs-ui/frontend/package.json
@@ -18,7 +18,7 @@
     "@blueking/login-modal": "^1.0.2",
     "@blueking/notice-component-vue2": "^2.0.5",
     "@blueking/platform-config": "^1.0.5",
-    "@blueking/task-log": "^0.0.6",
+    "@blueking/task-log": "^0.0.8",
     "@blueking/user-selector": "^1.0.9",
     "axios": "^1.7.7",
     "base-64": "^0.1.0",

diff --git a/bcs-ui/frontend/src/views/cluster-manage/cluster/index.vue b/bcs-ui/frontend/src/views/cluster-manage/cluster/index.vue
@@ -115,7 +115,8 @@
           :loading="logLoading"
           :height="'calc(100vh - 92px)'"
           :rolling-loading="false"
-          step-actions="FAILED"
+          :show-step-retry-fn="item => item?.step?.allowRetry"
+          :show-step-skip-fn="item => item?.step?.allowSkip"
           @refresh="handleShowLog(logSideDialogConf.row)"
           @auto-refresh="handleAutoRefresh"
           @download="getDownloadTaskRecords"

diff --git a/bcs-ui/frontend/src/views/cluster-manage/components/cluster-visible-range.vue b/bcs-ui/frontend/src/views/cluster-manage/components/cluster-visible-range.vue
@@ -74,7 +74,18 @@
             v-for="option in projectList"
             :key="option.projectID"
             :id="option.projectID"
-            :name="option.name">
+            :name="option.name"
+            :disabled="!(perms[option.projectID] && perms[option.projectID].project_view)"
+            v-authority="{
+              clickable: perms[option.projectID]
+                && perms[option.projectID].project_view,
+              actionId: 'project_view',
+              resourceName: option.name,
+              disablePerms: true,
+              permCtx: {
+                project_id: option.projectID
+              }
+            }">
             <span class="flex items-center justify-between">
               <span class="flex items-center max-w-[90%]">
                 <span
@@ -182,7 +193,6 @@ export default defineComponent({
     const projectNameList = computed(() => innerValue.value.map(item => projectIDMap.value[item]?.name || item));
     const loading = ref(false);
     const params = ref({
-      all: false,
       offset: 0,
       limit: 20,
     });
@@ -248,8 +258,8 @@ export default defineComponent({
     // 选择项目
     function handleProjectChange(projects) {
       isSelectAll.value = false;
-      innerValue.value = projects;
-      ctx.emit('change', projects);
+      innerValue.value = [...projects];
+      ctx.emit('change', [...projects]);
     }
 
     // 选择全部
@@ -288,6 +298,7 @@ export default defineComponent({
       projectNameList,
       isSelectAll,
       isOnlyCurrentPorject,
+      perms,
       handleSave,
       handleEdit,
       handleChange,

diff --git a/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue b/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue
@@ -502,7 +502,7 @@
             <template v-else>--</template>
           </template>
         </bcs-table-column>
-        <bcs-table-column :label="$t('generic.label.action')" width="160" :resizable="false" fixed="right">
+        <bcs-table-column :label="$t('generic.label.action')" width="220" :resizable="false" fixed="right">
           <template #default="{ row }">
             <bk-button class="mr10" text v-if="row.status === 'APPLY-FAILURE'" @click="handleDeleteNode(row)">
               {{ $t('generic.button.delete') }}
@@ -686,7 +686,8 @@
             :loading="logSideDialogConf.loading"
             :height="'calc(100vh - 92px)'"
             :rolling-loading="false"
-            step-actions="FAILED"
+            :show-step-retry-fn="item => item?.step?.allowRetry"
+            :show-step-skip-fn="item => item?.step?.allowSkip"
             @refresh="handleShowLog(logSideDialogConf.row)"
             @auto-refresh="handleAutoRefresh"
             @download="getDownloadTaskRecords"
@@ -1907,6 +1908,7 @@ export default defineComponent({
       }).catch(() => ({ status: '', step: [] }));
       logSideDialogConf.value.taskData = step;
       logSideDialogConf.value.status = status;
+      logSideDialogConf.value.taskID = taskID;
     };
 
     const closeLog = () => {