diff --git a/dbm-ui/frontend/src/components/editable-table/Index.vue b/dbm-ui/frontend/src/components/editable-table/Index.vue index f443a99719..da5d0f354e 100644 --- a/dbm-ui/frontend/src/components/editable-table/Index.vue +++ b/dbm-ui/frontend/src/components/editable-table/Index.vue @@ -67,6 +67,7 @@ import Input from './edit/Input.vue'; import Select from './edit/Select.vue'; import TagInput from './edit/TagInput.vue'; + import Text from './edit/Text.vue'; import Textarea from './edit/Textarea.vue'; import TimePicker from './edit/TimePicker.vue'; import useResize from './hooks/use-resize'; @@ -112,7 +113,7 @@ } & Expose > = Symbol.for('bk-editable-table'); - export { Block, Column, DatePicker, Input, Row, Select, TagInput, Textarea, TimePicker, useColumn, useTable }; + export { Block, Column, DatePicker, Input, Row, Select, TagInput, Text, Textarea, TimePicker, useColumn, useTable }; 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 new file mode 100644 index 0000000000..4da4f6c886 --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/hybrid-host-column/Index.vue @@ -0,0 +1,230 @@ + + + + + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/multiple-host-column/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/multiple-host-column/Index.vue new file mode 100644 index 0000000000..4453fe25e4 --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/multiple-host-column/Index.vue @@ -0,0 +1,233 @@ + + + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/operation-column/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/operation-column/Index.vue similarity index 100% rename from dbm-ui/frontend/src/views/db-manage/common/toolbox-field/operation-column/Index.vue rename to dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/operation-column/Index.vue diff --git a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/single-host-column/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/single-host-column/Index.vue new file mode 100644 index 0000000000..99b6cd6b66 --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/column/single-host-column/Index.vue @@ -0,0 +1,152 @@ + + + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/backup-source/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/backup-source/Index.vue new file mode 100644 index 0000000000..e3c82ba1bb --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/backup-source/Index.vue @@ -0,0 +1,28 @@ + + + diff --git a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/ignore-biz/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/ignore-biz/Index.vue new file mode 100644 index 0000000000..c51851dbce --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/ignore-biz/Index.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/ticket-remark/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/ticket-remark/Index.vue new file mode 100644 index 0000000000..e3367910ba --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/common/toolbox-field/form-item/ticket-remark/Index.vue @@ -0,0 +1,18 @@ + + + diff --git a/dbm-ui/frontend/src/views/db-manage/doris/common/shrink/Index.vue b/dbm-ui/frontend/src/views/db-manage/doris/common/shrink/Index.vue index 25518ac960..c71a0172c1 100644 --- a/dbm-ui/frontend/src/views/db-manage/doris/common/shrink/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/doris/common/shrink/Index.vue @@ -301,7 +301,6 @@ ip: hostItem.ip, bk_cloud_id: hostItem.bk_cloud_id, bk_host_id: hostItem.bk_host_id, - bk_biz_id: bizId, })); const generateExtInfo = () => Object.entries(nodeInfoMap).reduce((results, [key, item]) => { @@ -327,8 +326,7 @@ bk_biz_id: bizId, details: { cluster_id: props.data.id, - ip_source: 'manual_input', - nodes: { + old_nodes: { hot: fomatHost(nodeInfoMap.hot.nodeList), cold: fomatHost(nodeInfoMap.cold.nodeList), observer: fomatHost(nodeInfoMap.observer.nodeList), diff --git a/dbm-ui/frontend/src/views/db-manage/elastic-search/common/shrink/Index.vue b/dbm-ui/frontend/src/views/db-manage/elastic-search/common/shrink/Index.vue index 283a89de26..a94b44b4b0 100644 --- a/dbm-ui/frontend/src/views/db-manage/elastic-search/common/shrink/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/elastic-search/common/shrink/Index.vue @@ -53,6 +53,8 @@ import { useGlobalBizs } from '@stores'; + import { TicketTypes } from '@common/const'; + import HostShrink, { type TShrinkNode, } from '@views/db-manage/common/host-shrink/Index.vue'; @@ -307,12 +309,12 @@ }, {} as Record); return createTicket({ - ticket_type: 'ES_SHRINK', + ticket_type: TicketTypes.ES_SHRINK, bk_biz_id: bizId, details: { cluster_id: props.data.id, ip_source: 'manual_input', - nodes: { + old_nodes: { hot: fomatHost(nodeInfoMap.hot.nodeList), cold: fomatHost(nodeInfoMap.cold.nodeList), client: fomatHost(nodeInfoMap.client.nodeList), diff --git a/dbm-ui/frontend/src/views/db-manage/hdfs/common/shrink/Index.vue b/dbm-ui/frontend/src/views/db-manage/hdfs/common/shrink/Index.vue index 9e557f98b5..0998bb8539 100644 --- a/dbm-ui/frontend/src/views/db-manage/hdfs/common/shrink/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/hdfs/common/shrink/Index.vue @@ -50,6 +50,8 @@ import { useGlobalBizs } from '@stores'; + import { TicketTypes } from '@common/const'; + import HostShrink, { type TShrinkNode, } from '@views/db-manage/common/host-shrink/Index.vue'; @@ -232,12 +234,11 @@ }, {} as Record); createTicket({ - ticket_type: 'HDFS_SHRINK', + ticket_type: TicketTypes.HDFS_SHRINK, bk_biz_id: bizId, details: { cluster_id: props.data.id, - ip_source: 'manual_input', - nodes: { + old_nodes: { [nodeType.value]: fomatHost(nodeInfoMap.datanode.nodeList), }, ext_info: generateExtInfo(), diff --git a/dbm-ui/frontend/src/views/db-manage/kafka/common/shrink/Index.vue b/dbm-ui/frontend/src/views/db-manage/kafka/common/shrink/Index.vue index ab97482171..6eda649da6 100644 --- a/dbm-ui/frontend/src/views/db-manage/kafka/common/shrink/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/kafka/common/shrink/Index.vue @@ -209,7 +209,6 @@ ip: hostItem.ip, bk_cloud_id: hostItem.bk_cloud_id, bk_host_id: hostItem.bk_host_id, - bk_biz_id: bizId, })); const generateExtInfo = () => Object.entries(nodeInfoMap).reduce((results, [key, item]) => { @@ -235,8 +234,7 @@ bk_biz_id: bizId, details: { cluster_id: props.data.id, - ip_source: 'manual_input', - nodes: { + old_nodes: { broker: fomatHost(nodeInfoMap.broker.nodeList), }, ext_info: generateExtInfo(), 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 new file mode 100644 index 0000000000..27d1ed6e12 --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/Create.vue @@ -0,0 +1,213 @@ + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/Index.vue b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/Index.vue new file mode 100644 index 0000000000..7d5a04e740 --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_ADD_SLAVE/Index.vue @@ -0,0 +1,32 @@ + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/Create.vue b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/Create.vue new file mode 100644 index 0000000000..b46351505c --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/Create.vue @@ -0,0 +1,175 @@ + + + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/Index.vue b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/Index.vue new file mode 100644 index 0000000000..7d5a04e740 --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/Index.vue @@ -0,0 +1,32 @@ + + + + diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/components/ClusterColumn.vue b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/components/ClusterColumn.vue new file mode 100644 index 0000000000..3d4e5704ca --- /dev/null +++ b/dbm-ui/frontend/src/views/db-manage/mysql/MYSQL_MIGRATE_CLUSTER/components/ClusterColumn.vue @@ -0,0 +1,147 @@ + + +