Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ui/certd-ui/src/api/util.input.handler.js

packages/plugins/src/aliyun/deploy-to-cdn/index.js

@@ -20,7 +20,7 @@ const define = {
       }
     },
     from: {
-      value: 'upload',
+      default: 'upload',
       label: '证书来源',
       component: {
         required: true,
@@ -31,7 +31,7 @@ const define = {
           { value: 'cas', label: '从证书库', title: '需要uploadCertToAliyun作为前置任务' }
         ]
       },
-      desc: '如果选择cas类型，则需要以《上传证书到阿里云》作为前置任务'
+      desc: '如果选择‘从证书库’类型，则需要以《上传证书到阿里云》作为前置任务'
 
     },
     // serverCertificateStatus: {

packages/plugins/src/aliyun/upload-to-aliyun/index.js

@@ -6,17 +6,22 @@ const define = {
   label: '上传证书到阿里云',
   input: {
     name: {
-      label: '证书名称'
+      label: '证书名称',
+      desc: '证书上传后将以此参数作为名称前缀'
     },
     regionId: {
       label: '大区',
-      value: 'cn-hangzhou'
+      default: 'cn-hangzhou'
     },
     accessProvider: {
       label: 'Access提供者',
       type: [String, Object],
       desc: 'AccessProviders的key 或 一个包含accessKeyId与accessKeySecret的对象',
-      options: 'accessProviders[type=aliyun]'
+      component: {
+        name: 'provider-selector',
+        filter: 'aliyun'
+      },
+      required: true
     }
   },
   output: {

packages/plugins/src/tencent/deploy-to-cdn/index.js

@@ -19,30 +19,27 @@ export class DeployCertToTencentCDN extends AbstractTencentPlugin {
           required: true
         },
         certName: {
-          label: '证书名称'
+          label: '证书名称',
+          desc: '证书上传后将以此参数作为名称前缀'
         },
         certType: {
-          value: 'upload',
+          default: 'upload',
           label: '证书来源',
           options: [
             { value: 'upload', label: '直接上传' },
             { value: 'cloud', label: '从证书库', desc: '需要uploadCertToTencent作为前置任务' }
           ],
+          desc: '如果选择‘从证书库’类型，则需要以《上传证书到腾讯云》作为前置任务',
           required: true
         },
-        // serverCertificateStatus: {
-        //   label: '启用https',
-        //   options: [
-        //     { value: 'on', label: '开启HTTPS，并更新证书' },
-        //     { value: 'auto', label: '若HTTPS开启则更新，未开启不更新' }
-        //   ],
-        //   required:true
-        // },
         accessProvider: {
           label: 'Access提供者',
           type: [String, Object],
           desc: 'AccessProviders的key 或 一个包含accessKeyId与accessKeySecret的对象',
-          options: 'accessProviders[type=aliyun]',
+          component: {
+            name: 'provider-selector',
+            filter: 'tencent'
+          },
           required: true
         }
       },

packages/plugins/src/tencent/deploy-to-clb/index.js

@@ -15,7 +15,7 @@ export class DeployCertToTencentCLB extends AbstractTencentPlugin {
       input: {
         region: {
           label: '大区',
-          value: 'ap-guangzhou'
+          default: 'ap-guangzhou'
         },
         domain: {
           label: '域名',

packages/plugins/src/tencent/deploy-to-tke-ingress/index.js

@@ -16,7 +16,7 @@ export class DeployCertToTencentTKEIngress extends AbstractTencentPlugin {
       input: {
         region: {
           label: '大区',
-          value: 'ap-guangzhou'
+          default: 'ap-guangzhou'
         },
         clusterId: {
           label: '集群ID',
@@ -25,7 +25,7 @@ export class DeployCertToTencentTKEIngress extends AbstractTencentPlugin {
         },
         namespace: {
           label: '集群的namespace',
-          value: 'default'
+          default: 'default'
         },
         secreteName: {
           type: [String, Array],