@@ -46,9 +46,9 @@ export default defineComponent({
}
}
- function clear(){
+ function clear() {
selectedId.value = "";
- target.value = null
+ target.value = null;
ctx.emit("update:modelValue", selectedId.value);
}
@@ -99,7 +99,6 @@ export default defineComponent({
}
});
-
return {
clear,
target,
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.jsx b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx
similarity index 80%
rename from packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.jsx
rename to packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx
index 4a2b3575..1db95250 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.jsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx
@@ -1,7 +1,7 @@
-import { compute } from "@fast-crud/fast-crud";
+import { compute, CreateCrudOptionsProps, CreateCrudOptionsRet } from "@fast-crud/fast-crud";
import { Dicts } from "./dicts";
-export default function () {
+export default function (): CreateCrudOptionsRet {
return {
crudOptions: {
form: {
@@ -12,7 +12,7 @@ export default function () {
columns: {
domains: {
title: "域名",
- type: ["dict-select"],
+ type: "dict-select",
search: {
show: true,
component: {
@@ -58,6 +58,30 @@ export default function () {
rules: [{ required: true, type: "email", message: "请填写邮箱" }]
}
},
+ blank: {
+ title: "占位",
+ type: "text",
+ form: {
+ blank: true
+ }
+ },
+ sslProvider: {
+ title: "证书提供商",
+ type: "dict-select",
+ dict: Dicts.sslProviderDict
+ },
+ eabAccess: {
+ title: "EAB授权",
+ type: "dict-select",
+ form: {
+ component: {
+ name: "PiAccessSelector",
+ type: "eab",
+ vModel: "modelValue"
+ },
+ helper: "如果是ZeroSSL,需要配置EAB授权,https://app.zerossl.com/developer 生成 'EAB' "
+ }
+ },
dnsProviderType: {
title: "DNS提供商",
type: "dict-select",
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/dicts.ts b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/dicts.ts
index 6a5d402d..b29ada36 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/dicts.ts
+++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/dicts.ts
@@ -1,7 +1,12 @@
import { dict } from "@fast-crud/fast-crud";
export const Dicts = {
- certIssuerDict: dict({ data: [{ value: "letencrypt", label: "LetEncrypt" }] }),
+ sslProviderDict: dict({
+ data: [
+ { value: "letsencrypt", label: "Let‘s Encrypt" },
+ { value: "zerossl", label: "ZeroSSL" }
+ ]
+ }),
challengeTypeDict: dict({ data: [{ value: "dns", label: "DNS校验" }] }),
dnsProviderTypeDict: dict({
url: "pi/dnsProvider/dnsProviderTypeDict"
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue
index ae0c66d3..115cf1f4 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue
@@ -9,7 +9,7 @@ import { ref } from "vue";
import _ from "lodash-es";
export default {
name: "PiCertdForm",
- setup(props:any, ctx:any) {
+ setup(props: any, ctx: any) {
// 自定义表单配置
const { buildFormOptions } = useColumns();
//使用crudOptions结构来构建自定义表单配置
@@ -18,7 +18,7 @@ export default {
const formOptions = buildFormOptions(
_.merge(crudOptions, {
form: {
- doSubmit({ form }:any) {
+ doSubmit({ form }: any) {
// 创建certd 的pipeline
doSubmitRef.value({ form });
}
@@ -29,7 +29,7 @@ export default {
const formWrapperRef = ref();
const formWrapperOptions = ref();
formWrapperOptions.value = formOptions;
- function open(doSubmit:any) {
+ function open(doSubmit: any) {
doSubmitRef.value = doSubmit;
formWrapperRef.value.open(formWrapperOptions.value);
}
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/index.vue
index 9abf79cb..96298bb0 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/index.vue
@@ -7,6 +7,11 @@
+
+
+ 申请证书
+
+
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
index 88c13489..aef3938a 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue
@@ -64,11 +64,11 @@
name: 'a-select',
vModel: 'value',
options: [
- { value: 0, label: '正常运行' },
- { value: 1, label: '成功后跳过' }
+ { value: 0, label: '正常运行(证书申请任务请选择它)' },
+ { value: 1, label: '成功后跳过(其他任务请选择它)' }
]
},
- helper:'该任务运行成功一次之后下次运行是否跳过,证书申请任务务必选择正常运行',
+ helper: '该任务运行成功一次之后下次运行是否跳过,保持默认即可',
rules: [{ required: true, message: '此项必填' }]
}"
:get-context-fn="blankFn"
@@ -90,10 +90,10 @@ import { message, Modal } from "ant-design-vue";
import { computed, inject, Ref, ref } from "vue";
import _ from "lodash-es";
import { nanoid } from "nanoid";
-import {CopyOutlined} from "@ant-design/icons-vue";
+import { CopyOutlined } from "@ant-design/icons-vue";
export default {
name: "PiStepForm",
- components:{CopyOutlined},
+ components: { CopyOutlined },
props: {
editMode: {
type: Boolean,
@@ -173,7 +173,7 @@ export default {
stepDrawerShow();
};
- const stepAdd = (emit: any,stepDef:any) => {
+ const stepAdd = (emit: any, stepDef: any) => {
mode.value = "add";
const step: any = {
id: nanoid(),
@@ -183,7 +183,7 @@ export default {
input: {},
status: null
};
- _.merge(step,stepDef)
+ _.merge(step, stepDef);
stepOpen(step, emit);
};
diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts
index b83c0ccc..586a3eef 100644
--- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts
@@ -45,7 +45,7 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
@TaskInput({
title: '大区',
- value: 'cn-shanghai',
+ default: 'cn-shanghai',
component: {
placeholder: '集群所属大区',
},
@@ -55,7 +55,7 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
@TaskInput({
title: '命名空间',
- value: 'default',
+ default: 'default',
component: {
placeholder: '命名空间',
},
@@ -64,7 +64,7 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
namespace!: string;
@TaskInput({
title: 'ingress名称',
- value: '',
+ default: '',
component: {
placeholder: 'ingress名称',
},
@@ -74,7 +74,7 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
ingressName!: string;
@TaskInput({
title: 'ingress类型',
- value: 'nginx',
+ default: 'nginx',
component: {
placeholder: '暂时只支持nginx类型',
},
@@ -83,8 +83,10 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
ingressClass!: string;
@TaskInput({
title: '是否私网ip',
- value: false,
+ default: false,
component: {
+ name: 'a-switch',
+ vModel: 'checked',
placeholder: '集群连接端点是否是私网ip',
},
helper: '如果您当前certd运行在同一个私网下,可以选择是。',
diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts
index 8412b324..cff2ada2 100644
--- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts
@@ -30,7 +30,7 @@ export class UploadCertToAliyun extends AbstractTaskPlugin {
@TaskInput({
title: '大区',
- value: 'cn-hangzhou',
+ default: 'cn-hangzhou',
component: {
name: 'a-select',
vModel: 'value',
diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts
index 250ab2d2..805a581d 100644
--- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts
@@ -65,7 +65,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
'开启后,将直接复制到当前主机某个目录,不上传到主机,由于是docker启动,实际上是复制到docker容器内的“证书保存路径”,你需要事先在docker-compose.yaml中配置主机目录映射: volumes: /your_target_path:/your_target_path',
component: {
name: 'a-switch',
- value: false,
+ default: false,
vModel: 'checked',
},
})
diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts
index 78002e66..18a7ef67 100644
--- a/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-tencent/dns-provider/dnspod-dns-provider.ts
@@ -10,7 +10,7 @@ import { DnspodAccess } from '../access';
@IsDnsProvider({
name: 'dnspod',
- title: 'dnspod(已过时)',
+ title: 'dnspod(已过时,请尽快换成腾讯云)',
desc: '请尽快换成腾讯云类型',
accessType: 'dnspod',
})
diff --git a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts
index 377bc1cc..0816beea 100644
--- a/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts
@@ -24,7 +24,7 @@ import dayjs from 'dayjs';
export class DeployToClbPlugin extends AbstractTaskPlugin {
@TaskInput({
title: '大区',
- value: 'ap-guangzhou',
+ default: 'ap-guangzhou',
component: {
name: 'a-select',
options: [{ value: 'ap-guangzhou' }],