From 94dd80a3f878e521276332c265d0a79ea31a9084 Mon Sep 17 00:00:00 2001 From: 3octaves <873551943@qq.com> Date: Thu, 2 Jan 2025 18:15:43 +0800 Subject: [PATCH] =?UTF-8?q?perf(frontend):=20mongodb=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=AE=B1=E9=87=8D=E6=9E=84=20#8498?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Index.vue | 13 +- .../{edit-spec => edit-spec-column}/Index.vue | 0 .../components/SpecPanel.vue | 33 ++--- .../spec-block-column/components/Panel.vue | 106 +++++++-------- .../MONGODB_ADD_MONGOS/pages/page1/Index.vue | 4 +- .../pages/page1/Index.vue | 24 ++-- .../MONGODB_BACKUP/pages/page1/Index.vue | 8 +- .../page1/components/TargetHostColumn.vue | 32 ++++- .../MONGODB_CUTOFF/pages/page1/Index.vue | 4 +- .../MONGODB_FULL_BACKUP/pages/page1/Index.vue | 2 +- .../pages/page1/Index.vue | 4 +- .../pages/page1/Index.vue | 24 ++-- .../MONGODB_REMOVE_NS/pages/page1/Index.vue | 12 +- .../pages/page1/Index.vue | 38 ++---- .../page1/components/CurrentCapacity.vue | 106 --------------- .../components/CurrentCapacityColumn.vue | 118 ++++++++++++++++ .../Index.vue | 127 ++++++++++-------- .../components/ChooseDeployPlan.vue | 0 .../Index.vue | 46 ++++--- .../Index.vue | 28 ++-- .../Index.vue | 101 +++++++------- .../Index.vue | 6 +- .../{edit-host => edit-host-column}/Index.vue | 46 +++---- .../Index.vue | 6 +- 24 files changed, 458 insertions(+), 430 deletions(-) rename dbm-ui/frontend/src/views/db-manage/common/toolbox-field/{edit-table-name => edit-db-table-name-column}/Index.vue (95%) rename dbm-ui/frontend/src/views/db-manage/common/toolbox-field/{edit-spec => edit-spec-column}/Index.vue (100%) rename dbm-ui/frontend/src/views/db-manage/common/toolbox-field/{edit-spec => edit-spec-column}/components/SpecPanel.vue (87%) delete mode 100644 dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/CurrentCapacity.vue create mode 100644 dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/CurrentCapacityColumn.vue rename dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/{target-capacity => target-capacity-column}/Index.vue (58%) rename dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/{target-capacity => target-capacity-column}/components/ChooseDeployPlan.vue (100%) rename dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/{edit-cluster => edit-cluster-column}/Index.vue (83%) rename dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/{edit-cluster-with-related-clusters => edit-cluster-with-related-clusters-column}/Index.vue (92%) rename dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/{edit-cluster-with-selector => edit-cluster-with-selector-column}/Index.vue (82%) rename dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/{edit-db-table => edit-db-name-column}/Index.vue (95%) rename dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/{edit-host => edit-host-column}/Index.vue (81%) rename dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/{edit-db-name => edit-table-name-column}/Index.vue (95%) diff --git a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/edit-table-name/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/edit-db-table-name-column/Index.vue similarity index 95% rename from dbm-ui/frontend/src/views/db-manage/common/toolbox-field/edit-table-name/Index.vue rename to dbm-ui/frontend/src/views/db-manage/common/toolbox-field/edit-db-table-name-column/Index.vue index 4486742d06..578440e09b 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/edit-table-name/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/edit-db-table-name-column/Index.vue @@ -15,13 +15,12 @@ :title="label" type="taginput" @change="handleBatchEditChange"> - - +
diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_CUTOFF/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_CUTOFF/pages/page1/Index.vue index 8f8acf3539..25104af6c7 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_CUTOFF/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_CUTOFF/pages/page1/Index.vue @@ -130,9 +130,9 @@ import { type IValue, type PanelListType } from '@components/instance-selector/Index.vue'; import TicketRemark from '@views/db-manage/common/TicketRemark.vue'; - import EditSpecColumn from '@views/db-manage/common/toolbox-field/edit-spec/Index.vue'; + import EditSpecColumn from '@views/db-manage/common/toolbox-field/edit-spec-column/Index.vue'; import OperationColumn from '@views/db-manage/common/toolbox-field/operation-column/Index.vue'; - import EditHostColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-host/Index.vue'; + import EditHostColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-host-column/Index.vue'; import RelatedClusterColumn from './components/RelatedClusterColumn.vue'; diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_FULL_BACKUP/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_FULL_BACKUP/pages/page1/Index.vue index c1a20bf8c4..f33ed8416e 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_FULL_BACKUP/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_FULL_BACKUP/pages/page1/Index.vue @@ -135,7 +135,7 @@ import TicketRemark from '@views/db-manage/common/TicketRemark.vue'; import OperationColumn from '@views/db-manage/common/toolbox-field/operation-column/Index.vue'; - import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster/Index.vue'; + import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-column/Index.vue'; export interface IDataRow { cluster: { diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REDUCE_MONGOS/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REDUCE_MONGOS/pages/page1/Index.vue index 65004b239a..a47119c88c 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REDUCE_MONGOS/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REDUCE_MONGOS/pages/page1/Index.vue @@ -35,7 +35,7 @@ v-model="item.cluster" :cluster-types="[ClusterTypes.MONGO_SHARED_CLUSTER]" field="cluster.master_domain" - label="目标分片集群" + :label="t('目标分片集群')" :selected="selected" :tab-list-config="tabListConfig" @batch-edit="handleClusterBatchEdit" /> @@ -136,7 +136,7 @@ import TicketRemark from '@views/db-manage/common/TicketRemark.vue'; import OperationColumn from '@views/db-manage/common/toolbox-field/operation-column/Index.vue'; import SpecBlockColumn from '@views/db-manage/common/toolbox-field/spec-block-column/Index.vue'; - import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster/Index.vue'; + import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-column/Index.vue'; import IpSelectColumn from './components/IpSelectColumn.vue'; diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REDUCE_SHARD_NODES/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REDUCE_SHARD_NODES/pages/page1/Index.vue index f64698f848..30c31c62a4 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REDUCE_SHARD_NODES/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REDUCE_SHARD_NODES/pages/page1/Index.vue @@ -121,8 +121,8 @@ import TicketRemark from '@views/db-manage/common/TicketRemark.vue'; import OperationColumn from '@views/db-manage/common/toolbox-field/operation-column/Index.vue'; - import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster/Index.vue'; - import EditClusterWithRelatedClustersColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-related-clusters/Index.vue'; + import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-column/Index.vue'; + import EditClusterWithRelatedClustersColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-related-clusters-column/Index.vue'; import TargetNumberColumn from './components/TargetNumberColumn.vue'; @@ -184,13 +184,7 @@ { validator: (value: string) => { if (value) { - const domainList = tableData.value - .flatMap((tableRow) => [ - tableRow.cluster.master_domain || '', - ...(tableRow.cluster.related_clusters || []).map((relatedItem) => relatedItem.domain), - ]) - .filter((domainItem) => domainItem); - return domainList.filter((domain) => domain === value).length === 1; + return domainList.value.filter((domain) => domain === value).length === 1; } return true; }, @@ -230,6 +224,18 @@ ), ); + const domainList = computed(() => + tableData.value.flatMap((tableRow) => { + if (tableRow.cluster.master_domain) { + return [ + tableRow.cluster.master_domain || '', + ...(tableRow.cluster.related_clusters || []).map((relatedItem) => relatedItem.domain), + ]; + } + return []; + }), + ); + const handleClusterBatchEdit = (clusterList: MongodbModel[]) => { const newList: IDataRow[] = []; clusterList.forEach((item) => { diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REMOVE_NS/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REMOVE_NS/pages/page1/Index.vue index e021d4bba8..29582a0ba2 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REMOVE_NS/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_REMOVE_NS/pages/page1/Index.vue @@ -56,14 +56,14 @@ v-model="item.cluster[0]" :cluster-types="[formData.cluster_type]" field="cluster.0.master_domain" - label="目标分片集群" + :label="t('目标分片集群')" :selected="selected" @batch-edit="handleClusterBatchEdit" /> @@ -154,10 +154,10 @@ import TicketRemark from '@views/db-manage/common/TicketRemark.vue'; import OperationColumn from '@views/db-manage/common/toolbox-field/operation-column/Index.vue'; - import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster/Index.vue'; - import EditClusterWithSelectorColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-selector/Index.vue'; - import EditDbNameColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-db-name/Index.vue'; - import EditTableNameColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-db-table/Index.vue'; + import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-column/Index.vue'; + import EditClusterWithSelectorColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-selector-column/Index.vue'; + import EditDbNameColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-db-name-column/Index.vue'; + import EditTableNameColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-table-name-column/Index.vue'; import DropTypeColumn from './components/DropTypeColumn.vue'; import DropIndexColumn from './components/DropTypeIndex.vue'; diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/Index.vue index 23adf8405b..50e4b67e21 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/Index.vue @@ -37,28 +37,10 @@ :cluster-types="[ClusterTypes.MONGO_REPLICA_SET, ClusterTypes.MONGO_SHARED_CLUSTER]" :selected="selected" @batch-edit="handleClusterBatchEdit" /> - - - - - - - - - - + + @@ -102,18 +84,14 @@ import { ClusterTypes, TicketTypes } from '@common/const'; - import EditableTable, { - Block as EditBlock, - Column as EditableTableColumn, - Row as EditableTableRow, - } from '@components/editable-table/Index.vue'; + import EditableTable, { Row as EditableTableRow } from '@components/editable-table/Index.vue'; import TicketRemark from '@views/db-manage/common/TicketRemark.vue'; import OperationColumn from '@views/db-manage/common/toolbox-field/operation-column/Index.vue'; - import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster/Index.vue'; + import EditClusterColumn from '@views/db-manage/mongodb/common/toolbox-field/edit-cluster-column/Index.vue'; - import CurrentCapacity from './components/CurrentCapacity.vue'; - import TargetCapacity from './components/target-capacity/Index.vue'; + import CurrentCapacityColumn from './components/CurrentCapacityColumn.vue'; + import TargetCapacityColumn from './components/target-capacity-column/Index.vue'; export interface IDataRow { cluster: { diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/CurrentCapacity.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/CurrentCapacity.vue deleted file mode 100644 index 2527a586ca..0000000000 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/CurrentCapacity.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/CurrentCapacityColumn.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/CurrentCapacityColumn.vue new file mode 100644 index 0000000000..7a9abc0f77 --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/CurrentCapacityColumn.vue @@ -0,0 +1,118 @@ + + + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/target-capacity/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/target-capacity-column/Index.vue similarity index 58% rename from dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/target-capacity/Index.vue rename to dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/target-capacity-column/Index.vue index 77102be628..9cb242d0ed 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/target-capacity/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/MONGODB_SCALE_UPDOWN/pages/page1/components/target-capacity-column/Index.vue @@ -12,81 +12,90 @@ --> + + diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-related-clusters/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-related-clusters-column/Index.vue similarity index 92% rename from dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-related-clusters/Index.vue rename to dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-related-clusters-column/Index.vue index 990e14a6be..b290ec4012 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-related-clusters/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-cluster-with-related-clusters-column/Index.vue @@ -24,7 +24,7 @@ diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-db-name/Index.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-table-name-column/Index.vue similarity index 95% rename from dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-db-name/Index.vue rename to dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-table-name-column/Index.vue index ad113c1b20..a94feffb58 100644 --- a/dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-db-name/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/mongodb/common/toolbox-field/edit-table-name-column/Index.vue @@ -1,5 +1,5 @@ - +