Hotfix master

dbm-ui/frontend/.prettierignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+src/types/auto-imports.d.ts

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",

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;

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))),
+      ),
+    );
 }
 
 /**

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))),
+    ),
   }));
 }
 

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: {

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')
 }

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[]
   }

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>

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>();

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>();

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('账号创建后，不支持修改。') }}

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: [