From 9f0ac150e77324d55a200aaca660f2edf7a4bece Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 26 Sep 2024 15:32:58 +0800
Subject: [PATCH 1/6] =?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 24fb281cc5181c4c66e934a38dceebbb421e29fe Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 26 Sep 2024 16:15:38 +0800
Subject: [PATCH 2/6] =?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 0b7859ffb1004b1478123f52e1cb56e42b132a56 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 26 Sep 2024 17:27:04 +0800
Subject: [PATCH 3/6] =?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: [

From ae2c3b4ddee0b50b8d4e06934a6f4d91b2806eea Mon Sep 17 00:00:00 2001
From: 3octaves <873551943@qq.com>
Date: Fri, 27 Sep 2024 18:34:52 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix(frontend):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=A5=E6=9E=84=E9=80=A0=E5=AE=9E=E4=BE=8B=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E6=8F=90=E5=8D=95=E5=8F=82=E6=95=B0=E7=BC=BA=E5=B0=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20#7178?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../redis/recover-from-instance/pages/page1/Index.vue          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dbm-ui/frontend/src/views/db-manage/redis/recover-from-instance/pages/page1/Index.vue b/dbm-ui/frontend/src/views/db-manage/redis/recover-from-instance/pages/page1/Index.vue
index b04e687a4e..fef1cf6463 100644
--- a/dbm-ui/frontend/src/views/db-manage/redis/recover-from-instance/pages/page1/Index.vue
+++ b/dbm-ui/frontend/src/views/db-manage/redis/recover-from-instance/pages/page1/Index.vue
@@ -88,6 +88,8 @@
 
   import { useTicketCloneInfo } from '@hooks';
 
+  import { useGlobalBizs } from '@stores';
+
   import { ClusterTypes, LocalStorageKeys, TicketTypes } from '@common/const';
 
   import VisitEntrySelector from '@components/cluster-selector/Index.vue';
@@ -98,6 +100,7 @@
 
   const { t } = useI18n();
   const router = useRouter();
+  const { currentBizId } = useGlobalBizs();
 
   // 单据克隆
   useTicketCloneInfo({

From 9b6c0cfa8bfc0b3cb75e13105f8b84a9bcdb3cac Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Sun, 29 Sep 2024 22:50:54 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix(frontend):=20=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E8=BD=AE=E5=80=BC=E7=AD=96=E7=95=A5=E4=BA=BA=E5=91=98=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=97=A0=E6=95=88=20#7193?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dbm-ui/frontend/package.json                  |   2 +-
 .../components/db-member-selector/index.vue   | 199 +++++++++++------
 .../sql-execute/common/RenderSql/Index.vue    |   4 +-
 .../views/duty-rule-manage/index/Index.vue    |   4 +-
 .../components/edit-rule/CustomRotate.vue     | 211 +++++-------------
 .../components/edit-rule/CycleRotate.vue      |  81 +++----
 .../index/components/edit-rule/Index.vue      | 166 ++++----------
 .../frontend/src/views/staff-manage/Index.vue |   2 +-
 .../components/MemberSelector.vue             | 172 --------------
 9 files changed, 270 insertions(+), 571 deletions(-)
 delete mode 100644 dbm-ui/frontend/src/views/staff-manage/components/MemberSelector.vue

diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json
index fd63b014ad..396751294d 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.72",
+    "bkui-vue": "2.0.1-beta.74",
     "date-fns": "3.6.0",
     "dayjs": "^1.11.13",
     "html-to-image": "1.11.11",
diff --git a/dbm-ui/frontend/src/components/db-member-selector/index.vue b/dbm-ui/frontend/src/components/db-member-selector/index.vue
index 23f000c555..b4fe4867c1 100644
--- a/dbm-ui/frontend/src/components/db-member-selector/index.vue
+++ b/dbm-ui/frontend/src/components/db-member-selector/index.vue
@@ -13,75 +13,124 @@
 
 <template>
   <div
-    class="db-member-selector-wrapper"
-    :class="{ 'is-focus': isFocous }">
-    <BkTagInput
+    class="member-selector-wrapper"
+    :class="{ 'is-hover': isHover }"
+    @mouseenter="handleHover"
+    @mouseleave="handleBlur">
+    <UserSelector
+      ref="userSelectorRef"
       v-model="modelValue"
-      allow-auto-match
-      allow-create
-      :create-tag-validator="createTagValidator"
-      has-delete-icon
-      :list="peopleList"
-      v-bind="listeners"
-      @input="remoteFilter" />
+      class="member-selector"
+      :exact-search-method="exactSearchMethod"
+      fast-clear
+      :fixed-height="false"
+      :fuzzy-search-method="fuzzySearchMethod"
+      :paste-validator="pasteValidator"
+      :render-list="renderList"
+      :render-tag="renderTag"
+      :search-from-default-alternate="false"
+      tag-clearable
+      @remove-selected="handleRemoveSelected" />
     <DbIcon
+      v-if="modelValue.length > 0"
       v-bk-tooltips="t('复制')"
-      type="copy db-member-selector-copy"
+      class="db-member-selector-copy"
+      type="copy"
       @click.stop="handleCopy" />
   </div>
 </template>
 
-<script setup lang="tsx">
-  import _ from 'lodash';
+<script setup lang="ts">
+  import { Fragment } from 'vue/jsx-runtime';
   import { useI18n } from 'vue-i18n';
 
   import { getUserList } from '@services/source/user';
 
-  import { useCopy, useListeners } from '@hooks';
+  import { useCopy } from '@hooks';
 
-  type GetUsesParams = ServiceParameters<typeof getUserList>;
+  const emits = defineEmits<{
+    (e: 'change', value: string[]): void;
+  }>();
 
   const modelValue = defineModel<string[]>({
-    default: () => [],
+    required: true,
   });
 
-  const listeners = useListeners();
-
-  const copy = useCopy();
   const { t } = useI18n();
+  const copy = useCopy();
+
+  const userSelectorRef = ref();
+  const isHover = ref(false);
+
+  const exactSearchMethod = () =>
+    getUserList({
+      exact_lookups: modelValue.value.join(','),
+    }).then((result) => result.results);
+
+  const pasteValidator = (values: string[]) => values;
+
+  const fuzzySearchMethod = (keyword: string) =>
+    getUserList({
+      fuzzy_lookups: keyword,
+    }).then((searchList) => ({
+      next: false,
+      results: searchList.results.map((userItem) => ({
+        username: userItem.username,
+        display_name: userItem.display_name,
+      })),
+    }));
+
+  const renderTag = (
+    renderMethod: typeof h,
+    node: {
+      username: string;
+      user: {
+        username: string;
+        display_name: string;
+      };
+    },
+  ) =>
+    renderMethod('div', null, [
+      renderMethod(
+        'span',
+        {
+          class: 'mr-4',
+        },
+        `${node.username}(${node.user?.display_name || node.username})`,
+      ),
+    ]);
+
+  const renderList = (
+    renderMethod: typeof h,
+    node: {
+      user: {
+        username: string;
+        display_name: string;
+        type: string;
+      };
+    },
+  ) => {
+    const { display_name: displayName, username } = node.user;
+
+    return renderMethod(Fragment, [renderMethod('span', `${username}(${displayName})`)]);
+  };
+
+  watch(modelValue, () => {
+    console.log('from watchch modelvall = ', modelValue.value);
+    emits('change', modelValue.value);
+  });
+
+  const handleRemoveSelected = () => {
+    userSelectorRef.value.search();
+  };
 
-  const peopleList = ref<
-    {
-      id: string;
-      name: string;
-    }[]
-  >([]);
-
-  const isFocous = ref(false);
-
-  const createTagValidator = (tag: string) => !!peopleList.value.find((item) => item.name === tag);
-
-  /**
-   * 获取人员列表
-   */
-  const fetchUseList = async (params: GetUsesParams = {}) => {
-    await getUserList(params).then((res) => {
-      // 过滤已经选中的用户
-      peopleList.value = res.results
-        .filter((item) => !modelValue.value?.includes(item.username))
-        .map((item) => ({
-          id: item.username,
-          name: item.username,
-        }));
-    });
+  const handleHover = () => {
+    isHover.value = true;
   };
-  // 初始化加载
-  fetchUseList({ limit: 200, offset: 0 });
 
-  /**
-   * 远程搜索人员
-   */
-  const remoteFilter = _.debounce((value: string) => fetchUseList({ fuzzy_lookups: value }), 500);
+  const handleBlur = () => {
+    isHover.value = false;
+  };
 
   const handleCopy = () => {
     copy(modelValue.value.join(';'));
@@ -89,35 +138,45 @@
 </script>
 
 <style lang="less" scoped>
-  .db-member-selector-wrapper {
+  .member-selector-wrapper {
     position: relative;
+    line-height: 1;
 
-    &:hover,
-    &.is-focus {
+    &.is-hover {
+      :deep(.user-selector-clear) {
+        visibility: visible;
+      }
+    }
+
+    &:hover {
       .db-member-selector-copy {
         display: block;
       }
     }
-  }
 
-  .db-member-selector-copy {
-    position: absolute;
-    top: 50%;
-    right: 2px;
-    z-index: 99;
-    display: none;
-    width: 20px;
-    height: 20px;
-    margin-top: -10px;
-    margin-right: 4px;
-    font-size: 16px;
-    line-height: 20px;
-    cursor: pointer;
-    background-color: white;
+    .member-selector {
+      width: 100%;
+    }
 
-    &:hover {
-      color: @primary-color;
-      background-color: #e1ecff;
+    .db-member-selector-copy {
+      position: absolute;
+      top: 50%;
+      right: 24px;
+      z-index: 99;
+      display: none;
+      width: 20px;
+      height: 20px;
+      margin-top: -15px;
+      font-size: 12px;
+      line-height: 20px;
+      color: #979ba5;
+      cursor: pointer;
+      background-color: white;
+
+      &:hover {
+        color: @primary-color;
+        background-color: #e1ecff;
+      }
     }
   }
 </style>
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 0d5a4d6c01..9b2dacbf0f 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
@@ -12,7 +12,9 @@
         text
         theme="primary"
         @click="handleShowSql">
-        {{ modelValue.length < 1 ? t('点击添加') : t('n 个 SQL 文件', { n: modelValue.length }) }}
+        <span v-if="modelValue.length < 1">{{ t('点击添加') }}</span>
+        <span v-else-if="modelValue.length === 1">{{ modelValue[0] }}</span>
+        <span v-else>{{ t('n 个 SQL 文件', { n: modelValue.length }) }}</span>
       </BkButton>
     </span>
   </RenderTextPlain>
diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/Index.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/Index.vue
index 9657e5880b..3ab2606b17 100644
--- a/dbm-ui/frontend/src/views/duty-rule-manage/index/Index.vue
+++ b/dbm-ui/frontend/src/views/duty-rule-manage/index/Index.vue
@@ -20,13 +20,15 @@
   </div>
 </template>
 <script setup lang="ts">
+  import { DBTypes } from '@common/const';
+
   import DbTab from '@components/db-tab/Index.vue';
 
   import RenderContent from './components/content/Index.vue';
 
   const route = useRoute();
 
-  const activeTab = ref<string>(route.query.db_type as string);
+  const activeTab = ref<string>((route.query.db_type as string) || DBTypes.MYSQL);
 </script>
 <style lang="less">
   .duty-rule-manage-content {
diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue
index aa5d728e4f..6141a31406 100644
--- a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue
+++ b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CustomRotate.vue
@@ -15,12 +15,12 @@
   <div class="title-spot custom-item-title mt-24">{{ t('轮值起止时间') }}<span class="required" /></div>
   <BkDatePicker
     ref="datePickerRef"
+    v-model="dateTimeRange"
     append-to-body
     :clearable="false"
-    :model-value="dateTimeRange"
     style="width: 100%"
     type="daterange"
-    @change="handlerChangeDatetime" />
+    @change="handleDatetimeRangeChange" />
   <div class="title-spot custom-item-title mt-24">{{ t('轮值排班') }}<span class="required" /></div>
   <DbOriginalTable
     class="custom-table-box"
@@ -31,17 +31,16 @@
 <script setup lang="tsx">
   import dayjs from 'dayjs';
   import { useI18n } from 'vue-i18n';
-  import { useRequest } from 'vue-request';
 
   import type { DutyCustomItem } from '@services/model/monitor/duty-rule';
   import DutyRuleModel from '@services/model/monitor/duty-rule';
-  import { getUserList } from '@services/source/user';
+
+  import MemberSelector from '@components/db-member-selector/index.vue';
 
   import { getDiffDays, random } from '@utils';
 
   interface Props {
     data?: DutyRuleModel;
-    isSetEmpty?: boolean;
   }
 
   interface RowData {
@@ -50,7 +49,7 @@
       id: string,
       value: string[];
     }[],
-    peoples: string[],
+    members: string[],
   }
 
   interface Exposes {
@@ -67,34 +66,12 @@
 
   const props = defineProps<Props>();
 
-  function formatDate(date: string) {
-    return dayjs(date).format('YYYY-MM-DD');
-  }
-
-  // 临时处理，待时间选择器修复后去除
-  function transferToTimePicker(timeStr: string) {
-    const arr = timeStr.split(':');
-    if (arr.length === 2) {
-      return `${timeStr}:00`;
-    }
-    return timeStr;
-  }
-
-  function initDateRange() {
-    return [
-      formatDate(new Date().toISOString()),
-      formatDate(new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString()),
-    ] as [string, string];
-  }
-
   const { t } = useI18n();
 
-  const dateTimeRange = ref<[string, string]>(initDateRange());
-  const copiedStr = ref('');
+  const dateTimeRange = ref<[string, string]>();
   const tableData = ref<RowData[]>([]);
-  const contactList = ref<SelectItem<string>[]>([]);
 
-  const columns = computed(() => ([
+  const columns = [
     {
       label: t('轮值日期'),
       field: 'dateTime',
@@ -131,119 +108,58 @@
     },
     {
       label: t('轮值人员'),
-      field: 'peoples',
-      render: ({ data }: {data: RowData}) => (
-        <div class="peoples">
-          <bk-select
-            class="people-select"
-            clearable={false}
-            v-model={data.peoples}
-            placeholder={t('请选择人员')}
-            filterable
-            multiple
-            input-search={false}
-            multiple-mode="tag"
-          >
-          {
-            contactList.value.map((item, index) => <bk-option
-              key={index}
-              value={item.value}
-              label={item.label}
-            />)
-          }
-          </bk-select>
-          {/* <bk-tag-input
-            clearable={false}
-            v-model={data.peoples}
-            placeholder={t('请选择人员')}
-            allow-create
-            has-delete-icon
-            collapse-tags
-          /> */}
-          <div class="operate-box">
-            {copiedStr.value !== '' && <db-icon
-              class="operate-icon"
-              type="paste"
-              onClick={() => handleClickPaste(data)}/>}
-            {data.peoples.length > 0 && <db-icon
-              class="ml-10 operate-icon"
-              type="copy-2"
-              onClick={() => handleClickCopy(data)}/>}
-          </div>
-        </div>
-        ),
+      field: 'members',
+      render: ({data, index}: {data: RowData, index: number}) =>(
+        <MemberSelector
+          modelValue={data.members}
+          onChange={(value: string[]) => handelPeopleChange(value, index)} />
+      ),
     },
-  ]));
+  ];
 
-  useRequest(getUserList, {
-    onSuccess: (res) => {
-      const list = res.results.map(item => ({ label: item.username, value: item.username }));
-      contactList.value = list;
-    },
+  watch(() => props.data, (data) => {
+    const transferToTimePicker = (timeStr: string) => {
+      const arr = timeStr.split(':');
+      if (arr.length === 2) {
+        return `${timeStr}:00`;
+      }
+      return timeStr;
+    }
+
+    if (data && data.category === 'regular') {
+      dateTimeRange.value = [data.effective_time, data.end_time];
+      tableData.value = (data.duty_arranges as DutyCustomItem[]).map(item => ({
+        dateTime: item.date,
+        timeRange: item.work_times.map(i => ({
+          id: random(),
+          value: i.split('--').map(time => transferToTimePicker(time)),
+        })),
+        members: item.members,
+      }));
+    } else {
+      tableData.value = []
+    }
+  }, {
+    immediate: true,
   });
 
-  watch(dateTimeRange, (range) => {
-    const dateArr = getDiffDays(range[0] as string, range[1]);
+
+  const handleDatetimeRangeChange = (value: [string, string]) => {
+    dateTimeRange.value = value;
+    const dateArr = getDiffDays(value[0], value[1]);
     tableData.value = dateArr.map(item => ({
       dateTime: item,
       timeRange: [{
         id: random(),
         value: ['00:00:00', '23:59:59'],
       }],
-      peoples: [],
+      members: [],
     }));
-  }, {
-    immediate: true,
-  });
-
-  watch(() => props.data, (data) => {
-    if (data) {
-      dateTimeRange.value = [data.effective_time, data.end_time];
-      setTimeout(() => {
-        const arranges = data.duty_arranges as DutyCustomItem[];
-        tableData.value = arranges.map(item => ({
-          dateTime: item.date,
-          timeRange: item.work_times.map(i => ({
-            id: random(),
-            value: i.split('--').map(time => transferToTimePicker(time)),
-          })),
-          peoples: item.members,
-        }));
-      });
-    }
-  }, {
-    immediate: true,
-  });
-
-  watch(() => props.isSetEmpty, (status) => {
-    if (status) {
-      // 设置初始化
-      setTimeout(() => {
-        dateTimeRange.value = initDateRange();
-      });
-    }
-  }, {
-    immediate: true,
-  });
-
-  const handleClickCopy = (row: RowData) => {
-    copiedStr.value = row.peoples.join(',');
-  };
+  }
 
-  const handleClickPaste = (row: RowData) => {
-    const oldArr = row.peoples;
-    if (oldArr.length === 0) {
-      Object.assign(row, {
-        peoples: copiedStr.value.split(','),
-      });
-    } else {
-      const addArr = copiedStr.value.split(',');
-      const newArr = [...new Set([...oldArr, ...addArr])];
-      Object.assign(row, {
-        peoples: newArr,
-      });
-    }
-  };
+  const handelPeopleChange = (value: string[], index: number) => {
+    tableData.value[index].members = value
+  }
 
   const handleAddTime = (index: number) => {
     tableData.value[index].timeRange.push({
@@ -256,33 +172,24 @@
     tableData.value[outerIndex].timeRange.splice(innerIndex, 1);
   };
 
-  const handlerChangeDatetime = (range: [string, string]) => {
-    dateTimeRange.value = range;
-  };
-
-  // 临时处理，待组件支持分钟后去除
-  const splitTimeToMinute = (str: string) => {
-    const strArr = str.split(':');
-    if (strArr.length <= 2) {
-      return str;
-    }
-    strArr.pop();
-    return strArr.join(':');
-  };
 
   defineExpose<Exposes>({
     getValue() {
-      let effctTime = dateTimeRange.value[0];
-      effctTime = `${effctTime.split(' ')[0]} 00:00:00`;
-      let endTime = dateTimeRange.value[1];
-      endTime = `${endTime.split(' ')[0]} 00:00:00`;
+      const splitTimeToMinute = (str: string) => {
+        const strArr = str.split(':');
+        if (strArr.length <= 2) {
+          return str;
+        }
+        strArr.pop();
+        return strArr.join(':');
+      };
       return {
-        effective_time: effctTime,
-        end_time: endTime,
+        effective_time: dayjs(dateTimeRange.value![0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+        end_time: dayjs(dateTimeRange.value![1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
         duty_arranges: tableData.value.map(item => ({
           date: item.dateTime,
           work_times: item.timeRange.map(data => data.value.map(str => splitTimeToMinute(str)).join('--')),
-          members: item.peoples,
+          members: item.members,
         })),
       };
     },
@@ -306,7 +213,7 @@
       background-color: #f5f7fa !important;
     }
 
-    :deep(.peoples) {
+    :deep(.members) {
       position: relative;
       display: flex;
       width: 100%;
diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue
index 28c43b4771..d137ba1e6a 100644
--- a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue
+++ b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/CycleRotate.vue
@@ -23,9 +23,7 @@
       property="peopleList"
       required>
       <span class="cycle-title-tip">（{{ t('排班时将会按照人员的顺序进行排班，可拖动 Tag 进行排序') }}）</span>
-      <SortTagInput
-        :list="formModel.peopleList"
-        @change="handleSortTagInputChange" />
+      <MemberSelector v-model="formModel.peopleList" />
     </BkFormItem>
     <div class="cycle-duty-box">
       <BkFormItem
@@ -60,12 +58,11 @@
   <div class="title-spot cycle-table-box mt-24">{{ t('轮值起止时间') }}<span class="required" /></div>
   <BkDatePicker
     ref="datePickerRef"
+    v-model="dateTimeRange"
     append-to-body
     :clearable="false"
-    :model-value="dateTimeRange"
     style="width: 100%"
-    type="daterange"
-    @change="handlerChangeDatetime" />
+    type="daterange" />
   <div class="cycle-time-select-box">
     <div class="select-item">
       <BkSelect
@@ -138,13 +135,13 @@
   import type { DutyCycleItem } from '@services/model/monitor/duty-rule';
   import DutyRuleModel from '@services/model/monitor/duty-rule';
 
+  import MemberSelector from '@components/db-member-selector/index.vue';
+
   import {
     getDiffDays,
     random,
   } from '@utils';
 
-  import SortTagInput from './SortTagInput.vue';
-
   interface RowData {
     dateTime: string,
     timeRange: string[],
@@ -185,13 +182,6 @@
     return timeStr;
   }
 
-  function initDateTimrRange() {
-    return [
-      formatDate(new Date().toISOString()),
-      formatDate(new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString()),
-    ] as [string, string];
-  }
-
   function initDateSelect() {
     return ({
       date: 'daily',
@@ -205,7 +195,7 @@
 
   const { t } = useI18n();
 
-  const dateTimeRange = ref(initDateTimrRange());
+  const dateTimeRange = ref<[string, string]>([dayjs().format('YYYY-MM-DD HH:mm:ss'), dayjs().add(1, 'day').format('YYYY-MM-DD HH:mm:ss')]);
   const dateSelect = ref(initDateSelect());
   const tableData = ref<RowData[]>([]);
   const formRef = ref();
@@ -305,6 +295,19 @@
   watch(
     [dateTimeRange, dateSelect, formModel],
     ([dateRange, data, formModel]) => {
+      const getRangeList = (arr: string[], startIndex: number, counts: number) => {
+        const ret = [];
+        let start = startIndex;
+        for (let i = 0; i < counts; i++) {
+          if (start >= arr.length) {
+            start = 0;
+          }
+          ret.push(arr[start]);
+          start = start + 1;
+        }
+        return ret;
+      };
+
       if (data.date && formModel.peopleList.length > 0) {
         const { singleDutyPeoples, sinlgeDutyDays, peopleList } = formModel;
         const days = sinlgeDutyDays;
@@ -378,22 +381,6 @@
     immediate: true,
   });
 
-  const getRangeList = (arr: string[], startIndex: number, counts: number) => {
-    const ret = [];
-    let start = startIndex;
-    for (let i = 0; i < counts; i++) {
-      if (start >= arr.length) {
-        start = 0;
-      }
-      ret.push(arr[start]);
-      start = start + 1;
-    }
-    return ret;
-  };
-
-  const handleSortTagInputChange = (arr: string[]) => {
-    formModel.peopleList = arr;
-  };
 
   const handleAddTime = () => {
     dateSelect.value.timeList.push({
@@ -406,30 +393,20 @@
     dateSelect.value.timeList.splice(index, 1);
   };
 
-  const handlerChangeDatetime = (range: [string, string]) => {
-    dateTimeRange.value = range;
-  };
-
-  // 临时处理，待组件支持分钟后去除
-  const splitTimeToMinute = (str: string) => {
-    const strArr = str.split(':');
-    if (strArr.length <= 2) {
-      return str;
-    }
-    strArr.pop();
-    return strArr.join(':');
-  };
 
   defineExpose<Exposes>({
     async getValue() {
-      await formRef.value.validate();
-      let effctTime = dateTimeRange.value[0];
-      effctTime = `${effctTime.split(' ')[0]} 00:00:00`;
-      let endTime = dateTimeRange.value[1];
-      endTime = `${endTime.split(' ')[0]} 00:00:00`;
+      const splitTimeToMinute = (str: string) => {
+        const strArr = str.split(':');
+        if (strArr.length <= 2) {
+          return str;
+        }
+        strArr.pop();
+        return strArr.join(':');
+      };
       return {
-        effective_time: effctTime,
-        end_time: endTime,
+        effective_time: dayjs(dateTimeRange.value![0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+        end_time: dayjs(dateTimeRange.value![1]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
         duty_arranges: tableData.value.map(item => ({
           duty_number: formModel.singleDutyPeoples,
           duty_day: formModel.sinlgeDutyDays,
diff --git a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/Index.vue b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/Index.vue
index 199337f42c..a8ad21db66 100644
--- a/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/Index.vue
+++ b/dbm-ui/frontend/src/views/duty-rule-manage/index/components/edit-rule/Index.vue
@@ -46,8 +46,7 @@
       <div class="title-spot item-title">{{ t('轮值方式') }}<span class="required" /></div>
       <BkRadioGroup
         v-model="rotateType"
-        type="card"
-        @change="handleChangeRotateType">
+        type="card">
         <BkRadioButton
           v-for="(item, index) in rotateTypeList"
           :key="index"
@@ -63,80 +62,30 @@
           <BkRadio :label="0">
             {{ t('全部业务') }}
           </BkRadio>
-          <!-- <div class="biz-box-control">
-            <div
-              class="biz-box-append"
-              @click="handleClickAppendExcludeBizs">
-              <template v-if="!isShowSelectExcludeBizBox">
-                <DbIcon
-                  class="mr-6"
-                  style="color: #3A84FF;"
-                  type="add" />
-                <span>{{ t('追加排除业务') }}</span>
-              </template>
-              <template v-else>
-                <BkSelect
-                  v-model="partialBizs"
-                  class="biz-select"
-                  multiple
-                  :placeholder="t('请选择排除业务')"
-                  show-select-all>
-                  <BkOption
-                    v-for="(item, index) in bizList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value" />
-                </BkSelect>
-                <DbIcon
-                  v-if="partialBizs.length > 0"
-                  v-bk-tooltips="{
-                    content: t('删除排除项'),
-                    theme: 'dark'
-                  }"
-                  class="ml-10"
-                  style="font-size: 16px;color:#979BA5;"
-                  type="delete"
-                  @click="handleDeleteExcludes" />
-              </template>
-            </div>
-          </div> -->
         </div>
-        <!-- <div class="biz-box">
-          <BkRadio :label="t('部分业务')" />
-          <div class="biz-box-control">
-            <BkSelect
-              v-model="partialBizs"
-              class="biz-select"
-              multiple
-              show-select-all>
-              <BkOption
-                v-for="(item, index) in bizList"
-                :key="index"
-                :label="item.label"
-                :value="item.value" />
-            </BkSelect>
-          </div>
-        </div> -->
       </BkRadioGroup>
-      <CycleRotate
-        v-if="rotateType === '0'"
-        ref="cycleRef"
-        :data="data" />
-      <CustomRotate
-        v-else
-        ref="customRef"
-        :data="data"
-        :is-set-empty="isSetCutomEmpty" />
+      <KeepAlive>
+        <CycleRotate
+          v-if="rotateType === 'handoff'"
+          ref="cycleRef"
+          :data="data" />
+        <CustomRotate
+          v-else
+          ref="customRef"
+          :data="data" />
+      </KeepAlive>
     </div>
-
     <template #footer>
       <BkButton
         class="mr-8"
+        :loading="isCreateLoading || isUpdateLoading"
         theme="primary"
         @click="handleConfirm">
         {{ t('确定') }}
       </BkButton>
-      <BkButton @click="handleClose">
+      <BkButton
+        :disabled="isCreateLoading || isUpdateLoading"
+        @click="handleClose">
         {{ t('取消') }}
       </BkButton>
     </template>
@@ -180,19 +129,15 @@
   const handleBeforeClose = useBeforeClose();
 
   const nameTip = ref('');
-  const rotateType = ref('0');
+  const rotateType = ref('handoff');
   const bizType = ref(0);
   const customRef = ref();
   const cycleRef = ref();
-  const isSetCutomEmpty = ref(false);
   const formRef = ref();
   const formModel = reactive({
     ruleName: '',
   });
 
-  // const partialBizs = ref([]);
-  // const isShowSelectExcludeBizBox = ref(false);
-
   const isCreate = computed(() => props.pageType !== 'edit');
 
   const titleMap = {
@@ -203,11 +148,11 @@
 
   const rotateTypeList = [
     {
-      value: '0',
+      value: 'handoff',
       label: t('周期轮值'),
     },
     {
-      value: '1',
+      value: 'regular',
       label: t('自定义轮值'),
     },
   ];
@@ -249,86 +194,66 @@
     ],
   };
 
-  const { run: runCreateDutyRule } = useRequest(createDutyRule, {
+  const { loading: isCreateLoading, run: runCreateDutyRule } = useRequest(createDutyRule, {
     manual: true,
-    onSuccess: (createResult) => {
-      if (createResult) {
-        messageSuccess(t('保存成功'));
-        emits('success');
-      }
+    onSuccess: () => {
+      messageSuccess(t('保存成功'));
+      emits('success');
+      isShow.value = false;
     },
   });
 
-  const { run: runUpdateDutyRule } = useRequest(updateDutyRule, {
+  const { loading: isUpdateLoading, run: runUpdateDutyRule } = useRequest(updateDutyRule, {
     manual: true,
-    onSuccess: (updateResult) => {
-      if (updateResult) {
-        // 成功
-        messageSuccess(t('保存成功'));
-        emits('success');
-      }
+    onSuccess: () => {
+      // 成功
+      messageSuccess(t('编辑成功'));
+      emits('success');
+      isShow.value = false;
     },
   });
 
-  // const bizList = ref<SelectItem[]>([]);
-
   watch(
     () => [props.pageType, props.data],
     () => {
-      checkPageTypeAndData();
+      if (props.pageType !== 'create' && props.data) {
+        // 编辑或者克隆
+        formModel.ruleName = props.data.name;
+        rotateType.value = props.data.category;
+        return;
+      }
+      formModel.ruleName = '';
     },
   );
 
-  const checkPageTypeAndData = () => {
-    if (props.pageType !== 'create' && props.data) {
-      // 编辑或者克隆
-      formModel.ruleName = props.data.name;
-      rotateType.value = props.data.category === 'handoff' ? '0' : '1';
-      return;
-    }
-    formModel.ruleName = '';
-  };
-
-  const handleChangeRotateType = (value: string) => {
-    isSetCutomEmpty.value = value === '1';
-  };
-
-  // const handleClickAppendExcludeBizs = () => {
-  //   isShowSelectExcludeBizBox.value = true;
-  // };
-
-  // const handleDeleteExcludes = () => {
-  //   partialBizs.value = [];
-  // };
-
   // 点击确定
   const handleConfirm = async () => {
     await formRef.value.validate();
-    if (rotateType.value === '0') {
+    if (rotateType.value === 'handoff') {
       const cycleValues = await cycleRef.value.getValue();
       const cycleParams = {
         name: formModel.ruleName,
         priority: 1,
         db_type: props.dbType,
-        category: 'handoff',
+        category: rotateType.value,
         effective_time: cycleValues.effective_time,
         end_time: cycleValues.end_time,
         duty_arranges: cycleValues.duty_arranges,
       };
       if (isCreate.value) {
         // 新建/克隆
-        runCreateDutyRule(cycleParams);
+        await runCreateDutyRule(cycleParams);
       } else {
         // 克隆或者编辑
         if (props.data) {
           cycleParams.effective_time = cycleValues.effective_time;
           cycleParams.end_time = cycleValues.end_time;
-          runUpdateDutyRule(props.data.id, cycleParams);
+          await runUpdateDutyRule(props.data.id, cycleParams);
         }
       }
     } else {
       // 自定义轮值
-      const customValues = customRef.value.getValue();
+      const customValues = await customRef.value.getValue();
       const customParams = {
         name: formModel.ruleName,
         priority: 2,
@@ -340,26 +265,25 @@
       };
       if (isCreate.value) {
         // 新建/克隆
-        runCreateDutyRule(customParams);
+        await runCreateDutyRule(customParams);
       } else {
         // 克隆或者编辑
         if (props.data) {
-          runUpdateDutyRule(props.data.id, customParams);
+          await runUpdateDutyRule(props.data.id, customParams);
         }
       }
     }
-    isShow.value = false;
   };
 
   async function handleClose() {
     const result = await handleBeforeClose();
 
     if (!result) {
-      return;
+      return false;
     }
-    checkPageTypeAndData();
     window.changeConfirm = false;
     isShow.value = false;
+    return true;
   }
 </script>
 
diff --git a/dbm-ui/frontend/src/views/staff-manage/Index.vue b/dbm-ui/frontend/src/views/staff-manage/Index.vue
index 256b0c90c8..4dab8f8cda 100644
--- a/dbm-ui/frontend/src/views/staff-manage/Index.vue
+++ b/dbm-ui/frontend/src/views/staff-manage/Index.vue
@@ -72,7 +72,7 @@
 
   import { getAdmins, updateAdmins } from '@services/source/dbadmin';
 
-  import MemberSelector from './components/MemberSelector.vue';
+  import MemberSelector from '@components/db-member-selector/index.vue';
 
   const { t } = useI18n();
   const route = useRoute();
diff --git a/dbm-ui/frontend/src/views/staff-manage/components/MemberSelector.vue b/dbm-ui/frontend/src/views/staff-manage/components/MemberSelector.vue
deleted file mode 100644
index c7c0cf693f..0000000000
--- a/dbm-ui/frontend/src/views/staff-manage/components/MemberSelector.vue
+++ /dev/null
@@ -1,172 +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>
-  <div
-    class="member-selector-wrapper"
-    :class="{ 'is-hover': isHover }"
-    @mouseenter="handleHover"
-    @mouseleave="handleBlur">
-    <UserSelector
-      ref="userSelectorRef"
-      v-model="modelValue"
-      class="member-selector"
-      :exact-search-method="exactSearchMethod"
-      fast-clear
-      :fixed-height="false"
-      :fuzzy-search-method="fuzzySearchMethod"
-      :paste-validator="pasteValidator"
-      :render-list="renderList"
-      :render-tag="renderTag"
-      :search-from-default-alternate="false"
-      tag-clearable
-      @remove-selected="handleRemoveSelected" />
-    <DbIcon
-      v-if="modelValue.length > 0"
-      v-bk-tooltips="t('复制')"
-      class="db-member-selector-copy"
-      type="copy"
-      @click.stop="handleCopy" />
-  </div>
-</template>
-
-<script setup lang="ts">
-  import { Fragment } from 'vue/jsx-runtime';
-  import { useI18n } from 'vue-i18n';
-
-  import { getUserList } from '@services/source/user';
-
-  import { useCopy } from '@hooks';
-
-  const modelValue = defineModel<string[]>({
-    required: true,
-  });
-
-  const { t } = useI18n();
-  const copy = useCopy();
-
-  const userSelectorRef = ref();
-  const isHover = ref(false);
-
-  const exactSearchMethod = () =>
-    getUserList({
-      exact_lookups: modelValue.value.join(','),
-    }).then((result) => result.results);
-
-  const pasteValidator = (values: string[]) => values;
-
-  const fuzzySearchMethod = (keyword: string) =>
-    getUserList({
-      fuzzy_lookups: keyword,
-    }).then((searchList) => ({
-      next: false,
-      results: searchList.results.map((userItem) => ({
-        username: userItem.username,
-        display_name: userItem.display_name,
-      })),
-    }));
-
-  const renderTag = (
-    renderMethod: typeof h,
-    node: {
-      username: string;
-      user: {
-        username: string;
-        display_name: string;
-      };
-    },
-  ) =>
-    renderMethod('div', null, [
-      renderMethod(
-        'span',
-        {
-          class: 'mr-4',
-        },
-        `${node.username}(${node.user?.display_name || node.username})`,
-      ),
-    ]);
-
-  const renderList = (
-    renderMethod: typeof h,
-    node: {
-      user: {
-        username: string;
-        display_name: string;
-        type: string;
-      };
-    },
-  ) => {
-    const { display_name: displayName, username } = node.user;
-
-    return renderMethod(Fragment, [renderMethod('span', `${username}(${displayName})`)]);
-  };
-
-  const handleRemoveSelected = () => {
-    userSelectorRef.value.search();
-  };
-
-  const handleHover = () => {
-    isHover.value = true;
-  };
-
-  const handleBlur = () => {
-    isHover.value = false;
-  };
-
-  const handleCopy = () => {
-    copy(modelValue.value.join(';'));
-  };
-</script>
-
-<style lang="less" scoped>
-  .member-selector-wrapper {
-    position: relative;
-
-    &.is-hover {
-      :deep(.user-selector-clear) {
-        visibility: visible;
-      }
-    }
-
-    &:hover {
-      .db-member-selector-copy {
-        display: block;
-      }
-    }
-
-    .member-selector {
-      width: 100%;
-    }
-
-    .db-member-selector-copy {
-      position: absolute;
-      top: 50%;
-      right: 24px;
-      z-index: 99;
-      display: none;
-      width: 20px;
-      height: 20px;
-      margin-top: -15px;
-      font-size: 12px;
-      line-height: 20px;
-      cursor: pointer;
-      background-color: white;
-      color: #979ba5;
-
-      &:hover {
-        color: @primary-color;
-        background-color: #e1ecff;
-      }
-    }
-  }
-</style>

From 47e69c9a3554de461baaf9604e7f371bced59f0c Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Wed, 9 Oct 2024 12:01:14 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix(frontend):=20sqlserver=20=E5=8D=95?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=83=A8=E7=BD=B2=E6=94=AF=E6=8C=81=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=B7=20#7218?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/db-manage/sqlserver/apply/SqlServer.vue        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dbm-ui/frontend/src/views/db-manage/sqlserver/apply/SqlServer.vue b/dbm-ui/frontend/src/views/db-manage/sqlserver/apply/SqlServer.vue
index 761910aca8..fb1fea7a12 100644
--- a/dbm-ui/frontend/src/views/db-manage/sqlserver/apply/SqlServer.vue
+++ b/dbm-ui/frontend/src/views/db-manage/sqlserver/apply/SqlServer.vue
@@ -99,10 +99,9 @@
         <RegionItem
           ref="regionItemRef"
           v-model="formData.details.city_code" />
-        <DbCard
-          v-if="!isSingleType"
-          :title="t('数据库部署信息')">
+        <DbCard :title="t('数据库部署信息')">
           <AffinityItem
+            v-if="!isSingleType"
             v-model="formData.details.disaster_tolerance_level"
             :city-code="formData.details.city_code" />
           <BkFormItem