diff --git a/packages/dns-providers/src/providers/aliyun.js b/packages/dns-providers/src/providers/aliyun.js
index f2b7370ed..5fb0d9111 100644
--- a/packages/dns-providers/src/providers/aliyun.js
+++ b/packages/dns-providers/src/providers/aliyun.js
@@ -9,11 +9,11 @@ export class AliyunDnsProvider extends AbstractDnsProvider {
desc: '',
input: {
accessProvider: {
- label: 'Access提供者',
+ label: '授权',
type: [String, Object],
- desc: 'AccessProviders的key 或 一个包含accessKeyId与accessKeySecret的对象',
+ desc: '需要aliyun类型的授权',
component: {
- name: 'provider-selector',
+ name: 'access-provider-selector',
filter: 'aliyun'
},
required: true
diff --git a/packages/dns-providers/src/providers/dnspod.js b/packages/dns-providers/src/providers/dnspod.js
index 3da521efa..c66d85f18 100644
--- a/packages/dns-providers/src/providers/dnspod.js
+++ b/packages/dns-providers/src/providers/dnspod.js
@@ -9,11 +9,11 @@ export class DnspodDnsProvider extends AbstractDnsProvider {
desc: '腾讯云的域名解析接口已迁移到dnspod',
input: {
accessProvider: {
- label: 'Access提供者',
+ label: '授权',
type: [String, Object],
- desc: 'AccessProviders的key',
+ desc: '需要dnspod类型的授权',
component: {
- name: 'provider-selector',
+ name: 'access-provider-selector',
filter: 'dnspod'
},
required: true
diff --git a/ui/certd-server/utils/util.path.js b/ui/certd-server/utils/util.path.js
index 8a5e984c9..843c28b04 100644
--- a/ui/certd-server/utils/util.path.js
+++ b/ui/certd-server/utils/util.path.js
@@ -1,7 +1,12 @@
+import os from 'os'
export default {
join (...dirs) {
const url = new URL('../' + dirs.join('/'), import.meta.url)
console.log('url', url)
- return url.pathname
+ let path = url.pathname
+ if (os.type() === 'Windows_NT') {
+ path = path.substring(1)
+ }
+ return path
}
}
diff --git a/ui/certd-ui/package.json b/ui/certd-ui/package.json
index c8a7d6e40..176abb2dc 100644
--- a/ui/certd-ui/package.json
+++ b/ui/certd-ui/package.json
@@ -16,7 +16,8 @@
"vue-i18n": "^9.0.0-rc.2",
"core-js": "^3.8.1",
"vue": "^3.0.4",
- "vue-router": "^4.0.1"
+ "vue-router": "^4.0.1",
+ "vue-json-editor": "^1.4.2"
},
"devDependencies": {
"@babel/core": "^7.12.10",
diff --git a/ui/certd-ui/src/api/util.input.handler.js b/ui/certd-ui/src/api/util.input.handler.js
index d029778ff..d94b7ff34 100644
--- a/ui/certd-ui/src/api/util.input.handler.js
+++ b/ui/certd-ui/src/api/util.input.handler.js
@@ -9,18 +9,19 @@ function handleInputs (inputs) {
if (item.component == null) {
item.component = {}
}
- if (item.component.rules == null) {
- item.component.rules = []
+ let rules = item.component.rules
+ if (rules == null) {
+ item.component.rules = rules = []
}
- if (item.component.rules.length > 0) {
- const hasRequired = item.rules.filter(rule => {
+ if (rules.length > 0) {
+ const hasRequired = rules.filter(rule => {
return rule.required === true
})
if (hasRequired.length > 0) {
return
}
}
- item.component.rules.push({ required: true, message: '该项必填' })
+ rules.push({ required: true, message: '该项必填' })
delete item.required
}
})
diff --git a/ui/certd-ui/src/components/access-provider-selector/access-provider-selector.vue b/ui/certd-ui/src/components/access-provider-selector/access-provider-selector.vue
index c65d9fc1b..34c6b0b71 100644
--- a/ui/certd-ui/src/components/access-provider-selector/access-provider-selector.vue
+++ b/ui/certd-ui/src/components/access-provider-selector/access-provider-selector.vue
@@ -3,13 +3,14 @@
{{ item.name }}
- 管理授权
+ 添加授权
h(resolveComponent(props.name), context.$attrs, props.children)
+ const comp = resolveComponent(props.name)
+ return () => h(comp, context.$attrs, props.children)
}
}
diff --git a/ui/certd-ui/src/views/detail/components/cert-form.vue b/ui/certd-ui/src/views/detail/components/cert-form.vue
index a1ab67399..86435082a 100644
--- a/ui/certd-ui/src/views/detail/components/cert-form.vue
+++ b/ui/certd-ui/src/views/detail/components/cert-form.vue
@@ -3,7 +3,7 @@
title="证书申请配置"
placement="right"
:closable="true"
- width="500px"
+ width="600px"
v-model:visible="visible"
:after-visible-change="afterVisibleChange"
>
diff --git a/ui/certd-ui/src/views/detail/index.vue b/ui/certd-ui/src/views/detail/index.vue
index 51510a7c0..383da5d03 100644
--- a/ui/certd-ui/src/views/detail/index.vue
+++ b/ui/certd-ui/src/views/detail/index.vue
@@ -155,7 +155,7 @@
-
+