fix(frontend): 资源规格管理删除问题修复 #3596

TencentBlueKing · Mar 19, 2024 · 3528243 · 3528243
1 parent d824e04
commit 3528243
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/dbm-ui/frontend/src/views/resource-manage/spec/components/SpecList.vue b/dbm-ui/frontend/src/views/resource-manage/spec/components/SpecList.vue
@@ -369,7 +369,7 @@
                 permission={data.permission.spec_delete}
                 theme="primary"
                 text
-                onClick={() => handleDelete([data])}>
+                onClick={() => handleDelete([data], false)}>
                 {t('删除')}
               </auth-button>
             )}
@@ -484,7 +484,7 @@
     });
   };
 
-  const handleDelete = (list: ResourceSpecModel[]) => {
+  const handleDelete = (list: ResourceSpecModel[], isBatch = true) => {
     useInfoWithIcon({
       type: 'warnning',
       title: t('确认删除以下规格'),
@@ -496,7 +496,7 @@
       onConfirm: async () => {
         try {
           await batchDeleteResourceSpec({
-            spec_ids: selectedList.value.map(item => item.spec_id),
+            spec_ids: isBatch ? selectedList.value.map(item => item.spec_id) : list.map(item => item.spec_id),
           });
           messageSuccess(t('删除成功'));
           fetchData();

diff --git a/dbm-ui/frontend/src/views/resource-manage/spec/components/spec-form-item/SpecStorage.vue b/dbm-ui/frontend/src/views/resource-manage/spec/components/spec-form-item/SpecStorage.vue
@@ -62,9 +62,15 @@
   });
   const emits = defineEmits<Emits>();
 
+  const createData = () => ({
+    mount_point: '',
+    size: '' as string | number,
+    type: '',
+  });
+
   const { t } = useI18n();
 
-  const tableData = ref([...props.modelValue]);
+  const tableData = ref(props.modelValue.length > 0 ? props.modelValue : [createData()]);
   const deviceClass = ref<{label: string, value: string}[]>([]);
   const isLoadDeviceClass = ref(true);
 
@@ -220,12 +226,6 @@
     },
   ];
 
-  const createData = () => ({
-    mount_point: '',
-    size: '' as string | number,
-    type: '',
-  });
-
   const handleAdd = (index: number) => {
     tableData.value.splice(index + 1, 0, createData());
   };