refactor: 1

packages/plugins/plugin-aliyun/src/access-providers/aliyun.js

@@ -2,7 +2,7 @@ export class AliyunAccessProvider {
   static define () {
     return {
       name: 'aliyun',
-      label: '阿里云',
+      title: '阿里云',
       desc: '',
       input: {
         accessKeyId: {

packages/plugins/plugin-aliyun/src/dns-providers/aliyun.js

@@ -5,7 +5,7 @@ export class AliyunDnsProvider extends AbstractDnsProvider {
   static define () {
     return {
       name: 'aliyun',
-      label: '阿里云',
+      title: '阿里云',
       desc: '',
       input: {
         accessProvider: {

packages/plugins/plugin-aliyun/src/plugins/deploy-to-ack-ingress/index.js

@@ -5,7 +5,7 @@ const ROAClient = Core.ROAClient
 
 const define = {
   name: 'deployCertToAliyunAckIngress',
-  label: '部署到阿里云AckIngress',
+  title: '部署到阿里云AckIngress',
   input: {
     clusterId: {
       title: '集群id',
@@ -14,14 +14,14 @@ const define = {
       }
     },
     secretName: {
-      label: '保密字典Id',
+      title: '保密字典Id',
       component: {
         placeholder: '保密字典Id'
       },
       required: true
     },
     regionId: {
-      label: '大区',
+      title: '大区',
       value: 'cn-shanghai',
       component: {
         placeholder: '集群所属大区'
@@ -29,7 +29,7 @@ const define = {
       required: true
     },
     namespace: {
-      label: '命名空间',
+      title: '命名空间',
       value: 'default',
       component: {
         placeholder: '命名空间'
@@ -37,7 +37,7 @@ const define = {
       required: true
     },
     ingressName: {
-      label: 'ingress名称',
+      title: 'ingress名称',
       value: '',
       component: {
         placeholder: 'ingress名称'
@@ -46,7 +46,7 @@ const define = {
       helper: '可以传入一个数组'
     },
     ingressClass: {
-      label: 'ingress类型',
+      title: 'ingress类型',
       value: 'nginx',
       component: {
         placeholder: '暂时只支持nginx类型'
@@ -54,7 +54,7 @@ const define = {
       required: true
     },
     isPrivateIpAddress: {
-      label: '是否私网ip',
+      title: '是否私网ip',
       value: false,
       component: {
         placeholder: '集群连接端点是否是私网ip'
@@ -63,12 +63,12 @@ const define = {
       required: true
     },
     accessProvider: {
-      label: 'Access提供者',
+      title: 'Access授权',
       type: [String, Object],
-      desc: 'access授权',
+      helper: 'AccessKey、AccessSecret',
       component: {
-        name: 'access-provider-selector',
+        name: 'access-selector',
-        filter: 'aliyun'
+        type: 'aliyun'
       },
       required: true
     }

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

@@ -7,42 +7,30 @@ const define = {
   label: '部署到阿里云CDN',
   input: {
     domainName: {
-      label: 'cdn加速域名',
+      title: 'cdn加速域名',
       component: {
         placeholder: 'cdn加速域名'
       },
       required: true
     },
     certName: {
-      label: '证书名称',
+      title: '证书名称',
       component: {
         placeholder: '上传后将以此名称作为前缀'
       }
     },
     from: {
-      default: 'upload',
+      value: 'upload',
-      label: '证书来源',
+      title: '证书来源',
       required: true,
       component: {
-        required: true,
         placeholder: '证书来源',
         name: 'a-select',
         options: [
-          { value: 'upload', label: '直接上传' },
+          { value: 'upload', label: '直接上传' }
-          { value: 'cas', label: '从证书库', title: '需要uploadCertToAliyun作为前置任务' }
         ]
-      },
+      }
-      desc: '如果选择‘从证书库’类型，则需要以《上传证书到阿里云》作为前置任务'
-
     },
-    // serverCertificateStatus: {
-    //   label: '启用https',
-    //   options: [
-    //     { value: 'on', label: '开启HTTPS，并更新证书' },
-    //     { value: 'auto', label: '若HTTPS开启则更新，未开启不更新' }
-    //   ],
-    //   required:true
-    // },
     accessProvider: {
       label: 'Access提供者',
       type: [String, Object],

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

@@ -1,26 +1,32 @@
 import Core from '@alicloud/pop-core'
 import { AbstractAliyunPlugin } from '../abstract-aliyun.js'
+import { ZoneOptions } from '../../utils/index.js'
 
 const define = {
   name: 'uploadCertToAliyun',
-  label: '上传证书到阿里云',
+  title: '上传证书到阿里云',
+  desc: '',
   input: {
     name: {
-      label: '证书名称',
+      title: '证书名称',
-      desc: '证书上传后将以此参数作为名称前缀'
+      helper: '证书上传后将以此参数作为名称前缀'
     },
     regionId: {
-      label: '大区',
+      title: '大区',
-      default: 'cn-hangzhou',
+      value: 'cn-hangzhou',
+      component: {
+        name: 'a-select',
+        vModel: 'value',
+        options: ZoneOptions
+      },
       required: true
     },
     accessProvider: {
-      label: 'Access提供者',
+      title: 'Access授权',
-      type: [String, Object],
+      helper: 'Access授权',
-      desc: 'access授权',
       component: {
-        name: 'access-provider-selector',
+        name: 'access-selector',
-        filter: 'aliyun'
+        type: 'aliyun'
       },
       required: true
     }

packages/plugins/plugin-aliyun/src/utils/index.js

@@ -0,0 +1,3 @@
+export const ZoneOptions = [
+  { value: 'cn-hangzhou' }
+]

packages/plugins/plugin-host/src/access-providers/ssh.js

@@ -2,7 +2,7 @@ export class SSHAccessProvider {
   static define () {
     return {
       name: 'ssh',
-      label: '主机',
+      title: '主机',
       desc: '',
       input: {
         host: { rules: [{ required: true, message: '此项必填' }] },
@@ -17,7 +17,8 @@ export class SSHAccessProvider {
         },
         password: { helper: '登录密码' },
         privateKey: {
-          helper: '密钥，密码或此项必填一项'
+          title: '密钥',
+          helper: '密钥或密码必填一项'
         }
       }
     }

packages/plugins/plugin-host/src/plugins/upload-to-host/index.js

@@ -28,7 +28,11 @@ export class UploadCertToHost extends AbstractHostPlugin {
           rules: [{ required: true, message: '此项必填' }]
         },
         sudo: {
-          title: '是否sudo'
+          title: '是否sudo',
+          component: {
+            name: 'a-checkbox',
+            vModel: 'checked'
+          }
         }
       },
       output: {

packages/plugins/plugin-tencent/src/access-providers/dnspod.js

@@ -2,7 +2,7 @@ export class DnspodAccessProvider {
   static define () {
     return {
       name: 'dnspod',
-      label: 'dnspod',
+      title: 'dnspod',
       desc: '腾讯云的域名解析接口已迁移到dnspod',
       input: {
         id: {

packages/plugins/plugin-tencent/src/access-providers/tencent.js

@@ -2,7 +2,7 @@ export class TencentAccessProvider {
   static define () {
     return {
       name: 'tencent',
-      label: '腾讯云',
+      title: '腾讯云',
       input: {
         secretId: {
           component: {

packages/plugins/plugin-tencent/src/dns-providers/dnspod.js

@@ -5,7 +5,7 @@ export class DnspodDnsProvider extends AbstractDnsProvider {
   static define () {
     return {
       name: 'dnspod',
-      label: 'dnspod(腾讯云)',
+      title: 'dnspod(腾讯云)',
       desc: '腾讯云的域名解析接口已迁移到dnspod',
       input: {
         accessProvider: {

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

@@ -12,7 +12,7 @@ export class DeployCertToTencentCDN extends AbstractTencentPlugin {
   static define () {
     return {
       name: 'deployCertToTencentCDN',
-      label: '部署到腾讯云CDN',
+      title: '部署到腾讯云CDN',
       input: {
         domainName: {
           title: 'cdn加速域名',

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

@@ -10,7 +10,7 @@ export class DeployCertToTencentCLB extends AbstractTencentPlugin {
   static define () {
     return {
       name: 'deployCertToTencentCLB',
-      label: '部署到腾讯云CLB',
+      title: '部署到腾讯云CLB',
       desc: '暂时只支持单向认证证书，暂时只支持通用负载均衡',
       input: {
         region: {

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

@@ -11,7 +11,7 @@ export class DeployCertToTencentTKEIngress extends AbstractTencentPlugin {
   static define () {
     return {
       name: 'deployCertToTencentTKEIngress',
-      label: '部署到腾讯云TKE-ingress',
+      title: '部署到腾讯云TKE-ingress',
       desc: '需要【上传到腾讯云】作为前置任务',
       input: {
         region: {

packages/plugins/plugin-tencent/src/plugins/upload-to-tencent/index.js

@@ -11,18 +11,18 @@ export class UploadCertToTencent extends AbstractTencentPlugin {
   static define () {
     return {
       name: 'uploadCertToTencent',
-      label: '上传证书到腾讯云',
+      title: '上传证书到腾讯云',
+      desc: '成功后获取，tencentCertId',
       input: {
         name: {
-          label: '证书名称'
+          title: '证书名称'
         },
         accessProvider: {
-          label: 'Access授权',
+          title: 'Access授权',
-          type: [String, Object],
+          helper: 'access授权',
-          desc: 'access授权',
           component: {
-            name: 'access-provider-selector',
+            name: 'access-selector',
-            filter: 'tencent'
+            type: 'tencent'
           },
           required: true
         }