fix(frontend): 修复redis自定义方案选不出规格的问题 #8654

TencentBlueKing · Dec 18, 2024 · 0caa981 · 0caa981
1 parent 1c5e39e
commit 0caa981
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/dbm-ui/frontend/src/views/db-manage/redis/apply/ApplyRedis.vue b/dbm-ui/frontend/src/views/db-manage/redis/apply/ApplyRedis.vue
@@ -300,6 +300,7 @@
                 <BackendQPSSpec
                   ref="specBackendRef"
                   v-model="state.formdata.details.resource_spec.backend_group"
+                  v-model:apply-schema="applySchema"
                   :biz-id="state.formdata.bk_biz_id"
                   :cloud-id="state.formdata.details.bk_cloud_id"
                   :cluster-type="typeInfos.cluster_type"
@@ -397,6 +398,7 @@
   import DeployVersion from '@views/db-manage/common/apply-items/DeployVersion.vue';
   import RegionItem from '@views/db-manage/common/apply-items/RegionItem.vue';
   import SpecSelector from '@views/db-manage/common/apply-items/SpecSelector.vue';
+  import { APPLY_SCHEME } from '@views/db-manage/common/apply-schema/Index.vue';
   import PasswordInput from '@views/db-manage/common/password-input/Index.vue';
 
   import { generateId } from '@utils';
@@ -494,6 +496,7 @@
     name: '',
   });
   const passwordIsPass = ref(false);
+  const applySchema = ref(APPLY_SCHEME.AUTO);
 
   const state = reactive({
     formdata: initData(),
@@ -590,7 +593,7 @@
   });
 
   const backendMachineType = computed(() =>
-    typeInfos.value.cluster_type === ClusterTypes.PREDIXY_REDIS_CLUSTER
+    typeInfos.value.cluster_type === ClusterTypes.PREDIXY_REDIS_CLUSTER && applySchema.value === APPLY_SCHEME.AUTO
       ? ClusterTypes.PREDIXY_REDIS_CLUSTER
       : specClusterMachineMap[typeInfos.value.cluster_type],
   );

diff --git a/dbm-ui/frontend/src/views/db-manage/redis/apply/components/backend-spec/Index.vue b/dbm-ui/frontend/src/views/db-manage/redis/apply/components/backend-spec/Index.vue
@@ -99,13 +99,13 @@
 
   const props = defineProps<Props>();
   const modelValue = defineModel<ModelValue>({ required: true });
+  const applySchema = defineModel<APPLY_SCHEME>('applySchema', {required: true})
 
   const { t } = useI18n();
 
   const specRef = ref();
   const customSchemaRef = ref<InstanceType<typeof CustomSchema>>()
   const isLoading = ref(false);
-  const applySchema = ref(APPLY_SCHEME.AUTO)
 
   const specs = shallowRef<ClusterSpecModel[]>([]);
   const countMap = shallowRef({} as Record<number, number>)
@@ -192,7 +192,7 @@
     if (capacityValue === '' || futureCapacityValue === '') {
       resetSlider();
     } else {
-      modelValue.value.spec_id = -1;
+      modelValue.value.spec_id = '';
       clearTimeout(timer);
       timer = setTimeout(() => {
         fetchFilterClusterSpec();