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 adde7fb35..de5b334dc 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 @@ -85,7 +85,7 @@ export function useCertPipelineCreator() { const settingStore = useSettingStore(); const router = useRouter(); - function createCrudOptions(req: { certPlugin: any; doSubmit: any; title?: string }): CreateCrudOptionsRet { + function createCrudOptions(req: { certPlugin: any; doSubmit: any; title?: string; initialForm?: any }): CreateCrudOptionsRet { const inputs: any = {}; const moreParams = []; const doSubmit = req.doSubmit; @@ -124,9 +124,11 @@ export function useCertPipelineCreator() { }, }, }); + return { crudOptions: { form: { + initialForm: req.initialForm || {}, doSubmit, wrapper: { wrapClassName: "cert_pipeline_create_form", @@ -326,6 +328,15 @@ export function useCertPipelineCreator() { //检查是否流水线数量超出限制 await checkPipelineLimit(); + //设置系统初始值 + const initialForm: any = {}; + const pluginSysConfig = await pluginStore.getPluginConfig({ name: req.pluginName, type: "builtIn" }); + if (pluginSysConfig.sysSetting?.input) { + for (const key in pluginSysConfig.sysSetting?.input) { + initialForm[key] = pluginSysConfig.sysSetting?.input[key]; + } + } + async function doSubmit({ form }: any) { // const certDetail = readCertDetail(form.cert.crt); // 添加certd pipeline @@ -399,6 +410,7 @@ export function useCertPipelineCreator() { certPlugin, doSubmit, title: req.title, + initialForm, }); //@ts-ignore crudOptions.columns.groupId.form.value = req.defaultGroupId || undefined; diff --git a/packages/ui/certd-client/src/views/sys/plugin/crud.tsx b/packages/ui/certd-client/src/views/sys/plugin/crud.tsx index 496768aca..4ac327fc6 100644 --- a/packages/ui/certd-client/src/views/sys/plugin/crud.tsx +++ b/packages/ui/certd-client/src/views/sys/plugin/crud.tsx @@ -178,6 +178,9 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat type: "dict-select", search: { show: true, + component: { + disabled: false, + }, }, form: { order: 0, diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts index c7ad13f5e..581724af4 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/apply.ts @@ -275,6 +275,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { mergeScript: ` return { show: ctx.compute(({form})=>{ + console.log("show",form) return (form.sslProvider === 'zerossl' && !form.zerosslCommonEabAccessId) || (form.sslProvider === 'google' && !form.googleCommonEabAccessId) || (form.sslProvider === 'sslcom' && !form.sslcomCommonEabAccessId)