From aac569a9259ede43399e0ed5d668e936b984d6dd Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 11 Nov 2025 00:15:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E7=BA=BF=E6=8A=A5id=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/certd-client/src/components/vip-button/index.vue | 8 ++++++-- packages/ui/certd-client/src/locales/langs/en-US/vip.ts | 2 ++ packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts | 2 ++ packages/ui/certd-client/src/views/certd/pipeline/api.ts | 2 +- .../src/views/certd/pipeline/certd-form/use.tsx | 2 +- .../src/views/certd/pipeline/pipeline/type.ts | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) 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 2abbde53..246020e3 100644 --- a/packages/ui/certd-client/src/components/vip-button/index.vue +++ b/packages/ui/certd-client/src/components/vip-button/index.vue @@ -374,8 +374,8 @@ function openUpgrade() {
{t("vip.current")} {vipLabel} {t("vip.activated_expire_time")} {settingStore.expiresText} - - 没有生效? + + {t("vip.learn_more")}
); @@ -449,6 +449,10 @@ function openUpgrade() {
{t("vip.site_id")}: + + + {t("vip.not_effective")} +
{plusInfo} diff --git a/packages/ui/certd-client/src/locales/langs/en-US/vip.ts b/packages/ui/certd-client/src/locales/langs/en-US/vip.ts index 06d2eccd..39ebd640 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/vip.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/vip.ts @@ -98,4 +98,6 @@ export default { already_comm: "Already Business Edition, can't change to Professional Edition", already_perpetual_plus: "You already have a perpetual Professional Edition, can't upgrade", confirm: "Confirm", + not_effective: "Not effective?", + learn_more: "More privileges", }; diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts index d65b99e0..a7b12c3f 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/vip.ts @@ -97,4 +97,6 @@ export default { already_comm: "已经是商业版了,不能降级为专业版", already_perpetual_plus: "您已经是永久专业版了,无法继续升级", confirm: "确认", + not_effective: "没有生效?", + learn_more: "更多特权(加VIP群等)", }; diff --git a/packages/ui/certd-client/src/views/certd/pipeline/api.ts b/packages/ui/certd-client/src/views/certd/pipeline/api.ts index c501aaff..1d2d7f66 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/api.ts +++ b/packages/ui/certd-client/src/views/certd/pipeline/api.ts @@ -62,7 +62,7 @@ export async function GetDetail(id: any) { }); } -export async function Save(pipelineEntity: any) { +export async function Save(pipelineEntity: any): Promise<{ id: number; version: number }> { return await request({ url: apiPrefix + "/save", method: "post", diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx index 3b3d4b0f..66764cfd 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/use.tsx @@ -367,7 +367,7 @@ export function useCertPipelineCreator() { pipeline = setRunnableIds(pipeline); const groupId = form.groupId; - const id = await api.Save({ + const { id } = await api.Save({ title: pipeline.title, content: JSON.stringify(pipeline), keepHistoryCount: 30, diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts index 409a9768..af1c975d 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts @@ -16,7 +16,7 @@ export type RunHistory = { export type PipelineOptions = { doTrigger(options: { pipelineId: number; stepId?: string }): Promise; - doSave(pipelineConfig: Pipeline): Promise; + doSave(pipelineConfig: Pipeline): Promise<{ id: number; version: number }>; getPipelineDetail(query: { pipelineId: number }): Promise; getHistoryList(query: { pipelineId: number }): Promise; getHistoryDetail(query: { historyId: number }): Promise;