diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index 1930cf113..94ac2044c 100644 --- a/packages/core/acme-client/package.json +++ b/packages/core/acme-client/package.json @@ -18,7 +18,7 @@ "types" ], "dependencies": { - "@certd/basic": "^1.40.4", + "@certd/basic": "workspace:^1.40.4", "@peculiar/x509": "^1.11.0", "asn1js": "^3.0.5", "axios": "^1.9.0", diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 3a01b1697..8efa1485d 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -19,8 +19,8 @@ "compile": "tsc --skipLibCheck --watch" }, "dependencies": { - "@certd/basic": "^1.40.4", - "@certd/plus-core": "^1.40.4", + "@certd/basic": "workspace:^1.40.4", + "@certd/plus-core": "workspace:^1.40.4", "dayjs": "^1.11.7", "lodash-es": "^4.17.21", "reflect-metadata": "^0.1.13" diff --git a/packages/libs/lib-server/package.json b/packages/libs/lib-server/package.json index f032db4f5..471a64cf6 100644 --- a/packages/libs/lib-server/package.json +++ b/packages/libs/lib-server/package.json @@ -29,11 +29,11 @@ ], "license": "AGPL", "dependencies": { - "@certd/acme-client": "^1.40.4", - "@certd/basic": "^1.40.4", - "@certd/pipeline": "^1.40.4", - "@certd/plugin-lib": "^1.40.4", - "@certd/plus-core": "^1.40.4", + "@certd/acme-client": "workspace:^1.40.4", + "@certd/basic": "workspace:^1.40.4", + "@certd/pipeline": "workspace:^1.40.4", + "@certd/plugin-lib": "workspace:^1.40.4", + "@certd/plus-core": "workspace:^1.40.4", "@midwayjs/cache": "3.14.0", "@midwayjs/core": "3.20.11", "@midwayjs/i18n": "3.20.13", diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index f101438c9..b04a4a965 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -18,10 +18,10 @@ "compile": "tsc --skipLibCheck --watch" }, "dependencies": { - "@certd/acme-client": "^1.40.4", - "@certd/basic": "^1.40.4", - "@certd/pipeline": "^1.40.4", - "@certd/plugin-lib": "^1.40.4", + "@certd/acme-client": "workspace:^1.40.4", + "@certd/basic": "workspace:^1.40.4", + "@certd/pipeline": "workspace:^1.40.4", + "@certd/plugin-lib": "workspace:^1.40.4", "psl": "^1.9.0", "punycode.js": "^2.3.1" }, diff --git a/packages/plugins/plugin-lib/package.json b/packages/plugins/plugin-lib/package.json index cf5d95122..7d60a0a18 100644 --- a/packages/plugins/plugin-lib/package.json +++ b/packages/plugins/plugin-lib/package.json @@ -23,10 +23,10 @@ "@alicloud/pop-core": "^1.7.10", "@alicloud/tea-util": "^1.4.11", "@aws-sdk/client-s3": "^3.964.0", - "@certd/acme-client": "^1.40.4", - "@certd/basic": "^1.40.4", - "@certd/pipeline": "^1.40.4", - "@certd/plus-core": "^1.40.4", + "@certd/acme-client": "workspace:^1.40.4", + "@certd/basic": "workspace:^1.40.4", + "@certd/pipeline": "workspace:^1.40.4", + "@certd/plus-core": "workspace:^1.40.4", "@kubernetes/client-node": "0.21.0", "ali-oss": "^6.22.0", "basic-ftp": "^5.0.5", diff --git a/packages/plugins/plugin-lib/src/common/util.ts b/packages/plugins/plugin-lib/src/common/util.ts index 5705799f8..88e38561b 100644 --- a/packages/plugins/plugin-lib/src/common/util.ts +++ b/packages/plugins/plugin-lib/src/common/util.ts @@ -35,7 +35,7 @@ export function createRemoteSelectInputDefine(opts?: { helper?: string; formItem?: any; mode?: string; - multi?: boolean; + single?: boolean; required?: boolean; rules?: any; mergeScript?: string; @@ -59,11 +59,8 @@ export function createRemoteSelectInputDefine(opts?: { const helper = opts?.helper || "请选择"; const search = opts?.search ?? false; const pager = opts?.pager ?? false; - let mode = "default"; - const multi = opts?.multi ?? true; - if (multi) { - mode = "tags"; - } + const mode = "tags"; + const single = opts?.single ?? false; const item = { title, component: { @@ -75,7 +72,7 @@ export function createRemoteSelectInputDefine(opts?: { action, search, pager, - multi, + single, pageSize: opts?.pageSize, watches: [certDomainsInputKey, accessIdInputKey, ...watches], uploadCert: opts?.uploadCert, diff --git a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue index c6388898e..78a5c7b35 100644 --- a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue +++ b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue @@ -69,7 +69,7 @@ const props = defineProps< watches?: string[]; search?: boolean; pager?: boolean; - multi?: boolean; + single?: boolean; pageSize?: number; uploadCert?: UploadCertProps; } & ComponentPropsType @@ -79,15 +79,15 @@ const emit = defineEmits<{ }>(); function updateValue(value: any) { - // if (props.multi !== false) { - // emit("update:value", value); - // } else { - // const last = value?.[value.length - 1]; - // emit("update:value", last); - // selectRef.value.blur(); - // } + if (props.single === true) { + const last = value?.[value.length - 1]; + emit("update:value", last); + selectRef.value.blur(); + } else { + emit("update:value", value); + } - emit("update:value", value); + // emit("update:value", value); } const attrs = useAttrs(); diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts index c348ed3ca..c571527cd 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-alb/index.ts @@ -67,7 +67,7 @@ export class AliyunDeployCertToALB extends AbstractTaskPlugin { createRemoteSelectInputDefine({ title: "ALB所在地区", typeName: "AliyunDeployCertToALB", - multi: false, + single: true, action: AliyunDeployCertToALB.prototype.onGetRegionList.name, watches: ["accessId"] }) diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ga/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ga/index.ts index 32530e241..f5be0dcfc 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ga/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ga/index.ts @@ -67,7 +67,7 @@ export class AliyunDeployCertToGA extends AbstractTaskPlugin { helper: "请选择要部署证书的全球加速实例", action: AliyunDeployCertToGA.prototype.onGetAcceleratorList.name, watches: ["accessId"], - multi: false, + single: true, }) ) acceleratorId!: string; diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts index d500e8a14..119214e70 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-nlb/index.ts @@ -68,7 +68,7 @@ export class AliyunDeployCertToNLB extends AbstractTaskPlugin { createRemoteSelectInputDefine({ title: 'NLB所在地区', typeName: 'AliyunDeployCertToNLB', - multi: false, + single: true, action: AliyunDeployCertToNLB.prototype.onGetRegionList.name, watches: ['accessId'], }) diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts index e92f9a943..bf696627a 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-slb/index.ts @@ -70,7 +70,7 @@ export class AliyunDeployCertToSLB extends AbstractTaskPlugin { @TaskInput( createRemoteSelectInputDefine({ title: 'LB所在地区', - multi: false, + single: true, action: AliyunDeployCertToSLB.prototype.onGetRegionList.name, watches: ['accessId'], }) diff --git a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/getter/aliyun.ts b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/getter/aliyun.ts index 0a41cbd67..f4dc45047 100644 --- a/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/getter/aliyun.ts +++ b/packages/ui/certd-server/src/plugins/plugin-cert/plugin/cert-plugin/getter/aliyun.ts @@ -51,7 +51,6 @@ export class CertApplyGetFormAliyunPlugin extends CertApplyBasePlugin { ) apiVersion!: string; - @TaskInput( createRemoteSelectInputDefine({ title: "证书订单 ID", @@ -61,6 +60,7 @@ export class CertApplyGetFormAliyunPlugin extends CertApplyBasePlugin { name: "RemoteSelect", vModel: "value", pager: true, + single: true, }, action: CertApplyGetFormAliyunPlugin.prototype.onGetOrderList.name, }) @@ -216,7 +216,10 @@ export class CertApplyGetFormAliyunPlugin extends CertApplyBasePlugin { }); const list = res?.CertificateOrderList || []; if (!list || list.length === 0) { - return []; + return { + list: [], + total: 0, + }; } const total = res.TotalCount || 0; @@ -261,7 +264,10 @@ export class CertApplyGetFormAliyunPlugin extends CertApplyBasePlugin { const list = res?.InstanceList || []; if (!list || list.length === 0) { - return []; + return { + list: [], + total: 0, + }; } const total = res.TotalCount || 0; diff --git a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts index d379ab5f0..6239b0741 100644 --- a/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts +++ b/packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts @@ -128,7 +128,7 @@ export class DemoTest extends AbstractTaskPlugin { //当以下参数变化时,触发获取选项 watches: ['certDomains', 'accessId'], required: true, - multi: true, + single: false, }) ) siteName!: string[]; diff --git a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-elb/index.ts b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-elb/index.ts index 859fbfcc3..16c80d97b 100644 --- a/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-elb/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-huawei/plugins/deploy-to-elb/index.ts @@ -49,7 +49,7 @@ export class HauweiDeployCertToELB extends AbstractTaskPlugin { helper: '请选择项目', typeName: 'HauweiDeployCertToELB', action: HauweiDeployCertToELB.prototype.onGetProjectList.name, - multi:false + single: true, }) ) projectId!: string; diff --git a/packages/ui/certd-server/src/plugins/plugin-next-terminal/plugins/plugin-refresh-cert.ts b/packages/ui/certd-server/src/plugins/plugin-next-terminal/plugins/plugin-refresh-cert.ts index 6c8be644f..fae67134f 100644 --- a/packages/ui/certd-server/src/plugins/plugin-next-terminal/plugins/plugin-refresh-cert.ts +++ b/packages/ui/certd-server/src/plugins/plugin-next-terminal/plugins/plugin-refresh-cert.ts @@ -53,7 +53,7 @@ export class NextTerminalRefreshCert extends AbstractTaskPlugin { action: NextTerminalRefreshCert.prototype.onGetCertList.name, watches: ['accessId'], required: true, - multi: true, + single: false, }) ) certIds!: string[]; diff --git a/packages/ui/certd-server/src/plugins/plugin-ucloud/plugins/plugin-deploy-to-ulb.ts b/packages/ui/certd-server/src/plugins/plugin-ucloud/plugins/plugin-deploy-to-ulb.ts index faa500832..4dccff0dc 100644 --- a/packages/ui/certd-server/src/plugins/plugin-ucloud/plugins/plugin-deploy-to-ulb.ts +++ b/packages/ui/certd-server/src/plugins/plugin-ucloud/plugins/plugin-deploy-to-ulb.ts @@ -46,7 +46,7 @@ export class UCloudDeployToULB extends AbstractTaskPlugin { title: "地域", helper: "选择UCloud地域", action: UCloudDeployToULB.prototype.onGetRegionList.name, - multi: false + single: true }) ) region!: string; diff --git a/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vke.ts b/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vke.ts index c7fcd7e2b..060845802 100644 --- a/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vke.ts +++ b/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vke.ts @@ -70,7 +70,7 @@ export class VolcengineDeployToVKE extends AbstractTaskPlugin { helper: "选择要替换证书的VKE集群,也可以手动输入集群ID", action: VolcengineDeployToVKE.prototype.onGetClusterList.name, watches: ["accessId", "regionId"], - multi: false, + single: true, required: true }) ) diff --git a/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vod.ts b/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vod.ts index 2a89f4f1f..96079350f 100644 --- a/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vod.ts +++ b/packages/ui/certd-server/src/plugins/plugin-volcengine/plugins/plugin-deploy-to-vod.ts @@ -65,7 +65,7 @@ export class VolcengineDeployToVOD extends AbstractTaskPlugin { helper: "选择要部署证书的点播空间", action: VolcengineDeployToVOD.prototype.onGetSpaceList.name, watches: ["accessId", "regionId"], - multi:false, + single:true, required: true }) )