diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx index 7b006f4c..7b83032d 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx @@ -13,7 +13,8 @@ import { useSettingStore } from "/@/store/modules/settings"; import _ from "lodash-es"; import { useModal } from "/@/use/use-modal"; import CertView from "./cert-view.vue"; -import { eachRunnable, eachStages } from "./utils"; +import { eachStages } from "./utils"; + export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOptionsProps): CreateCrudOptionsRet { const router = useRouter(); const { t } = useI18n(); diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue index 70e69d7c..6066f745 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue @@ -264,7 +264,7 @@ import _ from "lodash-es"; import { message, Modal, notification } from "ant-design-vue"; import { nanoid } from "nanoid"; import { PipelineDetail, PipelineOptions, PluginGroups, RunHistory } from "./type"; -import type { Runnable } from "@certd/pipeline"; +import type { Runnable, Stage } from "@certd/pipeline"; import PiHistoryTimelineItem from "/@/views/certd/pipeline/pipeline/component/history-timeline-item.vue"; import { FsIcon } from "@fast-crud/fast-crud"; import { useSettingStore } from "/@/store/modules/settings"; @@ -633,6 +633,12 @@ export default defineComponent({ } pipeline.value.version++; currentPipeline.value = pipeline.value; + + //移除空阶段 + _.remove(pipeline.value.stages, (item: Stage) => { + return item.tasks.length === 0; + }); + await props.options.doSave(pipeline.value); } toggleEditMode(false); diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts index 54c8c1ed..a655b5fd 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts @@ -4,6 +4,7 @@ export type StatusEnumItem = { color: string; icon: string; spin?: boolean; + iconSpin?: boolean; }; export type StatusEnumType = { [key: string]: StatusEnumItem; @@ -34,13 +35,13 @@ const StatusEnum: StatusEnumType = { label: "运行中", color: "blue", spin: true, + iconSpin: true, icon: "ant-design:sync-outlined" }, canceled: { value: "canceled", label: "已取消", color: "yellow", - spin: true, icon: "ant-design:minus-circle-twotone" }, none: {