diff --git a/packages/ui/certd-client/src/components/vip-button/index.vue b/packages/ui/certd-client/src/components/vip-button/index.vue index 246020e37..dd7242443 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -349,6 +349,7 @@ function openUpgrade() { } const modalRef = modal.success({ title, + class: "vip-modal", maskClosable: true, okText: t("vip.close"), width: 1100, @@ -371,10 +372,11 @@ function openUpgrade() { let plusInfo: any = ""; if (isPlus) { plusInfo = ( -
- {t("vip.current")} {vipLabel} {t("vip.activated_expire_time")} - {settingStore.expiresText} - +
+ + {t("vip.current")} {vipLabel} {t("vip.activated_expire_time")} {settingStore.expiresText} + + {t("vip.learn_more")}
@@ -385,9 +387,9 @@ function openUpgrade() { for (const key in vipTypeDefine) { // @ts-ignore const item = vipTypeDefine[key]; - const vipBlockClass = `vip-block ${key === settingStore.plusInfo.vipType ? "current" : ""}`; + const vipBlockClass = `vip-block ${key === settingStore.plusInfo.vipType ? "current" : ""}`; slots.push( - +

{item.title} @@ -413,17 +415,15 @@ function openUpgrade() { - +

); } return ( @@ -446,18 +446,15 @@ function openUpgrade() { {slots}
- {plusInfo} -
- {t("vip.have_activation_code")} +
+ {t("vip.have_activation_code")} {t("vip.manual_activation")} @@ -478,6 +475,11 @@ onMounted(() => { diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts index bdb0fa9b3..1d06f9f7f 100644 --- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts +++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts @@ -138,8 +138,10 @@ export class PipelineService extends BaseService { } // @ts-ignore item.stepCount = stepCount; - // @ts-ignore - item.triggerCount = pipeline.triggers?.length; + if(item.triggerCount == 0 ){ + item.triggerCount = pipeline.triggers?.length; + } + delete item.content; }