Merge remote-tracking branch 'origin/v2-dev' into v2-dev

pull/409/head
xiaojunnuo 2025-05-15 09:22:00 +08:00
commit 00b937e52a
4 changed files with 139 additions and 132 deletions

View File

@ -1,87 +1 @@
import { merge } from "lodash-es";
export function createCertDomainGetterInputDefine(opts?: { certInputKey?: string; props?: any }) {
const certInputKey = opts?.certInputKey || "cert";
return merge(
{
title: "当前证书域名",
component: {
name: "cert-domains-getter",
},
mergeScript: `
return {
component:{
inputKey: ctx.compute(({form})=>{
return form.${certInputKey}
}),
}
}
`,
required: true,
},
opts?.props
);
}
export function createRemoteSelectInputDefine(opts?: {
title: string;
certDomainsInputKey?: string;
accessIdInputKey?: string;
typeName?: string;
action: string;
type?: string;
watches?: string[];
helper?: string;
formItem?: any;
mode?: string;
multi?: boolean;
required?: boolean;
rules?: any;
mergeScript?: string;
}) {
const title = opts?.title || "请选择";
const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
const accessIdInputKey = opts?.accessIdInputKey || "accessId";
const typeName = opts?.typeName;
const action = opts?.action;
const type = opts?.type || "plugin";
const watches = opts?.watches || [];
const helper = opts?.helper || "请选择";
let mode = "tags";
if (opts.multi === false) {
mode = undefined;
} else {
mode = opts?.mode ?? "tags";
}
const item = {
title,
component: {
name: "remote-select",
vModel: "value",
mode,
type,
typeName,
action,
watches: [certDomainsInputKey, accessIdInputKey, ...watches],
},
rules: opts?.rules,
required: opts.required ?? true,
mergeScript:
opts.mergeScript ??
`
return {
component:{
form: ctx.compute(({form})=>{
return form
})
},
}
`,
helper,
};
return merge(item, opts?.formItem);
}
export * from "./util.js";

View File

@ -0,0 +1,85 @@
import { merge } from "lodash-es";
export function createCertDomainGetterInputDefine(opts?: { certInputKey?: string; props?: any }) {
const certInputKey = opts?.certInputKey || "cert";
return merge(
{
title: "当前证书域名",
component: {
name: "cert-domains-getter",
},
mergeScript: `
return {
component:{
inputKey: ctx.compute(({form})=>{
return form.${certInputKey}
}),
}
}
`,
required: true,
},
opts?.props
);
}
export function createRemoteSelectInputDefine(opts?: {
title: string;
certDomainsInputKey?: string;
accessIdInputKey?: string;
typeName?: string;
action: string;
type?: string;
watches?: string[];
helper?: string;
formItem?: any;
mode?: string;
multi?: boolean;
required?: boolean;
rules?: any;
mergeScript?: string;
}) {
const title = opts?.title || "请选择";
const certDomainsInputKey = opts?.certDomainsInputKey || "certDomains";
const accessIdInputKey = opts?.accessIdInputKey || "accessId";
const typeName = opts?.typeName;
const action = opts?.action;
const type = opts?.type || "plugin";
const watches = opts?.watches || [];
const helper = opts?.helper || "请选择";
let mode = "tags";
if (opts.multi === false) {
mode = undefined;
} else {
mode = opts?.mode ?? "tags";
}
const item = {
title,
component: {
name: "remote-select",
vModel: "value",
mode,
type,
typeName,
action,
watches: [certDomainsInputKey, accessIdInputKey, ...watches],
},
rules: opts?.rules,
required: opts.required ?? true,
mergeScript:
opts.mergeScript ??
`
return {
component:{
form: ctx.compute(({form})=>{
return form
})
},
}
`,
helper,
};
return merge(item, opts?.formItem);
}

View File

@ -24,7 +24,7 @@ export class FtpAccess extends BaseAccess {
host!: string;
@AccessInput({
title: "host",
title: "端口",
value: 21,
component: {
placeholder: "21",

View File

@ -46,7 +46,7 @@ importers:
packages/core/acme-client:
dependencies:
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../basic
'@peculiar/x509':
specifier: ^1.11.0
@ -207,10 +207,10 @@ importers:
packages/core/pipeline:
dependencies:
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../basic
'@certd/plus-core':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../pro/plus-core
dayjs:
specifier: ^1.11.7
@ -415,7 +415,7 @@ importers:
packages/libs/lib-k8s:
dependencies:
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/basic
'@kubernetes/client-node':
specifier: 0.21.0
@ -455,16 +455,16 @@ importers:
packages/libs/lib-server:
dependencies:
'@certd/acme-client':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/acme-client
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/basic
'@certd/pipeline':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/pipeline
'@certd/plus-core':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../pro/plus-core
'@midwayjs/cache':
specifier: ~3.14.0
@ -607,16 +607,16 @@ importers:
packages/plugins/plugin-cert:
dependencies:
'@certd/acme-client':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/acme-client
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/basic
'@certd/pipeline':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/pipeline
'@certd/plugin-lib':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../plugin-lib
'@google-cloud/publicca':
specifier: ^1.3.0
@ -689,10 +689,10 @@ importers:
specifier: ^3.787.0
version: 3.787.0(aws-crt@1.25.3)
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/basic
'@certd/pipeline':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/pipeline
'@kubernetes/client-node':
specifier: 0.21.0
@ -780,19 +780,19 @@ importers:
packages/pro/commercial-core:
dependencies:
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/basic
'@certd/lib-server':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../libs/lib-server
'@certd/pipeline':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/pipeline
'@certd/plugin-plus':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../plugin-plus
'@certd/plus-core':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../plus-core
'@midwayjs/core':
specifier: ~3.20.3
@ -877,22 +877,22 @@ importers:
specifier: ^1.0.2
version: 1.0.2
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/basic
'@certd/lib-k8s':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../libs/lib-k8s
'@certd/pipeline':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/pipeline
'@certd/plugin-cert':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../plugins/plugin-cert
'@certd/plugin-lib':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../plugins/plugin-lib
'@certd/plus-core':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../plus-core
ali-oss:
specifier: ^6.21.0
@ -921,6 +921,9 @@ importers:
jsencrypt:
specifier: ^3.3.2
version: 3.3.2
jsrsasign:
specifier: ^11.1.0
version: 11.1.0
qiniu:
specifier: ^7.12.0
version: 7.14.0
@ -989,7 +992,7 @@ importers:
packages/pro/plus-core:
dependencies:
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/basic
dayjs:
specifier: ^1.11.7
@ -1279,10 +1282,10 @@ importers:
version: 0.1.3(zod@3.24.2)
devDependencies:
'@certd/lib-iframe':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../libs/lib-iframe
'@certd/pipeline':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/pipeline
'@rollup/plugin-commonjs':
specifier: ^25.0.7
@ -1462,43 +1465,43 @@ importers:
specifier: ^3.705.0
version: 3.758.0(aws-crt@1.25.3)
'@certd/acme-client':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/acme-client
'@certd/basic':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/basic
'@certd/commercial-core':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../pro/commercial-core
'@certd/jdcloud':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../libs/lib-jdcloud
'@certd/lib-huawei':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../libs/lib-huawei
'@certd/lib-k8s':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../libs/lib-k8s
'@certd/lib-server':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../libs/lib-server
'@certd/midway-flyway-js':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../libs/midway-flyway-js
'@certd/pipeline':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../core/pipeline
'@certd/plugin-cert':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../plugins/plugin-cert
'@certd/plugin-lib':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../plugins/plugin-lib
'@certd/plugin-plus':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../pro/plugin-plus
'@certd/plus-core':
specifier: ^1.34.0
specifier: ^1.34.2
version: link:../../pro/plus-core
'@corsinvest/cv4pve-api-javascript':
specifier: ^8.3.0
@ -9174,6 +9177,9 @@ packages:
resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
engines: {node: '>=0.6.0'}
jsrsasign@11.1.0:
resolution: {integrity: sha512-Ov74K9GihaK9/9WncTe1mPmvrO7Py665TUfUKvraXBpu+xcTWitrtuOwcjf4KMU9maPaYn0OuaWy0HOzy/GBXg==}
jstoxml@2.2.9:
resolution: {integrity: sha512-OYWlK0j+roh+eyaMROlNbS5cd5R25Y+IUpdl7cNdB8HNrkgwQzIS7L9MegxOiWNBj9dQhA/yAxiMwCC5mwNoBw==}
@ -21772,13 +21778,13 @@ snapshots:
resolve: 1.22.10
semver: 6.3.1
eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8):
eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8):
dependencies:
eslint: 7.32.0
prettier: 2.8.8
prettier-linter-helpers: 1.0.0
optionalDependencies:
eslint-config-prettier: 8.10.0(eslint@7.32.0)
eslint-config-prettier: 8.10.0(eslint@8.57.0)
eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8):
dependencies:
@ -23622,6 +23628,8 @@ snapshots:
json-schema: 0.4.0
verror: 1.10.0
jsrsasign@11.1.0: {}
jstoxml@2.2.9: {}
jszip@3.10.1:
@ -24492,7 +24500,7 @@ snapshots:
eslint: 7.32.0
eslint-config-prettier: 8.10.0(eslint@7.32.0)
eslint-plugin-node: 11.1.0(eslint@7.32.0)
eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8)
eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8)
execa: 5.1.1
inquirer: 7.3.3
json5: 2.2.3