From b14fb6668893b6d1a0efc4f89f7650973ad93231 Mon Sep 17 00:00:00 2001 From: hailinxiao Date: Wed, 25 Sep 2024 18:15:28 +0800 Subject: [PATCH] =?UTF-8?q?chore(frontend):=20=E5=AE=8C=E5=96=84=20model?= =?UTF-8?q?=20=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89=E3=80=81service=20?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=B0=83=E6=95=B4=20#7131=20#=20Reviewed,=20?= =?UTF-8?q?transaction=20id:=2019411?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/cluster-selector/Index.vue | 16 +- .../components/sqlserver-ha/Index.vue | 6 +- .../components/sqlserver-single/Index.vue | 6 +- .../components/instance-selector/Index.vue | 18 +- .../manual-content-host/table/Index.vue | 2 +- .../src/components/ip-selector/IpSelector.vue | 24 +- .../components/more-action-extend/Index.vue | 6 +- .../generateCloneData/spider/addMnt.ts | 8 +- .../generateCloneData/spider/authorizeRule.ts | 4 +- .../spider/capacityChange.ts | 8 +- .../spider/masterSlaveClone.ts | 8 +- .../spider/privilegeCloneInst.ts | 8 +- .../spider/proxyScaleDown.ts | 16 +- .../generateCloneData/spider/proxyScaleUp.ts | 8 +- .../spider/proxySlaveApply.ts | 8 +- .../spider/slaveRebuildLocal.ts | 8 +- .../spider/slaveRebuildNew.ts | 8 +- .../time-base-class.ts => _clusterBase.ts} | 4 +- .../frontend/src/services/model/_dateTime.ts | 19 ++ .../model/admin-password/admin-password.ts | 6 +- .../model/config/biz-conf-topo-tree.ts | 4 +- .../services/model/db-resource/import-host.ts | 49 ---- .../src/services/model/es/es-detail.ts | 25 ++ .../src/services/model/es/es-instance.ts | 16 +- .../frontend/src/services/model/es/es-node.ts | 15 +- dbm-ui/frontend/src/services/model/es/es.ts | 75 ++---- .../src/services/model/hdfs/hdfs-detail.ts | 27 +++ .../src/services/model/hdfs/hdfs-instance.ts | 30 +-- .../frontend/src/services/model/hdfs/hdfs.ts | 71 ++---- .../model/influxdb/influxdbInstance.ts | 25 +- .../src/services/model/kafka/kafka-detail.ts | 25 ++ .../services/model/kafka/kafka-instance.ts | 27 +-- .../src/services/model/kafka/kafka-node.ts | 19 +- .../src/services/model/kafka/kafka.ts | 86 ++----- .../model/mongodb/mongodb-instance.ts | 91 +------ .../mongodb-permission-account.ts | 10 +- .../mysql-permission-account.ts | 11 +- .../remote-pair-instance.ts | 0 .../services/model/mysql/tendbha-detail.ts | 25 ++ .../services/model/mysql/tendbha-instance.ts | 68 +----- .../src/services/model/mysql/tendbha.ts | 56 ++--- .../model/mysql/tendbsingle-detail.ts | 25 ++ .../src/services/model/mysql/tendbsingle.ts | 53 ++--- .../services/model/pulsar/pulsar-instance.ts | 27 +-- .../redis/redis-cluster-node-by-filter.ts | 35 +-- .../src/services/model/redis/redis-detail.ts | 25 ++ .../model/redis/redis-dst-job-task.ts | 2 + .../src/services/model/redis/redis-host.ts | 4 +- .../services/model/redis/redis-instance.ts | 38 +-- .../src/services/model/redis/redis.ts | 136 +++-------- .../src/services/model/riak/riak-detail.ts | 25 ++ .../src/services/model/riak/riak-instance.ts | 61 +---- .../frontend/src/services/model/riak/riak.ts | 146 +++++------- .../src/services/model/spider/spider.ts | 187 --------------- .../sqlserver/sqlserver-ha-cluster-detail.ts | 129 ---------- .../model/sqlserver/sqlserver-ha-detail.ts | 25 ++ .../model/sqlserver/sqlserver-ha-instance.ts | 81 +------ ...qlserver-ha-cluster.ts => sqlserver-ha.ts} | 66 +----- .../sqlserver-permission-account.ts | 0 .../sqlserver-single-cluster-detail.ts | 127 ---------- .../sqlserver/sqlserver-single-detail.ts | 25 ++ .../sqlserver/sqlserver-single-instance.ts | 83 +------ ...-single-cluster.ts => sqlserver-single.ts} | 54 +---- .../model/tendbcluster/tendbcluster-detail.ts | 25 ++ .../tendbcluster-instance.ts} | 63 +---- .../tendbcluster-machine.ts} | 0 .../tendbcluster.ts} | 72 ++---- .../services/model/ticket/details/redis.ts | 8 +- dbm-ui/frontend/src/services/source/cmdb.ts | 3 +- .../frontend/src/services/source/dbdirty.ts | 2 +- .../services/source/dbresourceDeployPlan.ts | 2 +- .../src/services/source/dbresourceResource.ts | 7 +- .../src/services/source/dbresourceSpec.ts | 3 +- dbm-ui/frontend/src/services/source/dumper.ts | 2 +- dbm-ui/frontend/src/services/source/es.ts | 12 +- .../src/services/source/fixpointRollback.ts | 2 +- dbm-ui/frontend/src/services/source/hdfs.ts | 5 +- .../frontend/src/services/source/influxdb.ts | 2 +- .../src/services/source/influxdbGroup.ts | 3 +- .../frontend/src/services/source/ipchooser.ts | 11 +- dbm-ui/frontend/src/services/source/kafka.ts | 10 +- .../frontend/src/services/source/mongodb.ts | 2 +- .../source/mongodbPermissionAccount.ts | 4 +- .../src/services/source/mongodbRestore.ts | 2 +- .../frontend/src/services/source/monitor.ts | 3 +- .../src/services/source/monitorNoticeGroup.ts | 2 +- .../src/services/source/mysqlCluster.ts | 2 +- .../frontend/src/services/source/openarea.ts | 2 +- .../frontend/src/services/source/package.ts | 2 +- .../src/services/source/partitionManage.ts | 2 +- .../src/services/source/permission.ts | 4 +- dbm-ui/frontend/src/services/source/pulsar.ts | 2 +- dbm-ui/frontend/src/services/source/redis.ts | 9 +- .../src/services/source/redisRollback.ts | 2 +- .../src/services/source/redisToolbox.ts | 3 +- dbm-ui/frontend/src/services/source/report.ts | 3 +- dbm-ui/frontend/src/services/source/riak.ts | 10 +- dbm-ui/frontend/src/services/source/spider.ts | 222 ------------------ .../src/services/source/sqlserveHaCluster.ts | 14 +- .../source/sqlserverPermissionAccount.ts | 4 +- .../services/source/sqlserverSingleCluster.ts | 26 +- .../frontend/src/services/source/taskflow.ts | 2 +- .../src/services/source/tendbcluster.ts | 156 ++++++++++++ .../frontend/src/services/source/tendbha.ts | 9 +- .../src/services/source/tendbsingle.ts | 11 +- .../frontend/src/services/source/ticket.tsx | 4 +- dbm-ui/frontend/src/services/source/user.ts | 3 +- .../frontend/src/services/source/whitelist.ts | 2 +- .../services/types/db/clusterEntryDetail.ts | 20 ++ .../src/services/types/db/clusterListEntry.ts | 5 + .../src/services/types/db/clusterListNode.ts | 34 +++ .../services/types/db/clusterListOperation.ts | 8 + .../src/services/types/db/clusterListSpec.ts | 29 +++ .../frontend/src/services/types/db/index.ts | 8 + .../types/db/instanceListOperation.ts | 9 + .../types/db/instanceListSpecConfig.ts | 20 ++ .../types/db/instanceRelatedCluster.ts | 17 ++ .../types/{hostDetails.ts => hostInfo.ts} | 11 +- dbm-ui/frontend/src/services/types/index.ts | 5 +- .../types/{clusters.ts => instanceInfos.ts} | 4 +- dbm-ui/frontend/src/services/types/ticket.ts | 40 ++-- dbm-ui/frontend/src/types/biz-components.d.ts | 15 +- .../add-permission-rule-dialog/Index.vue | 2 +- .../big-data-host-table/HdfsHostTable.vue | 44 ++-- .../big-data-host-table/RenderHostTable.vue | 36 +-- .../es-host-table/index.vue | 6 +- .../hook/useLocalPagination.ts | 6 +- .../cluster-authorize/ClusterAuthorize.vue | 4 +- .../accout-rules-preview-table/Index.vue | 4 +- .../accouter-rules-selector/Index.vue | 4 +- .../components/AccountRulesTable.vue | 4 +- .../common/cluster-details/ClusterTopo.vue | 4 +- .../cluster-details/common/useRenderGraph.tsx | 4 +- .../common/cluster-export-data/Index.vue | 7 +- .../cluster-export-data/component/Content.vue | 2 +- .../common/dropdown-export-excel/index.vue | 6 +- .../common/es-host-expansion/Index.vue | 8 +- .../components/HostSelector.vue | 4 +- .../components/HostSelector.vue | 10 +- .../db-manage/common/host-expansion/Index.vue | 8 +- .../components/HostSelector.vue | 10 +- .../db-manage/elastic-search/apply/Index.vue | 20 +- .../elastic-search/common/expansion/Index.vue | 6 +- .../elastic-search/common/replace/Index.vue | 4 +- .../src/views/db-manage/hdfs/apply/Index.vue | 18 +- .../detail/components/node-list/Index.vue | 4 +- .../db-manage/influxdb/apply/common/base.ts | 4 +- .../src/views/db-manage/kafka/apply/Index.vue | 14 +- .../db-manage/mongodb/permission/Index.vue | 10 +- .../components/AccountInfoDialog.vue | 2 +- .../db-manage/mysql/apply/ApplyMySQL.vue | 10 +- .../apply/components/MySQLDomainTable.vue | 6 +- .../mysql/apply/hooks/useMysqlData.ts | 6 +- .../RenderData/RenderBackupLocal.vue | 4 +- .../components/RenderData/RenderCluster.vue | 2 +- .../components/RenderData/RenderCluster.vue | 2 +- .../components/RenderData/RenderMaster.vue | 2 +- .../components/target-cluster/Index.vue | 8 +- .../target-cluster/components/ColumnHost.vue | 8 +- .../components/template-detail/Index.vue | 2 +- .../components/PrivRuleDetail.vue | 2 +- .../mysql/openarea/template-create/Index.vue | 2 +- .../permission-rule/components/CreateRule.vue | 2 +- .../db-manage/mysql/permission-rule/index.vue | 2 +- .../pages/page1/Index.vue | 6 +- .../components/RenderData/RenderTarget.vue | 2 +- .../pages/page1/components/BatchEntry.vue | 2 +- .../common/RenderHostInputSelect.vue | 12 +- .../components/RenderData/RenderNewSlave.vue | 10 +- .../db-manage/pulsar/apply/common/base.ts | 8 +- .../views/db-manage/pulsar/apply/index.vue | 12 +- .../pulsar/common/expansion/Index.vue | 6 +- .../db-manage/redis/apply/ApplyRedis.vue | 24 +- .../components/RenderManualInput.vue | 2 +- .../src/views/db-manage/riak/apply/Index.vue | 10 +- .../list/components/components/AddNodes.vue | 10 +- .../db-manage/sqlserver/apply/SqlServer.vue | 12 +- .../sqlserver/common/RenderCluster.vue | 12 +- .../components/cluster-reset/Index.vue | 6 +- .../data-migrate/pages/page1/Index.vue | 6 +- .../render-data/RenderDstCluster.vue | 21 +- .../render-data/RenderSrcCluster.vue | 12 +- .../sqlserver/db-backup/pages/page1/Index.vue | 10 +- .../components/RenderData/RenderCluster.vue | 12 +- .../sqlserver/db-clear/pages/page1/Index.vue | 6 +- .../components/RenderData/RenderCluster.vue | 2 +- .../sqlserver/db-rename/pages/page1/Index.vue | 10 +- .../ha-cluster-list/components/List.vue | 64 ++--- .../components/RenderData/RenderCluster.vue | 2 +- .../components/RenderData/RenderCluster.vue | 2 +- .../db-manage/sqlserver/permission/Index.vue | 2 +- .../pages/page1/components/local/Index.vue | 10 +- .../page1/components/other-cluster/Index.vue | 10 +- .../other-cluster/components/DstCluster.vue | 20 +- .../other-cluster/components/SrcCluster.vue | 12 +- .../single-cluster/components/List.vue | 58 ++--- .../sqlserver/slave-add/pages/page1/Index.vue | 6 +- .../components/RenderData/RenderNewSlave.vue | 8 +- .../add-mnt/pages/page1/Index.vue | 2 +- .../components/RenderData/RenderCluster.vue | 2 +- .../components/RenderData/RenderHost.vue | 8 +- .../capacity-change/pages/page1/Index.vue | 6 +- .../components/RenderData/RenderCluster.vue | 2 +- .../checksum/pages/page1/Index.vue | 6 +- .../db-backup/pages/page1/Index.vue | 6 +- .../RenderData/RenderBackupLocal.vue | 4 +- .../db-clear/pages/page1/Index.vue | 6 +- .../db-rename/pages/page1/Index.vue | 10 +- .../db-table-backup/pages/page1/Index.vue | 6 +- .../RenderData/RenderBackupLocal.vue | 4 +- .../flashback/pages/page1/Index.vue | 6 +- .../list-instance/components/detail/Index.vue | 8 +- .../components/detail/components/BaseInfo.vue | 17 +- .../list-instance/components/list/Index.vue | 6 +- .../list/components/detail/Index.vue | 6 +- .../components/detail/components/BaseInfo.vue | 2 +- .../list/components/list/Index.vue | 26 +- .../list/components/CapacityChange.vue | 2 +- .../components/list/components/ScaleUp.vue | 2 +- .../components/list/components/Shrink.vue | 2 +- .../components/list/components/SpecInfo.vue | 2 +- .../components/RenderData/RenderCluster.vue | 2 +- .../components/RenderData/RenderMaster.vue | 2 +- .../master-slave-clone/pages/page1/Index.vue | 4 +- .../page1/components/RenderNewInstace.vue | 11 +- .../components/RenderRelatedInstance.vue | 4 +- .../page1/components/RenderSlaveHost.vue | 2 +- .../components/RenderData/RenderCluster.vue | 2 +- .../components/RenderData/RenderMaster.vue | 2 +- .../components/target-cluster/Index.vue | 16 +- .../target-cluster/components/BatchInput.vue | 6 +- .../components/ColumnCluster.vue | 8 +- .../target-cluster/components/ColumnHost.vue | 10 +- .../target-cluster/components/Row.vue | 6 +- .../components/template-detail/Index.vue | 2 +- .../components/PrivRuleDetail.vue | 2 +- .../openarea-template-create/Index.vue | 8 +- .../components/PermissionRule.vue | 2 +- .../partition-manage/components/Operation.vue | 4 +- .../tendb-cluster/permission/Index.vue | 2 +- .../components/AccountInfoDialog.vue | 2 +- .../permission/components/CreateRule.vue | 2 +- .../pages/page1/Index.vue | 6 +- .../pages/page1/components/BatchEntry.vue | 2 +- .../components/RenderData/RenderTarget.vue | 2 +- .../pages/page1/components/RenderData/Row.vue | 2 +- .../proxy-scale-down/pages/page1/Index.vue | 16 +- .../pages/page1/components/Row.vue | 18 +- .../proxy-scale-up/pages/page1/Index.vue | 14 +- .../pages/page1/components/RenderHostType.vue | 8 +- .../pages/page1/components/Row.vue | 6 +- .../proxy-slave-apply/pages/page1/Index.vue | 14 +- .../cluster-selector-table/Index.vue | 10 +- .../common/RenderClusterInputSelect.vue | 6 +- .../page1/components/render-data/Index.vue | 4 +- .../pages/page1/components/new-host/Index.vue | 4 +- .../render-data/RenderNewSlaveHost.vue | 8 +- .../render-data/RenderOldSlaveHost.vue | 4 +- .../new-host/components/render-data/Row.vue | 4 +- .../pool/components/import-host/Index.vue | 5 +- .../import-host/components/FormPanel.vue | 10 +- .../components/select-host-panel/Index.vue | 14 +- .../record/components/HostDetail.vue | 6 +- .../task-history/components/PreviewHost.vue | 20 +- .../components/form-item/InstanceList.vue | 10 +- .../openarea/components/PermissionRule.vue | 2 +- .../demand-factory/spider/AddNodes.vue | 4 +- .../demand-factory/spider/CheckSum.vue | 4 +- .../demand-factory/spider/Destroy.vue | 4 +- .../demand-factory/spider/Disable.vue | 4 +- .../demand-factory/spider/Enable.vue | 4 +- .../demand-factory/spider/Flashback.vue | 4 +- .../demand-factory/spider/FullBackup.vue | 4 +- .../demand-factory/spider/MNTApply.vue | 4 +- .../demand-factory/spider/MNTDestroy.vue | 4 +- .../demand-factory/spider/NodeRebalance.vue | 4 +- .../demand-factory/spider/ReduceNodes.vue | 4 +- .../demand-factory/spider/RenameDatabase.vue | 4 +- .../demand-factory/spider/SlaveApply.vue | 4 +- .../demand-factory/spider/SlaveDestroy.vue | 4 +- .../demand-factory/spider/TableBackup.vue | 4 +- .../spider/TruncateDatabase.vue | 4 +- .../components/RollbackExistCluster.vue | 8 +- .../common/hooks/useTargetClusterData.ts | 10 +- 284 files changed, 1800 insertions(+), 2701 deletions(-) rename dbm-ui/frontend/src/services/model/{utils/time-base-class.ts => _clusterBase.ts} (80%) create mode 100644 dbm-ui/frontend/src/services/model/_dateTime.ts delete mode 100644 dbm-ui/frontend/src/services/model/db-resource/import-host.ts create mode 100644 dbm-ui/frontend/src/services/model/es/es-detail.ts create mode 100644 dbm-ui/frontend/src/services/model/hdfs/hdfs-detail.ts create mode 100644 dbm-ui/frontend/src/services/model/kafka/kafka-detail.ts rename dbm-ui/frontend/src/services/model/{mongodb-permission => mongodb}/mongodb-permission-account.ts (84%) rename dbm-ui/frontend/src/services/model/{mysql-permisson => mysql}/mysql-permission-account.ts (84%) rename dbm-ui/frontend/src/services/model/{mysql-cluster => mysql}/remote-pair-instance.ts (100%) create mode 100644 dbm-ui/frontend/src/services/model/mysql/tendbha-detail.ts create mode 100644 dbm-ui/frontend/src/services/model/mysql/tendbsingle-detail.ts create mode 100644 dbm-ui/frontend/src/services/model/redis/redis-detail.ts create mode 100644 dbm-ui/frontend/src/services/model/riak/riak-detail.ts delete mode 100644 dbm-ui/frontend/src/services/model/spider/spider.ts delete mode 100644 dbm-ui/frontend/src/services/model/sqlserver/sqlserver-ha-cluster-detail.ts create mode 100644 dbm-ui/frontend/src/services/model/sqlserver/sqlserver-ha-detail.ts rename dbm-ui/frontend/src/services/model/sqlserver/{sqlserver-ha-cluster.ts => sqlserver-ha.ts} (84%) rename dbm-ui/frontend/src/services/model/{sqlserver-permission => sqlserver}/sqlserver-permission-account.ts (100%) delete mode 100644 dbm-ui/frontend/src/services/model/sqlserver/sqlserver-single-cluster-detail.ts create mode 100644 dbm-ui/frontend/src/services/model/sqlserver/sqlserver-single-detail.ts rename dbm-ui/frontend/src/services/model/sqlserver/{sqlserver-single-cluster.ts => sqlserver-single.ts} (87%) create mode 100644 dbm-ui/frontend/src/services/model/tendbcluster/tendbcluster-detail.ts rename dbm-ui/frontend/src/services/model/{spider/tendbInstance.ts => tendbcluster/tendbcluster-instance.ts} (63%) rename dbm-ui/frontend/src/services/model/{spider/spiderMachine.ts => tendbcluster/tendbcluster-machine.ts} (100%) rename dbm-ui/frontend/src/services/model/{spider/tendbCluster.ts => tendbcluster/tendbcluster.ts} (87%) delete mode 100644 dbm-ui/frontend/src/services/source/spider.ts create mode 100644 dbm-ui/frontend/src/services/source/tendbcluster.ts create mode 100644 dbm-ui/frontend/src/services/types/db/clusterEntryDetail.ts create mode 100644 dbm-ui/frontend/src/services/types/db/clusterListEntry.ts create mode 100644 dbm-ui/frontend/src/services/types/db/clusterListNode.ts create mode 100644 dbm-ui/frontend/src/services/types/db/clusterListOperation.ts create mode 100644 dbm-ui/frontend/src/services/types/db/clusterListSpec.ts create mode 100644 dbm-ui/frontend/src/services/types/db/index.ts create mode 100644 dbm-ui/frontend/src/services/types/db/instanceListOperation.ts create mode 100644 dbm-ui/frontend/src/services/types/db/instanceListSpecConfig.ts create mode 100644 dbm-ui/frontend/src/services/types/db/instanceRelatedCluster.ts rename dbm-ui/frontend/src/services/types/{hostDetails.ts => hostInfo.ts} (90%) rename dbm-ui/frontend/src/services/types/{clusters.ts => instanceInfos.ts} (96%) diff --git a/dbm-ui/frontend/src/components/cluster-selector/Index.vue b/dbm-ui/frontend/src/components/cluster-selector/Index.vue index b4b1491a24..f81c20213d 100644 --- a/dbm-ui/frontend/src/components/cluster-selector/Index.vue +++ b/dbm-ui/frontend/src/components/cluster-selector/Index.vue @@ -123,11 +123,11 @@ T extends | RedisModel | TendbhaModel - | SpiderModel + | TendbclusterModel | TendbsingleModel | MongodbModel - | SqlServerHaClusterModel - | SqlServerSingleClusterModel + | SqlServerHaModel + | SqlServerSingleModel "> import _ from 'lodash'; import { useI18n } from 'vue-i18n'; @@ -136,14 +136,14 @@ import TendbhaModel from '@services/model/mysql/tendbha'; import TendbsingleModel from '@services/model/mysql/tendbsingle'; import RedisModel from '@services/model/redis/redis'; - import SpiderModel from '@services/model/spider/tendbCluster'; - import SqlServerHaClusterModel from '@services/model/sqlserver/sqlserver-ha-cluster'; - import SqlServerSingleClusterModel from '@services/model/sqlserver/sqlserver-single-cluster'; + import SqlServerHaModel from '@services/model/sqlserver/sqlserver-ha'; + import SqlServerSingleModel from '@services/model/sqlserver/sqlserver-single'; + import TendbclusterModel from '@services/model/tendbcluster/tendbcluster'; import { getMongoList } from '@services/source/mongodb'; import { getRedisList } from '@services/source/redis'; - import { getSpiderList } from '@services/source/spider'; import { getHaClusterList } from '@services/source/sqlserveHaCluster'; import { getSingleClusterList } from '@services/source/sqlserverSingleCluster'; + import { getTendbClusterList } from '@services/source/tendbcluster'; import { getTendbhaList, getTendbhaSalveList } from '@services/source/tendbha'; import { getTendbsingleList } from '@services/source/tendbsingle'; import type { ListBase } from '@services/types'; @@ -229,7 +229,7 @@ }, ], multiple: true, - getResourceList: getSpiderList, + getResourceList: getTendbClusterList, tableContent: SpiderTable, resultContent: ResultPreview, }, diff --git a/dbm-ui/frontend/src/components/cluster-selector/components/sqlserver-ha/Index.vue b/dbm-ui/frontend/src/components/cluster-selector/components/sqlserver-ha/Index.vue index 56bf9110b7..fb1517b695 100644 --- a/dbm-ui/frontend/src/components/cluster-selector/components/sqlserver-ha/Index.vue +++ b/dbm-ui/frontend/src/components/cluster-selector/components/sqlserver-ha/Index.vue @@ -44,8 +44,8 @@ import { shallowRef } from 'vue'; import { useI18n } from 'vue-i18n'; - import SqlServerHaClusterModel from '@services/model/sqlserver/sqlserver-ha-cluster'; - import SqlServerSingleClusterModel from '@services/model/sqlserver/sqlserver-single-cluster'; + import SqlServerHaModel from '@services/model/sqlserver/sqlserver-ha'; + import SqlServerSingleModel from '@services/model/sqlserver/sqlserver-single'; import { useLinkQueryColumnSerach } from '@hooks'; @@ -63,7 +63,7 @@ interface Props { activeTab: ClusterTypes, - selected: Record, + selected: Record, getResourceList: NonNullable, disabledRowConfig: NonNullable, columnStatusFilter?: TabItem['columnStatusFilter'], diff --git a/dbm-ui/frontend/src/components/cluster-selector/components/sqlserver-single/Index.vue b/dbm-ui/frontend/src/components/cluster-selector/components/sqlserver-single/Index.vue index 75f0f41f62..ddaf0be209 100644 --- a/dbm-ui/frontend/src/components/cluster-selector/components/sqlserver-single/Index.vue +++ b/dbm-ui/frontend/src/components/cluster-selector/components/sqlserver-single/Index.vue @@ -44,8 +44,8 @@ import { shallowRef } from 'vue'; import { useI18n } from 'vue-i18n'; - import SqlServerHaClusterModel from '@services/model/sqlserver/sqlserver-ha-cluster'; - import SqlServerSingleClusterModel from '@services/model/sqlserver/sqlserver-single-cluster'; + import SqlServerHaModel from '@services/model/sqlserver/sqlserver-ha'; + import SqlServerSingleModel from '@services/model/sqlserver/sqlserver-single'; import { useLinkQueryColumnSerach } from '@hooks'; @@ -63,7 +63,7 @@ interface Props { activeTab: ClusterTypes, - selected: Record, + selected: Record, getResourceList: NonNullable, disabledRowConfig: NonNullable, columnStatusFilter?: TabItem['columnStatusFilter'], diff --git a/dbm-ui/frontend/src/components/instance-selector/Index.vue b/dbm-ui/frontend/src/components/instance-selector/Index.vue index 4add7352cc..35229067e3 100644 --- a/dbm-ui/frontend/src/components/instance-selector/Index.vue +++ b/dbm-ui/frontend/src/components/instance-selector/Index.vue @@ -95,7 +95,7 @@ -