diff --git a/dbm-ui/frontend/src/common/importComps.ts b/dbm-ui/frontend/src/common/importComps.ts index 61d2d3fb86..0b7f671539 100644 --- a/dbm-ui/frontend/src/common/importComps.ts +++ b/dbm-ui/frontend/src/common/importComps.ts @@ -30,6 +30,17 @@ import DbStatus from '@components/db-status/index.vue'; import DbTable from '@components/db-table/index.vue'; import DbOriginalTable from '@components/db-table/OriginalTable.vue'; import DbTextarea from '@components/db-textarea/DbTextarea.vue'; +import EditTable, { + Block as EditTableBlock, + Column as EditTableColumn, + DatePicker as EditTableDatePicker, + Input as EditTableInput, + Row as EditTableRow, + Select as EditTableSelect, + TagInput as EditTableTagInput, + Textarea as EditTableTextarea, + TimePicker as EditTableTimePicker, +} from '@components/editable-table/Index.vue'; import FunController from '@components/function-controller/FunController.vue'; import MoreActionExtend from '@components/more-action-extend/Index.vue'; import ScrollFaker from '@components/scroll-faker/Index.vue'; @@ -37,12 +48,25 @@ import SkeletonLoading from '@components/skeleton-loading/Index.vue'; import SmartAction from '@components/smart-action/Index.vue'; import { ipSelector } from '@components/vue2/ip-selector'; +import OperationColumn from '@views/db-manage/common/toolbox-field/column/operation-column/Index.vue'; + import { Table, TableColumn } from '@blueking/table'; import UserSelector from '@patch/user-selector/selector.vue'; import('@blueking/table/vue3/vue3.css'); export const setGlobalComps = (app: App) => { + app.component('EditTable', EditTable); + app.component('EditTableBlock', EditTableBlock); + app.component('EditTableColumn', EditTableColumn); + app.component('EditTableDatePicker', EditTableDatePicker); + app.component('EditTableInput', EditTableInput); + app.component('EditTableRow', EditTableRow); + app.component('EditTableSelect', EditTableSelect); + app.component('EditTableTagInput', EditTableTagInput); + app.component('EditTableTextarea', EditTableTextarea); + app.component('EditTableTimePicker', EditTableTimePicker); + app.component('OperationColumn', OperationColumn); app.component('DbCard', DbCard); app.component('DbForm', DbForm); app.component('DbFormItem', DbFormItem); diff --git a/dbm-ui/frontend/src/hooks/useCreateTicket.tsx b/dbm-ui/frontend/src/hooks/useCreateTicket.tsx index 1496f1c342..d3635f406d 100644 --- a/dbm-ui/frontend/src/hooks/useCreateTicket.tsx +++ b/dbm-ui/frontend/src/hooks/useCreateTicket.tsx @@ -13,11 +13,12 @@ export function useCreateTicket(ticketType: TicketTypes, options?: { onSucces const router = useRouter(); const { t, locale } = useI18n(); - const run = async (formData: { details: T; remark: string; ignore_duplication?: boolean }) => { + const run = async (formData: { details: T; remark?: string; ignore_duplication?: boolean }) => { const params = { ticket_type: ticketType, bk_biz_id: window.PROJECT_CONFIG.BIZ_ID, - ...formData, + details: formData.details, + remark: formData.remark || '', }; try { loading.value = true; diff --git a/dbm-ui/frontend/src/types/biz-components.d.ts b/dbm-ui/frontend/src/types/biz-components.d.ts index 9753c30ecd..e5b1aa2511 100644 --- a/dbm-ui/frontend/src/types/biz-components.d.ts +++ b/dbm-ui/frontend/src/types/biz-components.d.ts @@ -14,6 +14,18 @@ declare module 'vue' { DbStatus: typeof import('@components/db-status/index.vue').default; DbTable: typeof import('@blueking/table/typings/BkTable.vue'); DbTable: typeof import('@blueking/table/typings/BkTableColumn.vue'); + EditTable: typeof import('@components/editable-table/Index.vue').default; + EditTableBlock: typeof import('@components/editable-table/Index.vue').Block; + EditTableColumn: typeof import('@components/editable-table/Index.vue').Column; + EditTableDatePicker: typeof import('@components/editable-table/Index.vue').DatePicker; + EditTableInput: typeof import('@components/editable-table/Index.vue').Input; + EditTableRow: typeof import('@components/editable-table/Index.vue').Row; + EditTableSelect: typeof import('@components/editable-table/Index.vue').Select; + EditTableTagInput: typeof import('@components/editable-table/Index.vue').TagInput; + EditTableTextarea: typeof import('@components/editable-table/Index.vue').Textarea; + EditTableTimePicker: typeof import('@components/editable-table/Index.vue').TimePicker; + OperationColumn: typeof import('@views/db-manage/common/toolbox-field/column/operation-column/Index.vue').default; + OperationRow: typeof import('@views/db-manage/common/toolbox-field/row/operation-row/Index.vue').default; FunController: typeof import('@components/function-controller/FunController.vue').default; MoreActionExtend: typeof import('@components/more-action-extend/Index.vue').default; ScrollFaker: typeof import('@components/scroll-faker/Index.vue').default; diff --git a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/hybrid-host-column/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/hybrid-host-column/Index.vue index 1ddf2e8215..c107d7c772 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/hybrid-host-column/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/hybrid-host-column/Index.vue @@ -12,13 +12,13 @@ --> - +
@@ -55,8 +55,8 @@ {{ t(placeholder) }}
- - + + - - + @@ -49,8 +49,8 @@ type="host-select" @click="handleShowSelector" /> - - + + - - + @@ -43,8 +43,8 @@ type="host-select" @click="handleShowSelector" /> - - + + + + + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/Create.vue b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/Create.vue index cac1f165fe..32a17e9c79 100644 --- a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/Create.vue +++ b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/Create.vue @@ -21,12 +21,12 @@ class="mb-20" form-type="vertical" :model="formData"> - - - - + + - +