From 0bd63a008013ff9caf7d2c80192a800e416543bd Mon Sep 17 00:00:00 2001 From: hlinx <327159425@qq.com> Date: Fri, 19 Jul 2024 11:55:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(frontend):=20=E5=BF=AB=E9=80=9F=E8=BF=9E?= =?UTF-8?q?=E7=BB=AD=E7=82=B9=E5=87=BB=E9=87=8D=E5=A4=8D=E6=8F=90=E5=8D=95?= =?UTF-8?q?=20#5714=20#=20Reviewed,=20transaction=20id:=2012563?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cluster-export-data/component/Content.vue | 8 +- .../es-manage/common/expansion/Index.vue | 2 +- .../views/es-manage/common/replace/Index.vue | 266 +++++++++--------- .../views/es-manage/common/shrink/Index.vue | 4 +- .../node-list/components/InstanceDetail.vue | 4 +- .../hdfs-manage/common/expansion/Index.vue | 2 +- .../hdfs-manage/common/replace/Index.vue | 2 +- .../views/hdfs-manage/common/shrink/Index.vue | 2 +- .../node-list/components/InstanceDetail.vue | 4 +- .../kafka-manage/common/expansion/Index.vue | 2 +- .../kafka-manage/common/replace/Index.vue | 2 +- .../kafka-manage/common/shrink/Index.vue | 2 +- .../node-list/components/InstanceDetail.vue | 4 +- .../db-replace/pages/page1/Index.vue | 67 +++-- .../src/views/mysql/checksum/Index.vue | 16 +- .../mysql/data-migrate/pages/page1/Index.vue | 12 +- .../mysql/db-backup/pages/page1/Index.vue | 45 ++- .../src/views/mysql/db-clear/index.vue | 16 +- .../src/views/mysql/db-rename/index.vue | 13 +- .../dumper/components/create-rule/Index.vue | 36 +-- .../mysql/privilege-clone-client/index.vue | 81 +++--- .../mysql/privilege-clone-inst/index.vue | 77 +++-- .../src/views/mysql/slave-add/index.vue | 11 +- .../mysql/sql-execute/steps/step1/Index.vue | 6 +- .../pulsar-manage/common/expansion/Index.vue | 2 +- .../pulsar-manage/common/replace/Index.vue | 2 +- .../pulsar-manage/common/shrink/Index.vue | 2 +- .../node-list/components/InstanceDetail.vue | 4 +- .../redis/db-data-copy/pages/page1/Index.vue | 34 ++- .../redis/db-replace/pages/page1/Index.vue | 98 +++---- .../db-backup/pages/page1/Index.vue | 36 +-- .../list/components/CapacityChange.vue | 2 +- .../master-slave-clone/pages/page1/Index.vue | 33 +-- .../proxy-scale-down/pages/page1/Index.vue | 67 +++-- .../proxy-scale-up/pages/page1/Index.vue | 66 +++-- .../proxy-slave-apply/pages/page1/Index.vue | 35 +-- .../db-backup/pages/page1/Index.vue | 48 ++-- 37 files changed, 532 insertions(+), 581 deletions(-) diff --git a/dbm-ui/frontend/src/components/cluster-export-data/component/Content.vue b/dbm-ui/frontend/src/components/cluster-export-data/component/Content.vue index fc9ca4a539..d0d28ce022 100644 --- a/dbm-ui/frontend/src/components/cluster-export-data/component/Content.vue +++ b/dbm-ui/frontend/src/components/cluster-export-data/component/Content.vue @@ -218,7 +218,7 @@ }); } - createTicket({ + return createTicket({ ignore_duplication: true, ticket_type: props.ticketType, bk_biz_id: props.data.bk_biz_id, @@ -246,13 +246,15 @@ .target-dbs { .required-mark { - color: #ea3636; margin: 0 4px; + color: #ea3636; } + .label-text { color: #979ba5; } - :deep(.bk-form-label:after) { + + :deep(.bk-form-label::after) { display: none; } } diff --git a/dbm-ui/frontend/src/views/es-manage/common/expansion/Index.vue b/dbm-ui/frontend/src/views/es-manage/common/expansion/Index.vue index 04270f0136..b6cd2cb235 100644 --- a/dbm-ui/frontend/src/views/es-manage/common/expansion/Index.vue +++ b/dbm-ui/frontend/src/views/es-manage/common/expansion/Index.vue @@ -326,7 +326,7 @@ headerAlign: 'center', contentAlign: 'center', footerAlign: 'center', - onClosed: () => reject(), + onCancel: () => reject(), onConfirm: () => { const hostData = {}; diff --git a/dbm-ui/frontend/src/views/es-manage/common/replace/Index.vue b/dbm-ui/frontend/src/views/es-manage/common/replace/Index.vue index 95af1339a9..be4d413e81 100644 --- a/dbm-ui/frontend/src/views/es-manage/common/replace/Index.vue +++ b/dbm-ui/frontend/src/views/es-manage/common/replace/Index.vue @@ -119,11 +119,7 @@