diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue index bde1d424..ff304ebc 100644 --- a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue +++ b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue @@ -76,12 +76,12 @@ + + + + diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue b/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue index c18cc3da..301fbcc1 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue +++ b/orion-visor-ui/src/views/asset/host-list/components/host-form-ssh.vue @@ -18,8 +18,7 @@ + :help="HostAuthType.IDENTITY === formModel.authType ? '将使用主机身份的用户名' : undefined"> @@ -37,8 +36,7 @@ + :rules="passwordRules"> @@ -256,6 +254,11 @@ width: 100%; display: flex; justify-content: space-between; + + :deep(.arco-radio-button) { + width: 33%; + text-align: center; + } } .password-switch { diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue index 180ce82e..57c0ba06 100644 --- a/orion-visor-ui/src/views/asset/host-list/components/host-table.vue +++ b/orion-visor-ui/src/views/asset/host-list/components/host-table.vue @@ -257,13 +257,13 @@ 连接 diff --git a/orion-visor-ui/src/views/asset/host-list/types/const.ts b/orion-visor-ui/src/views/asset/host-list/types/const.ts index 870a0eef..d06b91c2 100644 --- a/orion-visor-ui/src/views/asset/host-list/types/const.ts +++ b/orion-visor-ui/src/views/asset/host-list/types/const.ts @@ -72,5 +72,25 @@ export const hostStatusKey = 'hostStatus'; // 主机 SSH 认证方式 字典项 export const sshAuthTypeKey = 'hostSshAuthType'; +// 主机密码认证方式 字典项 +export const passwordAuthTypeKey = 'hostPasswordAuthType'; + +// 时区 +export const timezoneKey = 'timezone'; + +// 键盘布局 +export const keyboardLayoutKey = 'keyboardLayout'; + +// 剪切板标准 +export const clipboardNormalizeKey = 'clipboardNormalize'; + +// 剪切板编码 +export const clipboardEncodingKey = 'clipboardEncoding'; + // 加载的字典值 -export const dictKeys = [hostTypeKey, hostOsTypeKey, hostArchTypeKey, hostStatusKey, sshAuthTypeKey]; +export const dictKeys = [ + hostTypeKey, hostOsTypeKey, hostArchTypeKey, hostStatusKey, + sshAuthTypeKey, passwordAuthTypeKey, + keyboardLayoutKey, timezoneKey, clipboardNormalizeKey, + clipboardEncodingKey, +]; diff --git a/orion-visor-ui/src/views/asset/host-list/types/form.rules.ts b/orion-visor-ui/src/views/asset/host-list/types/form.rules.ts index 459a14bd..da956171 100644 --- a/orion-visor-ui/src/views/asset/host-list/types/form.rules.ts +++ b/orion-visor-ui/src/views/asset/host-list/types/form.rules.ts @@ -112,4 +112,24 @@ export const sshFormRules = { }], } as Record; +// rdp 表单规则 +export const rdpFormRules = { + port: [{ + required: true, + message: '请输入 RDP 端口' + }, { + min: 1, + max: 65535, + message: 'RDP 端口不合法' + }], + authType: [{ + required: true, + message: '请选择认证方式' + }], + identityId: [{ + required: true, + message: '请选择主机身份' + }], +} as Record; + export default null; diff --git a/orion-visor-ui/src/views/authentication/login/components/login-form.vue b/orion-visor-ui/src/views/authentication/login/components/login-form.vue index 53385e1c..f205de15 100644 --- a/orion-visor-ui/src/views/authentication/login/components/login-form.vue +++ b/orion-visor-ui/src/views/authentication/login/components/login-form.vue @@ -1,7 +1,9 @@