From bdb3d09c09fc73e7e5e3401f6ef5588bf8ad5088 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sun, 17 May 2026 00:29:36 +0800 Subject: [PATCH] =?UTF-8?q?perf(suite):=20=E5=95=86=E4=B8=9A=E7=89=88?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=B7=B2=E8=B4=AD=E5=A5=97=E9=A4=90=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/locales/langs/en-US/certd/common.ts | 3 + .../src/locales/langs/en-US/certd/suite.ts | 1 + .../src/locales/langs/zh-CN/certd/common.ts | 3 + .../src/locales/langs/zh-CN/certd/suite.ts | 1 + .../src/views/sys/suite/user-suite/crud.tsx | 76 +++++++++++++++---- 5 files changed, 70 insertions(+), 14 deletions(-) diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd/common.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd/common.ts index a9401229a..39c78dac4 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd/common.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd/common.ts @@ -40,6 +40,9 @@ export default { basicInfo: "Basic Information", disabled: "Disabled", enabled: "Enabled", + enabledLabel: "Enabled", + normal: "Normal", + used_up: "Used up", default: "Default", success: "Success", test: "Test", diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd/suite.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd/suite.ts index 414bd2798..984315eac 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd/suite.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd/suite.ts @@ -33,6 +33,7 @@ export default { pipeline_count: "Pipeline Count", unit_item: "items", deploy_count: "Deploy Count", + deploy_count_used: "Used Deploy Count", unit_times: "times", monitor_count: "Certificate Monitor Count", duration: "Duration", diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd/common.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd/common.ts index 76874ac62..c68b5d3fb 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd/common.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd/common.ts @@ -44,6 +44,9 @@ export default { basicInfo: "基础信息", disabled: "禁用", enabled: "启用", + enabledLabel: "启用", + normal: "正常", + used_up: "已用完", default: "默认", success: "成功", test: "测试", diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd/suite.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd/suite.ts index 0c3578a60..12186ea6e 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd/suite.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd/suite.ts @@ -33,6 +33,7 @@ export default { pipeline_count: "流水线数量", unit_item: "条", deploy_count: "部署次数", + deploy_count_used: "已用部署次数", unit_times: "次", monitor_count: "证书监控数量", duration: "时长", diff --git a/packages/ui/certd-client/src/views/sys/suite/user-suite/crud.tsx b/packages/ui/certd-client/src/views/sys/suite/user-suite/crud.tsx index 3ab6ca276..96a3cdf1b 100644 --- a/packages/ui/certd-client/src/views/sys/suite/user-suite/crud.tsx +++ b/packages/ui/certd-client/src/views/sys/suite/user-suite/crud.tsx @@ -1,6 +1,5 @@ import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud"; import { sysUserSuiteApi } from "./api"; -import { useRouter } from "vue-router"; import SuiteValueEdit from "/@/views/sys/suite/product/suite-value-edit.vue"; import SuiteValue from "/@/views/sys/suite/product/suite-value.vue"; import DurationValue from "/@/views/sys/suite/product/duration-value.vue"; @@ -33,8 +32,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat return res; }; - const router = useRouter(); - return { crudOptions: { request: { @@ -71,7 +68,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat buttons: { view: { show: true }, copy: { show: false }, - edit: { show: false }, + edit: { show: true }, remove: { show: true }, // continue:{ // text:"续期", @@ -107,7 +104,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat show: true, }, form: { - show: false, + rules: [{ required: true, message: t("certd.field_required") }], }, column: { width: 200, @@ -127,7 +124,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat label: "nickName", }), form: { + show: true, component: { + disabled: true, crossPage: true, multiple: false, select: { @@ -183,7 +182,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat ], }), form: { - show: false, + show: true, + component: { + disabled: true, + }, }, column: { width: 80, @@ -204,7 +206,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat title: t("certd.domain_count"), type: "text", form: { - show: false, key: ["content", "maxDomainCount"], component: { name: SuiteValueEdit, @@ -227,7 +228,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat title: t("certd.wildcardDomainCountPart"), type: "text", form: { - show: false, key: ["content", "maxWildcardDomainCount"], component: { name: SuiteValueEdit, @@ -250,7 +250,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat title: t("certd.pipeline_count"), type: "text", form: { - show: false, key: ["content", "maxPipelineCount"], component: { name: SuiteValueEdit, @@ -273,7 +272,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat title: t("certd.deploy_count"), type: "text", form: { - show: false, key: ["content", "maxDeployCount"], component: { name: SuiteValueEdit, @@ -299,7 +297,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat title: t("certd.monitor_count"), type: "text", form: { - show: false, key: ["content", "maxMonitorCount"], component: { name: SuiteValueEdit, @@ -321,7 +318,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat duration: { title: t("certd.duration"), type: "text", - form: { show: false }, + form: { + rules: [{ required: true, message: t("certd.field_required") }], + }, column: { component: { name: DurationValue, @@ -365,7 +364,13 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat title: t("certd.expires_time"), type: "date", form: { - show: false, + valueBuilder: ({ value }) => { + return dayjs(value); + }, + valueResolve: ({ value }) => { + //今天的最后一秒 + return dayjs(value).endOf("day").valueOf(); + }, }, column: { width: 150, @@ -390,13 +395,56 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat }), form: { value: true, - show: false, }, column: { width: 100, align: "center", }, }, + deployCountUsed: { + title: t("certd.deploy_count_used"), + type: "number", + form: { + value: 0, + rules: [{ required: true, message: t("certd.field_required") }], + }, + column: { + show: false, + }, + }, + disabled: { + title: t("certd.disabled"), + type: "dict-switch", + dict: dict({ + data: [ + { label: t("certd.enabledLabel"), value: false, color: "success" }, + { label: t("certd.disabledLabel"), value: true, color: "error" }, + ], + }), + form: { + value: false, + }, + column: { + width: 100, + align: "center", + }, + }, + isEmpty: { + title: t("certd.status"), + type: "dict-switch", + dict: dict({ + data: [ + { label: t("certd.normal"), value: false, color: "success" }, + { label: t("certd.used_up"), value: true, color: "gray" }, + ], + }), + form: { + value: false, + }, + column: { + show: false, + }, + }, createTime: { title: t("certd.createTime"), type: "datetime",