From 5cde165f0bb78a46ad159e79ea4ed6179f20e080 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 5 Feb 2021 14:30:31 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/dns-providers/src/providers/aliyun.js        |  6 +++---
 packages/dns-providers/src/providers/dnspod.js        |  6 +++---
 ui/certd-server/utils/util.path.js                    |  7 ++++++-
 ui/certd-ui/package.json                              |  3 ++-
 ui/certd-ui/src/api/util.input.handler.js             | 11 ++++++-----
 .../access-provider-selector.vue                      |  3 ++-
 ui/certd-ui/src/components/component-render.vue       |  3 ++-
 ui/certd-ui/src/views/detail/components/cert-form.vue |  2 +-
 ui/certd-ui/src/views/detail/index.vue                |  2 +-
 9 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/packages/dns-providers/src/providers/aliyun.js b/packages/dns-providers/src/providers/aliyun.js
index f2b7370e..5fb0d911 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 3da521ef..c66d85f1 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 8a5e984c..843c28b0 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 c8a7d6e4..176abb2d 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 d029778f..d94b7ff3 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 c65d9fc1..34c6b0b7 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 @@
     <a-select
       :value="value"
       @update:value="valueUpdate"
+      placeholder="没有可选时请点右边按钮添加"
     >
       <a-select-option v-for="item of getProviders()" :key="item.key" :value="item.key" :disabled="isDisabled(item)">
         {{ item.name }}
       </a-select-option>
     </a-select>
     <a-button class="suffix" @click="providerManagerOpen">
-      管理授权
+      添加授权
     </a-button>
   </div>
   <access-provider-manager ref="providerManagerRef"
diff --git a/ui/certd-ui/src/components/component-render.vue b/ui/certd-ui/src/components/component-render.vue
index 71c08143..890348bb 100644
--- a/ui/certd-ui/src/components/component-render.vue
+++ b/ui/certd-ui/src/components/component-render.vue
@@ -26,7 +26,8 @@ export default {
         attrs[key] = eval(value)
       }
     })
-    return () => h(resolveComponent(props.name), context.$attrs, props.children)
+    const comp = resolveComponent(props.name)
+    return () => h(comp, context.$attrs, props.children)
   }
 }
 </script>
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 a1ab6739..86435082 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 51510a7c..383da5d0 100644
--- a/ui/certd-ui/src/views/detail/index.vue
+++ b/ui/certd-ui/src/views/detail/index.vue
@@ -155,7 +155,7 @@
 
           <div><a-button @click="exportsToZip">导出可执行项目</a-button></div>
           <br/>
-          <div> <a-button>仅导出配置</a-button></div>
+          <div> <a-button @click="exportsToJson">仅导出配置</a-button></div>
         </div>
       </div>
     </div>