Merge branch 'codex/v2-persist-01' into v2-invite

packages/ui/certd-client/src/views/sys/plugin/config-common.vue

@@ -6,7 +6,7 @@
 
     <div class="sys-plugin-config settings-form">
       <a-form :model="formState" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onFinish" @finish-failed="onFinishFailed">
-        <a-form-item label="公共Google EAB授权" :name="['CertApply', 'sysSetting', 'input', 'googleCommonEabAccessId']">
+        <a-form-item v-show="false" label="公共Google EAB授权" :name="['CertApply', 'sysSetting', 'input', 'googleCommonEabAccessId']">
           <access-selector v-model:model-value="formState.CertApply.sysSetting.input.googleCommonEabAccessId" type="eab" from="sys"></access-selector>
           <div class="helper">
             <div>设置公共Google EAB授权给用户使用，避免用户自己去翻墙获取Google EAB授权</div>
@@ -16,7 +16,14 @@
           </div>
         </a-form-item>
 
-        <a-form-item label="公共ZeroSSL EAB授权" :name="['CertApply', 'sysSetting', 'input', 'zerosslCommonEabAccessId']">
+        <a-form-item label="公共Google ACME账号" :name="['CertApply', 'sysSetting', 'input', 'googleCommonAcmeAccountAccessId']">
+          <access-selector v-model:model-value="formState.CertApply.sysSetting.input.googleCommonAcmeAccountAccessId" type="acmeAccount" subtype="google" from="sys"></access-selector>
+          <div class="helper">
+            <div>优先推荐配置公共ACME账号。配置后普通用户申请Google证书时无需选择账号，也不会重复消费公共EAB。</div>
+          </div>
+        </a-form-item>
+
+        <a-form-item v-show="false" label="公共ZeroSSL EAB授权" :name="['CertApply', 'sysSetting', 'input', 'zerosslCommonEabAccessId']">
           <access-selector v-model:model-value="formState.CertApply.sysSetting.input.zerosslCommonEabAccessId" type="eab" from="sys"></access-selector>
           <div class="helper">
             <div>设置公共ZeroSSL EAB授权给用户使用，避免用户自己去翻墙获取Zero EAB授权</div>
@@ -26,7 +33,11 @@
           </div>
         </a-form-item>
 
-        <a-form-item label="公共litessl EAB授权" :name="['CertApply', 'sysSetting', 'input', 'litesslCommonEabAccessId']">
+        <a-form-item label="公共ZeroSSL ACME账号" :name="['CertApply', 'sysSetting', 'input', 'zerosslCommonAcmeAccountAccessId']">
+          <access-selector v-model:model-value="formState.CertApply.sysSetting.input.zerosslCommonAcmeAccountAccessId" type="acmeAccount" subtype="zerossl" from="sys"></access-selector>
+        </a-form-item>
+
+        <a-form-item v-show="false" label="公共litessl EAB授权" :name="['CertApply', 'sysSetting', 'input', 'litesslCommonEabAccessId']">
           <access-selector v-model:model-value="formState.CertApply.sysSetting.input.litesslCommonEabAccessId" type="eab" from="sys"></access-selector>
           <div class="helper">
             <div>设置公共litessl EAB授权给用户使用，避免用户自己获取litessl EAB授权</div>
@@ -36,6 +47,10 @@
           </div>
         </a-form-item>
 
+        <a-form-item label="公共litessl ACME账号" :name="['CertApply', 'sysSetting', 'input', 'litesslCommonAcmeAccountAccessId']">
+          <access-selector v-model:model-value="formState.CertApply.sysSetting.input.litesslCommonAcmeAccountAccessId" type="acmeAccount" subtype="litessl" from="sys"></access-selector>
+        </a-form-item>
+
         <a-form-item label="其他配置">
           <a-button type="primary" @click="doPluginConfig">证书申请插件默认值设置</a-button>
           <div class="helper">

packages/ui/certd-client/src/views/sys/suite/product/duration-value.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-tag color="green"> {{ durationDict.dataMap[modelValue]?.label }}</a-tag>
+  <a-tag color="green"> {{ durationDict.dataMap[modelValue]?.label || modelValue + "天" }}</a-tag>
 </template>
 
 <script lang="ts" setup>

packages/ui/certd-client/src/views/sys/suite/user-suite/crud.tsx

@@ -123,10 +123,15 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             value: "id",
             label: "nickName",
           }),
+          editForm: {
+            component: {
+              disabled: true,
+            },
+          },
           form: {
             show: true,
             component: {
-              disabled: true,
+              disabled: false,
               crossPage: true,
               multiple: false,
               select: {
@@ -170,11 +175,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         productType: {
           title: t("certd.type"),
           type: "dict-select",
-          editForm: {
-            component: {
-              disabled: true,
-            },
-          },
           dict: dict({
             data: [
               { label: t("certd.package"), value: "suite", color: "green" },
@@ -182,7 +182,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             ],
           }),
           form: {
-            show: true,
+            show: false,
             component: {
               disabled: true,
             },
@@ -205,6 +205,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         "content.maxDomainCount": {
           title: t("certd.domain_count"),
           type: "text",
+          addForm: {
+            show: false,
+          },
           form: {
             key: ["content", "maxDomainCount"],
             component: {
@@ -227,6 +230,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         "content.maxWildcardDomainCount": {
           title: t("certd.wildcardDomainCountPart"),
           type: "text",
+          addForm: {
+            show: false,
+          },
           form: {
             key: ["content", "maxWildcardDomainCount"],
             component: {
@@ -249,6 +255,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         "content.maxPipelineCount": {
           title: t("certd.pipeline_count"),
           type: "text",
+          addForm: {
+            show: false,
+          },
           form: {
             key: ["content", "maxPipelineCount"],
             component: {
@@ -271,6 +280,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         "content.maxDeployCount": {
           title: t("certd.deploy_count"),
           type: "text",
+          addForm: {
+            show: false,
+          },
           form: {
             key: ["content", "maxDeployCount"],
             component: {
@@ -296,6 +308,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         "content.maxMonitorCount": {
           title: t("certd.monitor_count"),
           type: "text",
+          addForm: {
+            show: false,
+          },
           form: {
             key: ["content", "maxMonitorCount"],
             component: {
@@ -317,7 +332,10 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         },
         duration: {
           title: t("certd.duration"),
-          type: "text",
+          type: "number",
+          addForm: {
+            show: false,
+          },
           form: {
             rules: [{ required: true, message: t("certd.field_required") }],
           },
@@ -363,6 +381,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         expiresTime: {
           title: t("certd.expires_time"),
           type: "date",
+          addForm: {
+            show: false,
+          },
           form: {
             valueBuilder: ({ value }) => {
               return dayjs(value);
@@ -393,6 +414,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               { label: t("certd.is_present_no"), value: false, color: "blue" },
             ],
           }),
+          addForm: {
+            show: false,
+          },
           form: {
             value: true,
           },
@@ -404,6 +428,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         deployCountUsed: {
           title: t("certd.deploy_count_used"),
           type: "number",
+          addForm: {
+            show: false,
+          },
           form: {
             value: 0,
             rules: [{ required: true, message: t("certd.field_required") }],