diff --git a/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/scheduler/DefaultCommandScheduler.java b/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/scheduler/DefaultCommandScheduler.java index d232c6a8b6f236fc87cf91025db097e18ca53b0b..546847bcf1e68e013b0efdd6100d4b28fb501161 100644 --- a/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/scheduler/DefaultCommandScheduler.java +++ b/bigtop-manager-agent/src/main/java/org/apache/bigtop/manager/agent/scheduler/DefaultCommandScheduler.java @@ -18,20 +18,17 @@ */ package org.apache.bigtop.manager.agent.scheduler; +import jakarta.annotation.PostConstruct; +import lombok.extern.slf4j.Slf4j; import org.apache.bigtop.manager.agent.executor.CommandExecutor; import org.apache.bigtop.manager.agent.executor.CommandExecutors; import org.apache.bigtop.manager.common.message.entity.command.CommandRequestMessage; +import org.springframework.stereotype.Component; import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; -import jakarta.annotation.PostConstruct; - -import org.springframework.stereotype.Component; - -import lombok.extern.slf4j.Slf4j; - @Slf4j @Component public class DefaultCommandScheduler implements CommandScheduler { diff --git a/bigtop-manager-ui/src/components/job-info/job.vue b/bigtop-manager-ui/src/components/job-info/job.vue index 85eb934737fd0a13f67feebab6f9cf725e0aa710..14082de02203e2268129147f11d1233b100b667d 100644 --- a/bigtop-manager-ui/src/components/job-info/job.vue +++ b/bigtop-manager-ui/src/components/job-info/job.vue @@ -21,6 +21,7 @@ import { ref, watch, computed, reactive, toRaw, toRefs } from 'vue' import { useClusterStore } from '@/store/cluster' import { PaginationConfig } from 'ant-design-vue/es/pagination/Pagination' + import { CopyOutlined } from '@ant-design/icons-vue' import { storeToRefs } from 'pinia' import { message } from 'ant-design-vue' import { @@ -30,7 +31,7 @@ OuterData, Pagination } from '@/api/job/types.ts' - import { getLogs } from '@/api/sse/index' + import { getLogs } from '@/api/sse' import { getJobs } from '@/api/job' import { Pausable, useIntervalFn } from '@vueuse/core' import { AxiosProgressEvent } from 'axios' @@ -339,11 +340,14 @@ Task Logs
- {{ $t('commom.copy') }} + + {{ $t('common.copy') }}
@@ -371,6 +375,10 @@ margin: 0 0 10px 0; display: flex; justify-content: space-between; + + .copy-button { + margin-left: 3px; + } } &_info { height: 100%; diff --git a/bigtop-manager-ui/src/components/service-add/install.vue b/bigtop-manager-ui/src/components/service-add/install.vue index d9aeae6035ad11d8e17bc3a40829eb9bc018df2d..dc4bfafa6f9a838d11f0374e4631e617aaac96c2 100644 --- a/bigtop-manager-ui/src/components/service-add/install.vue +++ b/bigtop-manager-ui/src/components/service-add/install.vue @@ -26,6 +26,7 @@ import { useClusterStore } from '@/store/cluster' import { storeToRefs } from 'pinia' import { JobVO, StageVO } from '@/api/job/types' + import CustomProgress from '@/components/job-info/custom-progress.vue' import Job from '@/components/job-info/job.vue' const serviceInfo = defineModel('serviceInfo') diff --git a/bigtop-manager-ui/src/locales/en_US/common.ts b/bigtop-manager-ui/src/locales/en_US/common.ts index a39621fa396515b4f1cd2ccc7a20735871ef1240..f2bccb4649bffcdea851ddb555f8a2937e8dbf2c 100644 --- a/bigtop-manager-ui/src/locales/en_US/common.ts +++ b/bigtop-manager-ui/src/locales/en_US/common.ts @@ -56,7 +56,7 @@ export default { create_time: 'Create Time', update_time: 'Update Time', notification: 'Notification', - copy: 'copy', + copy: 'Copy', copy_success: 'Copy success!', copy_fail: 'Copy failed!' }