diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json index 1ba0f12229..fd63b014ad 100644 --- a/dbm-ui/frontend/package.json +++ b/dbm-ui/frontend/package.json @@ -27,7 +27,7 @@ "@icon-cool/bk-icon-bk-biz-components": "0.0.4", "@vueuse/core": "^11.0.3", "axios": "^1.7.7", - "bkui-vue": "2.0.1-beta.69", + "bkui-vue": "2.0.1-beta.72", "date-fns": "3.6.0", "dayjs": "^1.11.13", "html-to-image": "1.11.11", diff --git a/dbm-ui/frontend/src/components/db-table/index.vue b/dbm-ui/frontend/src/components/db-table/index.vue index f93d11c627..4f8a4b61e8 100644 --- a/dbm-ui/frontend/src/components/db-table/index.vue +++ b/dbm-ui/frontend/src/components/db-table/index.vue @@ -323,6 +323,7 @@ props.dataSource(params, payload) .then((data) => { tableData.value = data; + console.log('tabledata = ', data); pagination.count = data.count; isSearching.value = getSearchingStatus(); isAnomalies.value = false; diff --git a/dbm-ui/frontend/src/services/source/sqlserveHaCluster.ts b/dbm-ui/frontend/src/services/source/sqlserveHaCluster.ts index 912f0beaa2..92743e5f00 100644 --- a/dbm-ui/frontend/src/services/source/sqlserveHaCluster.ts +++ b/dbm-ui/frontend/src/services/source/sqlserveHaCluster.ts @@ -30,7 +30,9 @@ const path = `/apis/sqlserver/bizs/${currentBizId}/sqlserver_ha_resources`; export function getHaClusterList(params: { limit?: number; offset?: number; sys_mode?: 'mirrorin' | 'always_on' }) { return http.get>(`${path}/`, params).then((data) => ({ ...data, - results: data.results.map((item) => new SqlServerHaModel(item)), + results: data.results.map( + (item) => new SqlServerHaModel(Object.assign({}, item, Object.assign(item.permission, data.permission))), + ), })); } @@ -43,7 +45,11 @@ export function getHaClusterWholeList() { limit: -1, offset: 0, }) - .then((data) => data.results.map((item) => new SqlServerHaModel(item))); + .then((data) => + data.results.map( + (item) => new SqlServerHaModel(Object.assign({}, item, Object.assign(item.permission, data.permission))), + ), + ); } /** diff --git a/dbm-ui/frontend/src/services/source/sqlserverSingleCluster.ts b/dbm-ui/frontend/src/services/source/sqlserverSingleCluster.ts index 7bb67e775c..b31e834ee7 100644 --- a/dbm-ui/frontend/src/services/source/sqlserverSingleCluster.ts +++ b/dbm-ui/frontend/src/services/source/sqlserverSingleCluster.ts @@ -26,7 +26,9 @@ const getPath = () => `/apis/sqlserver/bizs/${window.PROJECT_CONFIG.BIZ_ID}/sqls export function getSingleClusterList(params: { limit?: number; offset?: number }) { return http.get>(`${getPath()}/`, params).then((data) => ({ ...data, - results: data.results.map((item) => new SqlServerSingleModel(item)), + results: data.results.map( + (item) => new SqlServerSingleModel(Object.assign({}, item, Object.assign(item.permission, data.permission))), + ), })); } diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue index 5dc4926eff..657a79bee4 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue @@ -42,16 +42,6 @@ @change="handelClusterChange" /> - - +