diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json index 16f3e6982b..c7cbe820f1 100644 --- a/dbm-ui/frontend/package.json +++ b/dbm-ui/frontend/package.json @@ -18,7 +18,7 @@ "@blueking/ip-selector": "0.0.1-beta.116", "@vueuse/core": "10.2.1", "axios": "1.2.1", - "bkui-vue": "0.0.2-beta.21", + "bkui-vue": "0.0.2-beta.25", "date-fns": "2.28.0", "dayjs": "1.11.9", "html-to-image": "1.11.3", diff --git a/dbm-ui/frontend/src/components/apply-items/SpecSelector.vue b/dbm-ui/frontend/src/components/apply-items/SpecSelector.vue index f93292df89..482351feac 100644 --- a/dbm-ui/frontend/src/components/apply-items/SpecSelector.vue +++ b/dbm-ui/frontend/src/components/apply-items/SpecSelector.vue @@ -1,65 +1,79 @@ diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index 96262e24c6..1c7e595586 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -2033,5 +2033,6 @@ "只允许数字、大小写字母开头和结尾,或%结尾": "只允许数字、大小写字母开头和结尾,或%结尾", "不能是系统库": "不能是系统库", "请先输入源集群": "请先输入源集群", + "刷新获取最新资源规格": "刷新获取最新资源规格", "这行勿动!新增翻译请在上一行添加!": "" } \ No newline at end of file diff --git a/dbm-ui/frontend/src/views/es-manage/apply/Index.vue b/dbm-ui/frontend/src/views/es-manage/apply/Index.vue index b4ccc8dc1d..987f056c96 100644 --- a/dbm-ui/frontend/src/views/es-manage/apply/Index.vue +++ b/dbm-ui/frontend/src/views/es-manage/apply/Index.vue @@ -377,7 +377,7 @@ remark: '', ticket_type: 'ES_APPLY', details: { - bk_cloud_id: '', + bk_cloud_id: 0, db_app_abbr: '', cluster_name: '', cluster_alias: '', diff --git a/dbm-ui/frontend/src/views/hdfs-manage/apply/Index.vue b/dbm-ui/frontend/src/views/hdfs-manage/apply/Index.vue index 32b036e630..d03e8ab1f5 100644 --- a/dbm-ui/frontend/src/views/hdfs-manage/apply/Index.vue +++ b/dbm-ui/frontend/src/views/hdfs-manage/apply/Index.vue @@ -360,7 +360,7 @@ bk_biz_id: '' as number | '', ticket_type: 'HDFS_APPLY', details: { - bk_cloud_id: '', + bk_cloud_id: 0, db_app_abbr: '', cluster_name: '', cluster_alias: '', diff --git a/dbm-ui/frontend/src/views/influxdb-manage/apply/common/base.ts b/dbm-ui/frontend/src/views/influxdb-manage/apply/common/base.ts index eefc8311b2..8917004cee 100644 --- a/dbm-ui/frontend/src/views/influxdb-manage/apply/common/base.ts +++ b/dbm-ui/frontend/src/views/influxdb-manage/apply/common/base.ts @@ -22,7 +22,7 @@ export const getInitFormdata = () => ({ ticket_type: 'INFLUXDB_APPLY', remark: '', details: { - bk_cloud_id: '', + bk_cloud_id: 0, ip_source: 'resource_pool', db_app_abbr: '', city_code: '', diff --git a/dbm-ui/frontend/src/views/influxdb-manage/apply/index.vue b/dbm-ui/frontend/src/views/influxdb-manage/apply/index.vue index af195123e5..3923030f97 100644 --- a/dbm-ui/frontend/src/views/influxdb-manage/apply/index.vue +++ b/dbm-ui/frontend/src/views/influxdb-manage/apply/index.vue @@ -103,7 +103,8 @@ :biz-id="formdata.bk_biz_id" :cloud-id="formdata.details.bk_cloud_id" cluster-type="influxdb" - machine-type="influxdb" /> + machine-type="influxdb" + style="width: 314px;" /> + copy(data.instance_address)} /> ), }, @@ -859,12 +860,12 @@ :deep(.instance-box) { display: flex; - align-items: center; + align-items: flex-start; padding: 8px 0; overflow: hidden; .instance-name { - line-height: 16px; + line-height: 20px; } .cluster-tags { @@ -878,6 +879,21 @@ margin: 2px; flex-shrink: 0; } + + .db-icon-copy { + display: none; + margin-left: 4px; + color: @primary-color; + cursor: pointer; + } + } + + :deep(tr) { + &:hover { + .db-icon-copy { + display: inline-block; + } + } } :deep(.is-offline) { diff --git a/dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue b/dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue index 89355988b5..472f048d74 100644 --- a/dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue +++ b/dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue @@ -328,7 +328,7 @@ remark: '', ticket_type: 'KAFKA_APPLY', details: { - bk_cloud_id: '', + bk_cloud_id: 0, db_app_abbr: '', cluster_name: '', cluster_alias: '', diff --git a/dbm-ui/frontend/src/views/mysql/apply/hooks/useMysqlData.ts b/dbm-ui/frontend/src/views/mysql/apply/hooks/useMysqlData.ts index 097cfe59e3..8d272190aa 100644 --- a/dbm-ui/frontend/src/views/mysql/apply/hooks/useMysqlData.ts +++ b/dbm-ui/frontend/src/views/mysql/apply/hooks/useMysqlData.ts @@ -40,7 +40,7 @@ const getFormData = (type: string) => ({ remark: '', ticket_type: type, details: { - bk_cloud_id: '', + bk_cloud_id: 0, city_code: '', db_app_abbr: '', spec: '', diff --git a/dbm-ui/frontend/src/views/pulsar-manage/apply/common/base.ts b/dbm-ui/frontend/src/views/pulsar-manage/apply/common/base.ts index c41e2e6832..30aaa7972b 100644 --- a/dbm-ui/frontend/src/views/pulsar-manage/apply/common/base.ts +++ b/dbm-ui/frontend/src/views/pulsar-manage/apply/common/base.ts @@ -26,7 +26,7 @@ export const getInitFormdata = () => ({ password: '', ip_source: 'resource_pool', db_version: '', - bk_cloud_id: '', + bk_cloud_id: 0, retention_hours: 1, replication_num: 2, ack_quorum: 1, diff --git a/dbm-ui/frontend/src/views/redis/apply/ApplyRedis.vue b/dbm-ui/frontend/src/views/redis/apply/ApplyRedis.vue index 7568a02013..06c189f76d 100644 --- a/dbm-ui/frontend/src/views/redis/apply/ApplyRedis.vue +++ b/dbm-ui/frontend/src/views/redis/apply/ApplyRedis.vue @@ -244,7 +244,8 @@ :biz-id="state.formdata.bk_biz_id" :cloud-id="state.formdata.details.bk_cloud_id" :cluster-type="typeInfos.cluster_type" - :machine-type="typeInfos.machine_type" /> + :machine-type="typeInfos.machine_type" + style="width: 314px;" /> (); const { t, locale } = useI18n(); + const copy = useCopy(); const route = useRoute(); const router = useRouter(); const globalBizsStore = useGlobalBizs(); @@ -225,6 +226,7 @@ : null } + copy(data.cluster_name)} /> ), }, { @@ -1014,6 +1016,13 @@ &__table { :deep(.cell) { line-height: unset !important; + + .db-icon-copy { + display: none; + margin-left: 4px; + color: @primary-color; + cursor: pointer; + } } :deep(.cluster-name-container) { diff --git a/dbm-ui/frontend/src/views/spider-manage/apply/Index.vue b/dbm-ui/frontend/src/views/spider-manage/apply/Index.vue index 0b21750992..2d2764ef12 100644 --- a/dbm-ui/frontend/src/views/spider-manage/apply/Index.vue +++ b/dbm-ui/frontend/src/views/spider-manage/apply/Index.vue @@ -143,7 +143,7 @@ remark: '', ticket_type: 'TENDBCLUSTER_APPLY', details: { - bk_cloud_id: '', + bk_cloud_id: 0, db_app_abbr: '', cluster_name: '', cluster_alias: '', @@ -265,7 +265,7 @@ color: #63656e; } - .resource-pool-item { + :deep(.resource-pool-item) { width: 655px; padding: 24px 0; background-color: #F5F7FA; diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/bigdata/DetailsES.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/bigdata/DetailsES.vue index 791656d6f9..c8e1ab0058 100644 --- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/bigdata/DetailsES.vue +++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/bigdata/DetailsES.vue @@ -103,7 +103,7 @@ theme="light"> + style="cursor: pointer;border-bottom: 1px dashed #979ba5;"> {{ masterSpec?.spec_name }}({{ `${masterSpec?.count} ${$t('台')}` }})