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

{{ t('账号创建后,不支持修改。') }}

@@ -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/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 @@ {{ default: () => ( - handleToDetails(data)}> {data.master_domain} - + ), append: () => ( <> 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"> + :maxlength="32" + :placeholder="userPlaceholder" + show-word-limit />

{{ t('账号创建后,不支持修改。') }}

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