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 1/3] =?UTF-8?q?fix(frontend):=20sqlserver=20=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90=E8=A1=A5=E5=85=A8?=
 =?UTF-8?q?=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: () => (
               <>

From 63df64395ce1ba53631887c310fb9c0a3bfc5b3a Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 26 Sep 2024 16:15:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(frontend):=20sqlserver=20=E6=96=B0?=
 =?UTF-8?q?=E6=9C=BA=E9=87=8D=E5=BB=BA=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=20#7149?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/demand-factory/sqlserver/RestoreSlave.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/sqlserver/RestoreSlave.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/sqlserver/RestoreSlave.vue
index 215a161326..6a3bcb6c6b 100644
--- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/sqlserver/RestoreSlave.vue
+++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/sqlserver/RestoreSlave.vue
@@ -14,7 +14,7 @@
 <template>
   <BkTable :data="ticketDetails.details.infos">
     <BkTableColumn
-      field="new_slave_host.ip"
+      field="old_slave_host.ip"
       :label="t('待重建从库主机')" />
     <BkTableColumn
       field="new_cluster_name"
@@ -29,7 +29,7 @@
       </template>
     </BkTableColumn>
     <BkTableColumn
-      field="old_slave_host.ip"
+      field="new_slave_host.ip"
       :label="t('新从库主机')" />
   </BkTable>
 </template>

From 7bcbba864daf4d4b8a038c2a7c9f98eab0172e77 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 26 Sep 2024 17:27:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(frontend):=20=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=96=B0=E5=BB=BA=E8=B4=A6=E5=8F=B7=E5=90=8D?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99=20#7151=20#=20Reviewed,=20?=
 =?UTF-8?q?transaction=20id:=2019498?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/frontend/.prettierignore               |   3 +
 .../frontend/src/services/source/ticket.tsx   |   2 +
 dbm-ui/frontend/src/types/auto-imports.d.ts   | 138 +++---
 .../sql-execute/common/RenderSql/Index.vue    |   2 +-
 .../RenderData/Row.vue                        |   8 +-
 .../components/CreateAccountDialog.vue        |   6 +-
 .../components/AccountDialog.vue              |   8 +-
 .../components/sql-file/local-file/Index.vue  | 412 ------------------
 .../permission/components/AccountDialog.vue   |   8 +-
 .../components/AddAccountDialog.vue           |   8 +-
 10 files changed, 92 insertions(+), 503 deletions(-)
 create mode 100644 dbm-ui/frontend/.prettierignore
 delete mode 100644 dbm-ui/frontend/src/views/db-manage/mysql/sql-execute/steps/step1/components/sql-file/local-file/Index.vue

diff --git a/dbm-ui/frontend/.prettierignore b/dbm-ui/frontend/.prettierignore
new file mode 100644
index 0000000000..b1e3b23119
--- /dev/null
+++ b/dbm-ui/frontend/.prettierignore
@@ -0,0 +1,3 @@
+node_modules
+dist
+src/types/auto-imports.d.ts
\ No newline at end of file
diff --git a/dbm-ui/frontend/src/services/source/ticket.tsx b/dbm-ui/frontend/src/services/source/ticket.tsx
index 00f137dec2..a83d0f08c3 100644
--- a/dbm-ui/frontend/src/services/source/ticket.tsx
+++ b/dbm-ui/frontend/src/services/source/ticket.tsx
@@ -64,6 +64,8 @@ export function createTicket(formData: Record<string, any>) {
         const id = data.duplicate_ticket_id;
         const router = getRouter();
 
+        console.log('router = ', router);
+
         const route = router.resolve({
           name: 'bizTicketManage',
           query: {
diff --git a/dbm-ui/frontend/src/types/auto-imports.d.ts b/dbm-ui/frontend/src/types/auto-imports.d.ts
index 6bc2ae2a45..7021ac5101 100644
--- a/dbm-ui/frontend/src/types/auto-imports.d.ts
+++ b/dbm-ui/frontend/src/types/auto-imports.d.ts
@@ -6,83 +6,71 @@
 // biome-ignore lint: disable
 export {}
 declare global {
-  const EffectScope: (typeof import('vue'))['EffectScope'];
-  const computed: (typeof import('vue'))['computed'];
-  const createApp: (typeof import('vue'))['createApp'];
-  const customRef: (typeof import('vue'))['customRef'];
-  const defineAsyncComponent: (typeof import('vue'))['defineAsyncComponent'];
-  const defineComponent: (typeof import('vue'))['defineComponent'];
-  const effectScope: (typeof import('vue'))['effectScope'];
-  const getCurrentInstance: (typeof import('vue'))['getCurrentInstance'];
-  const getCurrentScope: (typeof import('vue'))['getCurrentScope'];
-  const h: (typeof import('vue'))['h'];
-  const inject: (typeof import('vue'))['inject'];
-  const isProxy: (typeof import('vue'))['isProxy'];
-  const isReactive: (typeof import('vue'))['isReactive'];
-  const isReadonly: (typeof import('vue'))['isReadonly'];
-  const isRef: (typeof import('vue'))['isRef'];
-  const markRaw: (typeof import('vue'))['markRaw'];
-  const nextTick: (typeof import('vue'))['nextTick'];
-  const onActivated: (typeof import('vue'))['onActivated'];
-  const onBeforeMount: (typeof import('vue'))['onBeforeMount'];
-  const onBeforeRouteLeave: (typeof import('vue-router'))['onBeforeRouteLeave'];
-  const onBeforeRouteUpdate: (typeof import('vue-router'))['onBeforeRouteUpdate'];
-  const onBeforeUnmount: (typeof import('vue'))['onBeforeUnmount'];
-  const onBeforeUpdate: (typeof import('vue'))['onBeforeUpdate'];
-  const onDeactivated: (typeof import('vue'))['onDeactivated'];
-  const onErrorCaptured: (typeof import('vue'))['onErrorCaptured'];
-  const onMounted: (typeof import('vue'))['onMounted'];
-  const onRenderTracked: (typeof import('vue'))['onRenderTracked'];
-  const onRenderTriggered: (typeof import('vue'))['onRenderTriggered'];
-  const onScopeDispose: (typeof import('vue'))['onScopeDispose'];
-  const onServerPrefetch: (typeof import('vue'))['onServerPrefetch'];
-  const onUnmounted: (typeof import('vue'))['onUnmounted'];
-  const onUpdated: (typeof import('vue'))['onUpdated'];
-  const onWatcherCleanup: (typeof import('vue'))['onWatcherCleanup'];
-  const provide: (typeof import('vue'))['provide'];
-  const reactive: (typeof import('vue'))['reactive'];
-  const readonly: (typeof import('vue'))['readonly'];
-  const ref: (typeof import('vue'))['ref'];
-  const resolveComponent: (typeof import('vue'))['resolveComponent'];
-  const shallowReactive: (typeof import('vue'))['shallowReactive'];
-  const shallowReadonly: (typeof import('vue'))['shallowReadonly'];
-  const shallowRef: (typeof import('vue'))['shallowRef'];
-  const toRaw: (typeof import('vue'))['toRaw'];
-  const toRef: (typeof import('vue'))['toRef'];
-  const toRefs: (typeof import('vue'))['toRefs'];
-  const toValue: (typeof import('vue'))['toValue'];
-  const triggerRef: (typeof import('vue'))['triggerRef'];
-  const unref: (typeof import('vue'))['unref'];
-  const useAttrs: (typeof import('vue'))['useAttrs'];
-  const useCssModule: (typeof import('vue'))['useCssModule'];
-  const useCssVars: (typeof import('vue'))['useCssVars'];
-  const useId: (typeof import('vue'))['useId'];
-  const useLink: (typeof import('vue-router'))['useLink'];
-  const useModel: (typeof import('vue'))['useModel'];
-  const useRoute: (typeof import('vue-router'))['useRoute'];
-  const useRouter: (typeof import('vue-router'))['useRouter'];
-  const useSlots: (typeof import('vue'))['useSlots'];
-  const useTemplateRef: (typeof import('vue'))['useTemplateRef'];
-  const watch: (typeof import('vue'))['watch'];
-  const watchEffect: (typeof import('vue'))['watchEffect'];
-  const watchPostEffect: (typeof import('vue'))['watchPostEffect'];
-  const watchSyncEffect: (typeof import('vue'))['watchSyncEffect'];
+  const EffectScope: typeof import('vue')['EffectScope']
+  const computed: typeof import('vue')['computed']
+  const createApp: typeof import('vue')['createApp']
+  const customRef: typeof import('vue')['customRef']
+  const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
+  const defineComponent: typeof import('vue')['defineComponent']
+  const effectScope: typeof import('vue')['effectScope']
+  const getCurrentInstance: typeof import('vue')['getCurrentInstance']
+  const getCurrentScope: typeof import('vue')['getCurrentScope']
+  const h: typeof import('vue')['h']
+  const inject: typeof import('vue')['inject']
+  const isProxy: typeof import('vue')['isProxy']
+  const isReactive: typeof import('vue')['isReactive']
+  const isReadonly: typeof import('vue')['isReadonly']
+  const isRef: typeof import('vue')['isRef']
+  const markRaw: typeof import('vue')['markRaw']
+  const nextTick: typeof import('vue')['nextTick']
+  const onActivated: typeof import('vue')['onActivated']
+  const onBeforeMount: typeof import('vue')['onBeforeMount']
+  const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave']
+  const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate']
+  const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
+  const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
+  const onDeactivated: typeof import('vue')['onDeactivated']
+  const onErrorCaptured: typeof import('vue')['onErrorCaptured']
+  const onMounted: typeof import('vue')['onMounted']
+  const onRenderTracked: typeof import('vue')['onRenderTracked']
+  const onRenderTriggered: typeof import('vue')['onRenderTriggered']
+  const onScopeDispose: typeof import('vue')['onScopeDispose']
+  const onServerPrefetch: typeof import('vue')['onServerPrefetch']
+  const onUnmounted: typeof import('vue')['onUnmounted']
+  const onUpdated: typeof import('vue')['onUpdated']
+  const onWatcherCleanup: typeof import('vue')['onWatcherCleanup']
+  const provide: typeof import('vue')['provide']
+  const reactive: typeof import('vue')['reactive']
+  const readonly: typeof import('vue')['readonly']
+  const ref: typeof import('vue')['ref']
+  const resolveComponent: typeof import('vue')['resolveComponent']
+  const shallowReactive: typeof import('vue')['shallowReactive']
+  const shallowReadonly: typeof import('vue')['shallowReadonly']
+  const shallowRef: typeof import('vue')['shallowRef']
+  const toRaw: typeof import('vue')['toRaw']
+  const toRef: typeof import('vue')['toRef']
+  const toRefs: typeof import('vue')['toRefs']
+  const toValue: typeof import('vue')['toValue']
+  const triggerRef: typeof import('vue')['triggerRef']
+  const unref: typeof import('vue')['unref']
+  const useAttrs: typeof import('vue')['useAttrs']
+  const useCssModule: typeof import('vue')['useCssModule']
+  const useCssVars: typeof import('vue')['useCssVars']
+  const useId: typeof import('vue')['useId']
+  const useLink: typeof import('vue-router')['useLink']
+  const useModel: typeof import('vue')['useModel']
+  const useRoute: typeof import('vue-router')['useRoute']
+  const useRouter: typeof import('vue-router')['useRouter']
+  const useSlots: typeof import('vue')['useSlots']
+  const useTemplateRef: typeof import('vue')['useTemplateRef']
+  const watch: typeof import('vue')['watch']
+  const watchEffect: typeof import('vue')['watchEffect']
+  const watchPostEffect: typeof import('vue')['watchPostEffect']
+  const watchSyncEffect: typeof import('vue')['watchSyncEffect']
 }
 // for type re-export
 declare global {
   // @ts-ignore
-  export type {
-    Component,
-    ComponentPublicInstance,
-    ComputedRef,
-    ExtractDefaultPropTypes,
-    ExtractPropTypes,
-    ExtractPublicPropTypes,
-    InjectionKey,
-    PropType,
-    Ref,
-    VNode,
-    WritableComputedRef,
-  } from 'vue';
-  import('vue');
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  import('vue')
 }
diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/Index.vue
index e8bbf98710..0d5a4d6c01 100644
--- a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/Index.vue
+++ b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/Index.vue
@@ -18,7 +18,7 @@
   </RenderTextPlain>
   <SqlContent
     v-model="modelValue"
-    v-model:importMode="importMode"
+    v-model:import-mode="importMode"
     v-model:is-show="isShowSql"
     :cluster-version-list="clusterVersionList">
     <template #header>
diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/sqlserver-execute-objects/RenderData/Row.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/sqlserver-execute-objects/RenderData/Row.vue
index f34312c5be..3ac07b0be6 100644
--- a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/sqlserver-execute-objects/RenderData/Row.vue
+++ b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/sqlserver-execute-objects/RenderData/Row.vue
@@ -29,7 +29,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" />
@@ -71,8 +71,7 @@
     sql_files: data.sql_files || [],
     import_mode: data.import_mode || 'manual',
   });
-</script>
-<script setup lang="ts">
+
   interface Props {
     data: IDataRow;
     removeable: boolean;
@@ -86,7 +85,8 @@
   interface Exposes {
     getValue: () => Promise<IDataRow>;
   }
-
+</script>
+<script setup lang="ts">
   const props = defineProps<Props>();
 
   const emits = defineEmits<Emits>();
diff --git a/dbm-ui/frontend/src/views/db-manage/mongodb/permission/components/CreateAccountDialog.vue b/dbm-ui/frontend/src/views/db-manage/mongodb/permission/components/CreateAccountDialog.vue
index b1b254db4a..d98291d0b3 100644
--- a/dbm-ui/frontend/src/views/db-manage/mongodb/permission/components/CreateAccountDialog.vue
+++ b/dbm-ui/frontend/src/views/db-manage/mongodb/permission/components/CreateAccountDialog.vue
@@ -19,7 +19,7 @@
     :is-show="isShow"
     :quick-close="false"
     :title="t('新建账号')"
-    :width="480"
+    :width="580"
     @closed="handleClose">
     <BkForm
       v-if="isShow"
@@ -41,7 +41,9 @@
           trigger="click">
           <BkInput
             v-model="formData.user"
-            :placeholder="t('格式为：(库名).（名称）_如 admin.linda')" />
+            :maxlength="32"
+            :placeholder="t('格式为：(库名).（名称）_如 admin.linda')"
+            show-word-limit />
         </BkPopover>
         <p style="color: #ff9c01">
           {{ t('账号创建后，不支持修改。') }}
diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/permission-rule/components/AccountDialog.vue b/dbm-ui/frontend/src/views/db-manage/mysql/permission-rule/components/AccountDialog.vue
index 6fbe9b4b2b..57bfe405e1 100644
--- a/dbm-ui/frontend/src/views/db-manage/mysql/permission-rule/components/AccountDialog.vue
+++ b/dbm-ui/frontend/src/views/db-manage/mysql/permission-rule/components/AccountDialog.vue
@@ -19,7 +19,7 @@
     :is-show="isShow"
     :quick-close="false"
     :title="t('新建账号')"
-    :width="480"
+    :width="580"
     @closed="handleClose">
     <BkForm
       v-if="isShow"
@@ -40,7 +40,9 @@
             theme: 'light',
             content: userPlaceholder,
           }"
-          :placeholder="userPlaceholder" />
+          :maxlength="32"
+          :placeholder="userPlaceholder"
+          show-word-limit />
         <p style="color: #ff9c01">
           {{ t('账号创建后，不支持修改。') }}
         </p>
@@ -224,7 +226,7 @@
       {
         trigger: 'change',
         message: userPlaceholder,
-        validator: (value: string) => /^[a-zA-Z0-9][a-zA-Z0-9-_.]*$/g.test(value),
+        validator: (value: string) => /^[a-zA-Z0-9][a-zA-Z0-9-_.]{0,31}$/.test(value),
       },
     ],
     password: [
diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/sql-execute/steps/step1/components/sql-file/local-file/Index.vue b/dbm-ui/frontend/src/views/db-manage/mysql/sql-execute/steps/step1/components/sql-file/local-file/Index.vue
deleted file mode 100644
index f25e82ddfa..0000000000
--- a/dbm-ui/frontend/src/views/db-manage/mysql/sql-execute/steps/step1/components/sql-file/local-file/Index.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-<!--
- * TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-DB管理系统(BlueKing-BK-DBM) available.
- *
- * Copyright (C) 2017-2023 THL A29 Limited, a Tencent company. All rights reserved.
- *
- * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License athttps://opensource.org/licenses/MIT
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- * the specific language governing permissions and limitations under the License.
--->
-
-<template>
-  <BkFormItem
-    :label="t('SQL文件')"
-    property="execute_sql_files"
-    required
-    :rules="rules">
-    <template #labelAppend>
-      <span style="font-size: 12px; font-weight: normal; color: #8a8f99">
-        （{{ t('最终执行结果以SQL文件内容为准') }}）
-      </span>
-    </template>
-    <div class="sql-execute-local-file">
-      <div style="margin-bottom: 16px">
-        <BkButton @click="handleSelectLocalFile">
-          <DbIcon
-            style="margin-right: 3px"
-            type="add" />
-          <span>{{ t('添加文件') }}</span>
-        </BkButton>
-        <span style="margin-left: 12px; font-size: 12px; color: #8a8f99">
-          {{
-            t(
-              '仅支持_sql文件_文件名不能包含空格_上传后_SQL执行顺序默认为从上至下_可拖动文件位置_变换文件的执行顺序文件',
-            )
-          }}
-        </span>
-      </div>
-      <div
-        v-if="uploadFileNameList.length > 0"
-        class="editor-layout">
-        <div class="editor-layout-left">
-          <RenderFileList
-            v-model="selectFileName"
-            :data="uploadFileNameList"
-            :file-data="uploadFileDataMap"
-            @remove="handleRemove"
-            @sort="handleFileSortChange" />
-        </div>
-        <div class="editor-layout-right">
-          <BkLoading
-            class="content-loading"
-            :loading="currentSelectFileData.isUploading || isContentLoading">
-            <Editor
-              :message-list="currentSelectFileData.messageList"
-              :model-value="currentSelectFileData.content"
-              readonly
-              :title="selectFileName" />
-            <CheckSuccess
-              v-if="currentSelectFileData.messageList.length < 1 && !currentSelectFileData.isCheckFailded" />
-            <CheckError :data="currentSelectFileData" />
-          </BkLoading>
-        </div>
-      </div>
-      <input
-        ref="uploadRef"
-        accept=".sql"
-        multiple
-        style="position: absolute; width: 0; height: 0"
-        type="file"
-        @change="handleStartUpdate" />
-    </div>
-  </BkFormItem>
-</template>
-<script setup lang="ts">
-  import _ from 'lodash';
-  import { computed, onActivated, onDeactivated, ref } from 'vue';
-  import { useI18n } from 'vue-i18n';
-
-  import { grammarCheck } from '@services/source/mysqlSqlImport';
-  import { getFileContent } from '@services/source/storage';
-
-  import { getSQLFilename } from '@utils';
-
-  import { updateFilePath } from '../../../Index.vue';
-  import Editor from '../editor/Index.vue';
-
-  import CheckError from './components/CheckError.vue';
-  import CheckSuccess from './components/CheckSuccess.vue';
-  import RenderFileList, { createFileData, type IFileData } from './components/FileList.vue';
-
-  interface Props {
-    modelValue: string[];
-  }
-
-  interface Emits {
-    (e: 'change', value: string[]): void;
-    (e: 'grammar-check', doCheck: boolean, checkPass: boolean): void;
-  }
-
-  const props = defineProps<Props>();
-  const emits = defineEmits<Emits>();
-
-  const { t } = useI18n();
-
-  let isKeepAliveActive = false;
-
-  const isContentLoading = ref(false);
-  const uploadRef = ref();
-  const selectFileName = ref('');
-  const uploadFileNameList = shallowRef<Array<string>>([]);
-  const uploadFileDataMap = shallowRef<Record<string, IFileData>>({});
-
-  // 当前选择文件数据
-  const currentSelectFileData = computed(() => uploadFileDataMap.value[selectFileName.value]);
-
-  const rules = [
-    {
-      validator: () => {
-        if (!isKeepAliveActive) {
-          return true;
-        }
-        const uploadFileDataList = Object.values(uploadFileDataMap.value);
-        for (let i = 0; i < uploadFileDataList.length; i++) {
-          const { isUploadFailed, isCheckFailded } = uploadFileDataList[i];
-          if (isUploadFailed) {
-            return false;
-          }
-          if (isCheckFailded) {
-            return false;
-          }
-        }
-        return true;
-      },
-      message: t('SQL文件无效'),
-      trigger: 'change',
-    },
-  ];
-
-  // 文件结果
-  const getResultValue = () =>
-    uploadFileNameList.value.map((localFileName) => uploadFileDataMap.value[localFileName].realFilePath);
-
-  // 获取文件内容
-  const fetchFileContent = (fileName: string) => {
-    if (!updateFilePath.value) {
-      return;
-    }
-    isContentLoading.value = true;
-    const fileDataMap = { ...uploadFileDataMap.value };
-    getFileContent({
-      file_path: `${updateFilePath.value}/${fileName}`,
-    })
-      .then((data) => {
-        fileDataMap[getSQLFilename(fileName)].content = data.content;
-        uploadFileDataMap.value = fileDataMap;
-      })
-      .finally(() => {
-        isContentLoading.value = false;
-      });
-  };
-
-  let isInnerChange = false;
-
-  // 同步外部值
-  watch(
-    () => props.modelValue,
-    () => {
-      if (isInnerChange) {
-        isInnerChange = false;
-        return;
-      }
-      if (props.modelValue.length < 1) {
-        return;
-      }
-      const localFileNameList = [] as string[];
-      const filePathMap = {} as Record<string, string>;
-
-      props.modelValue.forEach((filePath: string) => {
-        // 本地 SQL 文件上传后会拼接随机数前缀，需要解析正确的文件名
-        const localFileName = getSQLFilename(filePath);
-        localFileNameList.push(localFileName);
-        filePathMap[localFileName] = filePath;
-      });
-
-      uploadFileNameList.value = localFileNameList;
-
-      uploadFileDataMap.value = uploadFileNameList.value.reduce(
-        (result, localFileName) => ({
-          ...result,
-          [localFileName]: createFileData({
-            isSuccess: true,
-            isCheckFailded: false,
-            realFilePath: filePathMap[localFileName],
-          }),
-        }),
-        {} as Record<string, IFileData>,
-      );
-
-      // 默认选中第一个文件
-      [selectFileName.value] = uploadFileNameList.value;
-      if (props.modelValue.length > 0) {
-        fetchFileContent(uploadFileDataMap.value[selectFileName.value].realFilePath);
-      }
-    },
-    {
-      immediate: true,
-    },
-  );
-
-  watch(
-    selectFileName,
-    () => {
-      // 编辑状态不需要 SQL 文件检测，需要异步获取文件内容
-      if (
-        !selectFileName.value ||
-        uploadFileDataMap.value[selectFileName.value].content ||
-        uploadFileDataMap.value[selectFileName.value].grammarCheck
-      ) {
-        return;
-      }
-      fetchFileContent(uploadFileDataMap.value[selectFileName.value].realFilePath);
-    },
-    {
-      immediate: true,
-    },
-  );
-
-  const triggerChange = () => {
-    const uploadFileDataList = Object.values(uploadFileDataMap.value);
-    for (let i = 0; i < uploadFileDataList.length; i++) {
-      const { isUploadFailed, isCheckFailded } = uploadFileDataList[i];
-      if (isUploadFailed || isCheckFailded) {
-        emits('grammar-check', false, false);
-        return;
-      }
-    }
-    emits('grammar-check', true, true);
-    isInnerChange = true;
-    emits('change', getResultValue());
-  };
-
-  // 开始选择本地文件
-  const handleSelectLocalFile = () => {
-    uploadRef.value.click();
-  };
-
-  // 开始上传本地文件
-  const handleStartUpdate = (event: Event) => {
-    const { files = [] } = event.target as HTMLInputElement;
-    if (!files) {
-      return;
-    }
-    const fileNameList: Array<string> = [];
-    const currentFileDataMap = {} as Record<string, IFileData>;
-    const params = new FormData();
-
-    Array.from(files).forEach((curFile) => {
-      fileNameList.push(curFile.name);
-      currentFileDataMap[curFile.name] = createFileData({
-        file: curFile,
-        isUploading: true,
-      });
-
-      // 上传文件大小限制 1GB (1024 * 1024 * 1024 = 1073741824)
-      if (curFile.size > 1073741824) {
-        currentFileDataMap[curFile.name] = {
-          ...currentFileDataMap[curFile.name],
-          realFilePath: '/',
-          isSuccess: true,
-          content: '--',
-          messageList: [],
-          isCheckFailded: true,
-          isUploadFailed: true,
-          isUploading: false,
-          uploadErrorMessage: t('文件上传失败——文件大小超过限制（最大为1GB）'),
-          grammarCheck: undefined,
-        };
-        return;
-      }
-      params.append('sql_files', curFile);
-    });
-
-    uploadFileNameList.value = _.uniq([...uploadFileNameList.value, ...fileNameList]);
-    uploadFileDataMap.value = {
-      ...uploadFileDataMap.value,
-      ...currentFileDataMap,
-    };
-
-    if (!selectFileName.value || !uploadFileDataMap.value[selectFileName.value]) {
-      const [firstFileName] = fileNameList;
-      selectFileName.value = firstFileName;
-    }
-
-    grammarCheck(params)
-      .then((data) => {
-        const lastUploadFileDataMap = { ...uploadFileDataMap.value };
-        Object.keys(data).forEach((realFilePath) => {
-          const grammarCheckResult = data[realFilePath];
-          lastUploadFileDataMap[grammarCheckResult.raw_file_name] = {
-            ...lastUploadFileDataMap[grammarCheckResult.raw_file_name],
-            realFilePath,
-            isSuccess: true,
-            content: grammarCheckResult.content,
-            messageList: grammarCheckResult.messageList,
-            isCheckFailded: grammarCheckResult.isError,
-            grammarCheck: grammarCheckResult,
-          };
-        });
-        uploadFileDataMap.value = lastUploadFileDataMap;
-        triggerChange();
-      })
-      .catch(() => {
-        const lastUploadFileDataMap = { ...uploadFileDataMap.value };
-        fileNameList.forEach((fileName) => {
-          lastUploadFileDataMap[fileName] = {
-            ...lastUploadFileDataMap[fileName],
-            isUploadFailed: true,
-          };
-        });
-        uploadFileDataMap.value = lastUploadFileDataMap;
-        emits('grammar-check', false, false);
-      })
-      .finally(() => {
-        const lastUploadFileDataMap = { ...uploadFileDataMap.value };
-        fileNameList.forEach((fileName) => {
-          lastUploadFileDataMap[fileName] = {
-            ...lastUploadFileDataMap[fileName],
-            isUploading: false,
-          };
-        });
-        uploadFileDataMap.value = lastUploadFileDataMap;
-
-        console.log('lastUploadFileDataMap = ', lastUploadFileDataMap);
-      });
-  };
-  // 文件排序
-  const handleFileSortChange = (list: string[]) => {
-    uploadFileNameList.value = list;
-    triggerChange();
-  };
-  // 删除文件
-  const handleRemove = (fileName: string, index: number) => {
-    const fileList = [...uploadFileNameList.value];
-    const lastUploadFileDataMap = { ...uploadFileDataMap.value };
-
-    fileList.splice(index, 1);
-    uploadFileNameList.value = fileList;
-    delete lastUploadFileDataMap[fileName];
-    uploadFileDataMap.value = lastUploadFileDataMap;
-
-    if (fileName === selectFileName.value && fileList.length > 0) {
-      [selectFileName.value] = fileList;
-    }
-    triggerChange();
-  };
-
-  onActivated(() => {
-    isKeepAliveActive = true;
-    triggerChange();
-  });
-
-  onDeactivated(() => {
-    isKeepAliveActive = false;
-  });
-</script>
-<style lang="less">
-  .sql-execute-local-file {
-    .label-tips {
-      position: absolute;
-      top: 0;
-      padding-left: 16px;
-      font-weight: normal;
-      color: @gray-color;
-    }
-
-    .editor-layout {
-      display: flex;
-      height: 500px;
-      background: #2e2e2e;
-
-      .editor-layout-left {
-        width: 238px;
-      }
-
-      .editor-layout-right {
-        position: relative;
-        height: 100%;
-        flex: 1;
-
-        .editor-error-tips {
-          position: absolute;
-          right: 0;
-          bottom: 0;
-          left: 0;
-          padding-left: 16px;
-          background: #212121;
-          border-left: 4px solid #b34747;
-          border-radius: 0 0 2px 2px;
-        }
-
-        .content-loading {
-          .bk-loading-mask {
-            background: transparent !important;
-          }
-        }
-      }
-    }
-  }
-</style>
diff --git a/dbm-ui/frontend/src/views/db-manage/sqlserver/permission/components/AccountDialog.vue b/dbm-ui/frontend/src/views/db-manage/sqlserver/permission/components/AccountDialog.vue
index 68992d9ab7..be531bb09e 100644
--- a/dbm-ui/frontend/src/views/db-manage/sqlserver/permission/components/AccountDialog.vue
+++ b/dbm-ui/frontend/src/views/db-manage/sqlserver/permission/components/AccountDialog.vue
@@ -6,7 +6,7 @@
     :is-show="accountDialogIsShow"
     :quick-close="false"
     :title="t('新建账号')"
-    :width="480"
+    :width="580"
     @closed="handleClose">
     <BkForm
       v-if="accountDialogIsShow"
@@ -27,7 +27,9 @@
             theme: 'light',
             content: userPlaceholder,
           }"
-          :placeholder="userPlaceholder" />
+          :maxlength="32"
+          :placeholder="userPlaceholder"
+          show-word-limit />
         <p style="color: #ff9c01">
           {{ t('账号创建后，不支持修改。') }}
         </p>
@@ -185,7 +187,7 @@
       {
         trigger: 'change',
         message: userPlaceholder,
-        validator: (value: string) => /^[a-z0-9][a-z0-9-_.]*$/g.test(value),
+        validator: (value: string) => /^[a-zA-Z0-9][a-zA-Z0-9-_.]{0,31}$/.test(value),
       },
     ],
     password: [
diff --git a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/permission/components/AddAccountDialog.vue b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/permission/components/AddAccountDialog.vue
index 83edae3ad0..8865f287e2 100644
--- a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/permission/components/AddAccountDialog.vue
+++ b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/permission/components/AddAccountDialog.vue
@@ -19,7 +19,7 @@
     :is-show="isShow"
     :quick-close="false"
     :title="t('新建账号')"
-    :width="480"
+    :width="580"
     @closed="handleClose">
     <BkForm
       v-if="isShow"
@@ -40,7 +40,9 @@
             theme: 'light',
             content: userPlaceholder,
           }"
-          :placeholder="userPlaceholder" />
+          :maxlength="32"
+          :placeholder="userPlaceholder"
+          show-word-limit />
         <p style="color: #ff9c01">
           {{ t('账号创建后，不支持修改。') }}
         </p>
@@ -208,7 +210,7 @@
       {
         trigger: 'change',
         message: userPlaceholder,
-        validator: (value: string) => /^[a-zA-Z0-9][a-zA-Z0-9_.-]{0,31}$/g.test(value),
+        validator: (value: string) => /^[a-zA-Z0-9][a-zA-Z0-9-_.]{0,31}$/.test(value),
       },
     ],
     password: [