fix(frontend): db部署规则列表支持城市过滤 #6847

TencentBlueKing · Sep 11, 2024 · 2ef6120 · 2ef6120
1 parent 581bfc6
commit 2ef6120
Show file tree

Hide file tree

Showing 15 changed files with 173 additions and 147 deletions.
diff --git a/dbm-ui/frontend/src/components/apply-items/SpecSelector.vue b/dbm-ui/frontend/src/components/apply-items/SpecSelector.vue
@@ -106,11 +106,13 @@
     cloudId: number | string;
     showRefresh?: boolean;
     clearable?: boolean;
+    city?: string;
   }
 
   const props = withDefaults(defineProps<Props>(), {
     showRefresh: true,
     clearable: true,
+    city: undefined,
   });
   const emits = defineEmits<Emits>();
 
@@ -175,6 +177,7 @@
       bk_biz_id: Number(props.bizId),
       bk_cloud_id: Number(props.cloudId),
       spec_ids: list.value.map((item) => item.spec_id),
+      city: props.city,
     }).then((data) => {
       list.value = list.value.map((item) => ({
         ...item,
@@ -185,7 +188,7 @@
   }, 100);
 
   watch(
-    [() => props.bizId, () => props.cloudId, data],
+    [() => props.bizId, () => props.cloudId, () => props.city, data],
     () => {
       if (
         typeof props.bizId === 'number' &&

diff --git a/dbm-ui/frontend/src/services/source/dbresourceResource.ts b/dbm-ui/frontend/src/services/source/dbresourceResource.ts
@@ -157,6 +157,7 @@ export function fetchResourceImportUrls() {
  */
 export function getSpecResourceCount(params: {
   bk_biz_id: number;
+  city?: string;
   resource_type?: string;
   bk_cloud_id: number;
   spec_ids: number[];