feat(frontend): 支持故障池、待回收池 #7881 #7973

# Reviewed, transaction id: 24393
TencentBlueKing · Nov 27, 2024 · b6e8b9d · b6e8b9d
1 parent f452854
commit b6e8b9d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 31 deletions.
diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json
@@ -3723,5 +3723,7 @@
   "新建标签": "新建标签",
   "所有 IP": "所有 IP",
   "已选 IP": "已选 IP",
+  "业务资源池": "业务资源池",
+  "冷/热节点": "冷/热节点",
   "这行勿动！新增翻译请在上一行添加！": ""
 }
diff --git a/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/Index.vue b/dbm-ui/frontend/src/views/resource-manage/pool/components/host-list/Index.vue
@@ -30,13 +30,10 @@
         <ImportHostBtn
           class="w-88"
           @export-host="handleImportHost" />
-        <BkDropdown
-          :is-show="isBatchOperationShow"
-          trigger="manual">
+        <BkDropdown>
           <BkButton
             class="ml-8"
-            :disabled="selectionHostIdList.length < 1"
-            @click="() => handleBatchOperationShow(true)">
+            :disabled="selectionHostIdList.length < 1">
             {{ t('批量操作') }}
             <DbIcon type="down-big" />
           </BkButton>
@@ -202,9 +199,8 @@
   const isShowBatchConvertToBusiness = ref(false);
   const isShowBatchAssign = ref(false);
   const isShowUpdateAssign = ref(false);
-  const curEditData = ref<DbResourceModel>();
+  const curEditData = ref<DbResourceModel>({} as DbResourceModel);
   const isSelectedSameBiz = ref(false);
-  const isBatchOperationShow = ref(false);
 
   const curBizId = computed(() => {
     let bizId = undefined;
@@ -410,7 +406,6 @@
   // 批量设置
   const handleShowBatchSetting = () => {
     isShowBatchSetting.value = true;
-    handleBatchOperationShow(false);
   };
 
   // 复制所有主机
@@ -474,34 +469,28 @@
 
   const handleShowBatchCovertToPublic = () => {
     isShowBatchCovertToPublic.value = true;
-    handleBatchOperationShow(false);
   }
 
   const handleShowBatchMoveToRecyclePool = () => {
     isShowBatchMoveToRecyclePool.value = true;
-    handleBatchOperationShow(false);
   };
 
   const handleShowBatchMoveToFaultPool = () => {
     isShowBatchMoveToFaultPool.value = true;
-    handleBatchOperationShow(false);
   }
 
   const handleShowBatchUndoImport = () => {
     isShowBatchUndoImport.value = true;
-    handleBatchOperationShow(false);
   };
 
   const handleShowBatchConvertToBusiness = () => {
     isShowBatchConvertToBusiness.value = true;
-    handleBatchOperationShow(false);
   }
 
   const handleShowBatchAssign = () => {
     if (isSelectedSameBiz.value) {
       isShowBatchAssign.value = true;
     }
-    handleBatchOperationShow(false);
   }
 
   const handleEdit = (data: DbResourceModel) => {
@@ -514,13 +503,10 @@
     Object.values(selectionHostIdList.value).forEach((hostId) => {
       tableRef.value.removeSelectByKey(hostId);
     });
+    selectionListWholeDataMemo = [];
     selectionHostIdList.value = [];
   }
 
-  const handleBatchOperationShow = (val: boolean) => {
-    isBatchOperationShow.value = val;
-  }
-
   onMounted(() => {
     fetchData();
   });

diff --git a/...end/src/views/resource-manage/pool/components/host-list/components/batch-assign/Index.vue b/...end/src/views/resource-manage/pool/components/host-list/components/batch-assign/Index.vue
@@ -96,7 +96,8 @@
   const { loading: isUpdating, run: runUpdate } = useRequest(updateResource, {
     manual: true,
     onSuccess() {
-      handleCancel();
+      emits('refresh');
+      isShow.value = false;
       messageSuccess('设置成功');
     },
   });
@@ -125,7 +126,6 @@
   };
 
   const handleCancel = () => {
-    emits('refresh');
     isShow.value = false;
   };
 </script>

diff --git a/.../resource-manage/pool/components/host-list/components/batch-convert-to-business/Index.vue b/.../resource-manage/pool/components/host-list/components/batch-convert-to-business/Index.vue
@@ -54,7 +54,8 @@
   const { loading: isUpdating, run: runUpdate } = useRequest(updateResource, {
     manual: true,
     onSuccess() {
-      handleCancel();
+      emits('refresh');
+      isShow.value = false;
       messageSuccess(t('设置成功'));
     },
   });
@@ -70,7 +71,6 @@
   };
 
   const handleCancel = () => {
-    emits('refresh');
     isShow.value = false;
   };
 </script>

diff --git a/...ews/resource-manage/pool/components/host-list/components/batch-covert-to-public/Index.vue b/...ews/resource-manage/pool/components/host-list/components/batch-covert-to-public/Index.vue
@@ -55,7 +55,8 @@
   const { loading: isUpdating, run: runUpdate } = useRequest(updateResource, {
     manual: true,
     onSuccess() {
-      handleCancel();
+      isShow.value = false;
+      emits('refresh');
       messageSuccess(t('设置成功'));
     },
   });
@@ -72,6 +73,5 @@
 
   const handleCancel = () => {
     isShow.value = false;
-    emits('refresh');
   };
 </script>
diff --git a/...s/resource-manage/pool/components/host-list/components/batch-move-to-fault-pool/Index.vue b/...s/resource-manage/pool/components/host-list/components/batch-move-to-fault-pool/Index.vue
@@ -43,7 +43,8 @@
   const { loading: isRemoving, run: runDelete } = useRequest(removeResource, {
     manual: true,
     onSuccess() {
-      handleCancel();
+      emits('refresh');
+      isShow.value = false;
       messageSuccess(t('设置成功'));
     },
   });
@@ -56,7 +57,6 @@
   };
 
   const handleCancel = () => {
-    emits('refresh');
     isShow.value = false;
   };
 </script>

diff --git a/...resource-manage/pool/components/host-list/components/batch-move-to-recycle-pool/Index.vue b/...resource-manage/pool/components/host-list/components/batch-move-to-recycle-pool/Index.vue
@@ -43,7 +43,8 @@
   const { loading: isRemoving, run: runDelete } = useRequest(removeResource, {
     manual: true,
     onSuccess() {
-      handleCancel();
+      emits('refresh');
+      isShow.value = false;
       messageSuccess(t('设置成功'));
     },
   });
@@ -56,7 +57,6 @@
   };
 
   const handleCancel = () => {
-    emits('refresh');
     isShow.value = false;
   };
 </script>

diff --git a/...rc/views/resource-manage/pool/components/host-list/components/batch-undo-import/Index.vue b/...rc/views/resource-manage/pool/components/host-list/components/batch-undo-import/Index.vue
@@ -43,7 +43,8 @@
   const { loading: isRemoving, run: runDelete } = useRequest(removeResource, {
     manual: true,
     onSuccess() {
-      handleCancel();
+      emits('refresh');
+      isShow.value = false;
       messageSuccess(t('设置成功'));
     },
   });
@@ -56,7 +57,6 @@
   };
 
   const handleCancel = () => {
-    emits('refresh');
     isShow.value = false;
   };
 </script>

diff --git a/...nd/src/views/resource-manage/pool/components/host-list/components/update-assign/Index.vue b/...nd/src/views/resource-manage/pool/components/host-list/components/update-assign/Index.vue
@@ -104,7 +104,7 @@
   watch(
     () => props.editData,
     () => {
-      if (!props.editData) {
+      if (!Object.keys(props.editData).length) {
         return;
       }
       formData.for_biz = props.editData.for_biz.bk_biz_id;