fix: Adding a cluster Modify node information and ports

RainBondsongyg · Sep 4, 2023 · bc521f2 · bc521f2
1 parent 66ee777
commit bc521f2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/src/components/Cluster/RKEClusterAdd/index.js b/src/components/Cluster/RKEClusterAdd/index.js
@@ -104,13 +104,14 @@ class EditableCell extends React.Component {
  required: true,
  message: formatMessage({ id: 'enterpriseColony.addCluster.host.Required' }, { title: title })
  },
- { validator: this.validateIP }
  ];
  const ips = dataIndex === 'ip' || dataIndex === 'internalIP';
  if (ips) {
  rules.push({
  message: formatMessage({ id: 'enterpriseColony.addCluster.host.correct_IP' }),
  pattern: new RegExp(ipRegs, 'g')
+ },{
+ validator: this.validateIP 
  });
  }
  const sshPort = dataIndex === 'sshPort';
@@ -815,7 +816,13 @@ export default class RKEClusterConfig extends PureComponent {
  text.map(item => <Tag color="blue">{this.nodeRole(item)}</Tag>)
  },
  {
- title: formatMessage({ id: 'enterpriseColony.addCluster.host.connectivity' }),
+ title: 
+ <div>
+ {formatMessage({ id: 'enterpriseColony.addCluster.host.connectivity' })}&nbsp;
+ <Tooltip placement='bottom' title={formatMessage({ id: 'enterpriseColony.addCluster.host.connectivity.desc' })}>
+ <Icon type="question-circle" />
+ </Tooltip>
+ </div>,
  dataIndex: 'msg',
  width: 160,
  render: (text, record) => {

diff --git a/src/locales/en-US/enterprise.js b/src/locales/en-US/enterprise.js
@@ -550,6 +550,7 @@ const enterpriseColony = {
  'enterpriseColony.addCluster.host.input_rke': 'Fill in RKE cluster configuration',
  'enterpriseColony.addCluster.host.status':'Status',
  'enterpriseColony.addCluster.host.connectivity':'SSH connectivity',
+ 'enterpriseColony.addCluster.host.connectivity.desc':'This item mainly detects whether the ssh docker@< extranet IP> from the console container can be successfully logged in without encryption.',
  'enterpriseColony.addCluster.host.checking':'Checking...',
  'enterpriseColony.addCluster.host.await_check':'Wait for detection',
  'enterpriseColony.addCluster.host.ip': 'Externel IP',

diff --git a/src/locales/en-US/team.js b/src/locales/en-US/team.js
@@ -114,7 +114,7 @@ const teamAdd = {
  'teamAdd.create.upload.uploadFiles.k8s':'Import Kubernetes Resources',
  'teamAdd.create.upload.uploadFiles.k8s.text':'Import Kubernetes',
  'teamAdd.create.upload.uploadFiles.helm':'Helm Command',
- 'teamAdd.create.upload.uploadJWar':'You can upload files in Jar and War formats',
+ 'teamAdd.create.upload.uploadJWar':'You can upload files in Jar, War, Zip, and Tar formats',
  'teamAdd.create.upload.uploadYaml':'Only YAML files can be uploaded',
  'teamAdd.create.upload.TeamWizard.helm':'Helm',
  'teamAdd.create.upload.TeamWizard.yaml':'Yaml',

diff --git a/src/locales/zh-CN/enterprise.js b/src/locales/zh-CN/enterprise.js
@@ -551,6 +551,7 @@ const enterpriseColony = {
  'enterpriseColony.addCluster.host.input_rke':'填写RKE集群配置',
  'enterpriseColony.addCluster.host.status':'状态',
  'enterpriseColony.addCluster.host.connectivity':'SSH 连通性',
+ 'enterpriseColony.addCluster.host.connectivity.desc':'该项主要检测从控制台容器 `ssh docker@<外网IP>` 是否能免密登陆成功。',
  'enterpriseColony.addCluster.host.checking':'检测中...',
  'enterpriseColony.addCluster.host.await_check':'等待检测',
  'enterpriseColony.addCluster.host.ip':'IP 地址',

diff --git a/src/locales/zh-CN/team.js b/src/locales/zh-CN/team.js
@@ -114,7 +114,7 @@ const teamAdd = {
  'teamAdd.create.upload.uploadFiles.k8s':'导入 Kubernetes',
  'teamAdd.create.upload.uploadFiles.k8s.text':'导入 Kubernetes',
  'teamAdd.create.upload.uploadFiles.helm':'Helm',
- 'teamAdd.create.upload.uploadJWar':'支持Jar、War格式上传文件',
+ 'teamAdd.create.upload.uploadJWar':'支持Jar、War、Zip、Tar格式上传文件',
  'teamAdd.create.upload.uploadYaml':'只支持yaml格式上传多文件',
  'teamAdd.create.upload.TeamWizard.helm':'Helm',
  'teamAdd.create.upload.TeamWizard.yaml':'Yaml',