fix(frontend): 修复mysql定点构造目标集群手写输入id为0问题 TencentBlueKing#8152

xiepaup · Nov 26, 2024 · fa397ec · fa397ec
1 parent 2605013
commit fa397ec
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/dbm-ui/frontend/src/types/auto-imports.d.ts b/dbm-ui/frontend/src/types/auto-imports.d.ts
@@ -71,6 +71,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }
diff --git a/.../mysql/rollback/pages/page1/components/render-row/components/RenderClusterInputSelect.vue b/.../mysql/rollback/pages/page1/components/render-row/components/RenderClusterInputSelect.vue
@@ -97,7 +97,7 @@
       message: t('目标集群不能为空'),
     },
     {
-      validator: (value: string) => value.split(',').every((domain) => domainRegex.test(domain)),
+      validator: (value: string) => domainRegex.test(value),
       message: t('目标集群输入格式有误'),
     },
     {
@@ -110,6 +110,7 @@
           bk_biz_id: window.PROJECT_CONFIG.BIZ_ID,
         }).then((data) => {
           if (data.length === list.length) {
+            localClusterId.value = data[0].id;
             return true;
           }
           return false;
@@ -129,6 +130,7 @@
       bk_biz_id: window.PROJECT_CONFIG.BIZ_ID,
     }).then((data) => {
       if (data) {
+        localClusterId.value = data[0].id;
         localClusterDomain.value = data[0].master_domain;
       }
     });

diff --git a/...luster/rollback/pages/page1/components/render-row/components/RenderClusterInputSelect.vue b/...luster/rollback/pages/page1/components/render-row/components/RenderClusterInputSelect.vue
@@ -85,7 +85,7 @@
       message: t('目标集群不能为空'),
     },
     {
-      validator: (value: string) => value.split(',').every((domain) => domainRegex.test(domain)),
+      validator: (value: string) => domainRegex.test(value),
       message: t('目标集群输入格式有误'),
     },
     {
@@ -98,6 +98,7 @@
           bk_biz_id: window.PROJECT_CONFIG.BIZ_ID,
         }).then((data) => {
           if (data.length === list.length) {
+            localClusterId.value = data[0].id;
             return true;
           }
           return false;
@@ -112,6 +113,7 @@
       cluster_ids: [id],
     }).then((data) => {
       if (data?.results.length > 0) {
+        localClusterId.value = data.results[0]?.id;
         localClusterDomain.value = data.results[0]?.master_domain;
       }
     });