From 7e91f2524fd617cdcbe6d83d1711414c78456270 Mon Sep 17 00:00:00 2001 From: chenwenchang <479999519@qq.com> Date: Wed, 11 Dec 2024 17:49:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(frontend):=20=E5=B7=A5=E5=85=B7=E7=AE=B1?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=B5=84=E6=BA=90=E6=B1=A0=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=5Fmysql=E6=B7=BB=E5=8A=A0proxy=20#8076=20#?= =?UTF-8?q?=20Reviewed,=20transaction=20id:=2026511?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/editable-table/Column.vue | 2 +- .../components/editable-table/edit/Input.vue | 29 +-- .../src/components/editable-table/types.ts | 2 +- .../useCreateTicket3/mysql/MYSQL_ADD_SLAVE.ts | 1 + dbm-ui/frontend/src/locales/zh-cn.json | 2 +- .../db-manage/mysql/MYSQL_ADD_SLAVE/Index.vue | 53 +++--- .../ClusterWithRelateCluster.vue | 51 ------ .../Index.vue => RenderCluster.vue} | 74 ++++++-- .../MYSQL_ADD_SLAVE/components/RenderHost.vue | 111 ++++++++++++ .../components/RenderSlaveHost.vue | 168 ------------------ 10 files changed, 213 insertions(+), 280 deletions(-) delete mode 100644 dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/ClusterColumn/ClusterWithRelateCluster.vue rename dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/{ClusterColumn/Index.vue => RenderCluster.vue} (68%) create mode 100644 dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/RenderHost.vue delete mode 100644 dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/RenderSlaveHost.vue diff --git a/dbm-ui/frontend/src/components/editable-table/Column.vue b/dbm-ui/frontend/src/components/editable-table/Column.vue index af6572d9ea..f68de94bd8 100644 --- a/dbm-ui/frontend/src/components/editable-table/Column.vue +++ b/dbm-ui/frontend/src/components/editable-table/Column.vue @@ -164,7 +164,7 @@ required: true, validator: defaultValidator.required, message: `${label}不能为空`, - trigger: 'change', + trigger: 'blur', }); } if (props.email) { diff --git a/dbm-ui/frontend/src/components/editable-table/edit/Input.vue b/dbm-ui/frontend/src/components/editable-table/edit/Input.vue index 4c8527ec28..2af3ccac51 100644 --- a/dbm-ui/frontend/src/components/editable-table/edit/Input.vue +++ b/dbm-ui/frontend/src/components/editable-table/edit/Input.vue @@ -6,7 +6,14 @@ v-bind="{ ...attrs, ...props }" clearable @blur="handleBlur" - @focus="handleFocus" /> + @focus="handleFocus"> + + + diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/ClusterColumn/ClusterWithRelateCluster.vue b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/ClusterColumn/ClusterWithRelateCluster.vue deleted file mode 100644 index a985cfab2f..0000000000 --- a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/ClusterColumn/ClusterWithRelateCluster.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/ClusterColumn/Index.vue b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/RenderCluster.vue similarity index 68% rename from dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/ClusterColumn/Index.vue rename to dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/RenderCluster.vue index 8f6a9f1806..46316a8de2 100644 --- a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/ClusterColumn/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/RenderCluster.vue @@ -17,7 +17,9 @@ field="clusterDomain" fixed="left" :label="t('目标集群')" - :min-width="300"> + :loading="loading || relatedClusterLoading" + :min-width="300" + required> - + + + diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/RenderSlaveHost.vue b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/RenderSlaveHost.vue deleted file mode 100644 index 5a69a783f3..0000000000 --- a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/components/RenderSlaveHost.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - -