From 873b2efef696148701eb5f2e96b8e9ed63e2e308 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 26 Sep 2024 15:32:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(frontend):=20sqlserver=20=E9=9B=86=E7=BE=A4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90=E8=A1=A5=E5=85=A8=20#7147?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/frontend/package.json                  |  2 +-
 .../src/components/db-table/index.vue         |  1 +
 .../src/services/source/sqlserveHaCluster.ts  | 10 +++++++--
 .../services/source/sqlserverSingleCluster.ts |  4 +++-
 .../common/sql-execute/cluster-ids/Index.vue  | 19 ++++++++--------
 .../execute-objects/RenderData/Row.vue        | 22 +++++++++----------
 .../ha-cluster-list/components/List.vue       |  7 ++++--
 .../single-cluster/components/List.vue        |  7 ++++--
 8 files changed, 43 insertions(+), 29 deletions(-)

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<ListBase<SqlServerHaModel[]>>(`${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<ListBase<SqlServerSingleModel[]>>(`${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" />
   </div>
 </template>
-<script lang="tsx">
-  export interface IClusterData {
-    id: number;
-    cluster_name: string;
-    status: string;
-    major_version: string;
-    master_domain: string;
-    cluster_type: string;
-  }
-</script>
 <script setup lang="tsx">
   import _ from 'lodash';
   import { useI18n } from 'vue-i18n';
@@ -65,6 +55,15 @@
   import ClusterSelector from '@components/cluster-selector/Index.vue';
   import RenderClusterStatus from '@components/cluster-status/Index.vue';
 
+  interface IClusterData {
+    id: number;
+    cluster_name: string;
+    status: string;
+    major_version: string;
+    master_domain: string;
+    cluster_type: string;
+  }
+
   interface Props {
     clusterTypeList: ClusterTypes[]
   }
diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue
index 9b16564b27..91e07e8350 100644
--- a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue
+++ b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue
@@ -30,7 +30,7 @@
         <RenderSql
           ref="sqlFielsRef"
           v-model="localSqlFiles"
-          v-model:importMode="localImportMode"
+          v-model:import-mode="localImportMode"
           :cluster-version-list="clusterVersionList"
           :db-names="localDbnames"
           :ignore-db-names="localIgnoreDbnames" />
@@ -63,16 +63,6 @@
     import_mode: ComponentProps<typeof RenderSql>['importMode'];
   }
 
-  // 创建表格数据
-  export const createRowData = (data = {} as Partial<IDataRow>) => ({
-    rowKey: random(),
-    dbnames: data.dbnames || [],
-    ignore_dbnames: data.ignore_dbnames || [],
-    sql_files: data.sql_files || [],
-    import_mode: data.import_mode || 'manual',
-  });
-</script>
-<script setup lang="ts">
   interface Props {
     data: IDataRow;
     removeable: boolean;
@@ -87,6 +77,16 @@
     getValue: () => Promise<IDataRow>;
   }
 
+  // 创建表格数据
+  export const createRowData = (data = {} as Partial<IDataRow>) => ({
+    rowKey: random(),
+    dbnames: data.dbnames || [],
+    ignore_dbnames: data.ignore_dbnames || [],
+    sql_files: data.sql_files || [],
+    import_mode: data.import_mode || 'manual',
+  });
+</script>
+<script setup lang="ts">
   const props = defineProps<Props>();
 
   const emits = defineEmits<Emits>();
diff --git a/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-cluster-list/components/List.vue b/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-cluster-list/components/List.vue
index 254253165e..65ba35e645 100644
--- a/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-cluster-list/components/List.vue
+++ b/dbm-ui/frontend/src/views/db-manage/sqlserver/ha-cluster-list/components/List.vue
@@ -350,12 +350,15 @@
         <TextOverflowLayout>
           {{
             default: () => (
-              <bk-button
+              <auth-button
+                action-id="sqlserver_view"
+                permission={data.permission.sqlserver_view}
+                resource-id={data.id}
                 text
                 theme="primary"
                 onClick={() => handleToDetails(data)}>
                 {data.masterDomainDisplayName}
-              </bk-button>
+              </auth-button>
             ),
             append: () => (
               <>
diff --git a/dbm-ui/frontend/src/views/db-manage/sqlserver/single-cluster/components/List.vue b/dbm-ui/frontend/src/views/db-manage/sqlserver/single-cluster/components/List.vue
index 93723891c0..2c27372a0e 100644
--- a/dbm-ui/frontend/src/views/db-manage/sqlserver/single-cluster/components/List.vue
+++ b/dbm-ui/frontend/src/views/db-manage/sqlserver/single-cluster/components/List.vue
@@ -320,12 +320,15 @@
         <TextOverflowLayout>
           {{
             default: () => (
-              <bk-button
+              <auth-button
+                action-id="sqlserver_view"
+                permission={data.permission.sqlserver_view}
+                resource-id={data.id}
                 text
                 theme="primary"
                 onClick={() => handleToDetails(data)}>
                 {data.master_domain}
-              </bk-button>
+              </auth-button>
             ),
             append: () => (
               <>