@@ -201,6 +210,7 @@
import columns from '../types/table.columns';
import useLoading from '@/hooks/loading';
import { copy } from '@/hooks/copy';
+ import { dateFormat } from '@/utils';
import UserSelector from '@/components/user/user/selector/index.vue';
import HostSelector from '@/components/asset/host/selector/index.vue';
import ConnectLogClearModal from './connect-log-clear-modal.vue';
diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts b/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
index 185909ff..8c9d1872 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
@@ -46,12 +46,7 @@ const columns = [
dataIndex: 'connectTime',
slotName: 'connectTime',
align: 'left',
- width: 318,
- render: ({ record }) => {
- return (record.startTime && dateFormat(new Date(record.startTime)))
- + ' - '
- + (record.endTime && dateFormat(new Date(record.endTime)) || '现在');
- },
+ width: 192,
}, {
title: '操作',
slotName: 'handle',
diff --git a/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts b/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts
index d9c5fead..8c9a539d 100644
--- a/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset-audit/sftp-log/types/table.columns.ts
@@ -34,6 +34,7 @@ const columns = [
dataIndex: 'paths',
slotName: 'paths',
align: 'left',
+ minWidth: 238,
}, {
title: '执行结果',
dataIndex: 'result',
diff --git a/orion-visor-ui/src/views/asset/host-config/components/ssh-config-form.vue b/orion-visor-ui/src/views/asset/host-config/components/ssh-config-form.vue
index c0ed63e1..55411ce6 100644
--- a/orion-visor-ui/src/views/asset/host-config/components/ssh-config-form.vue
+++ b/orion-visor-ui/src/views/asset/host-config/components/ssh-config-form.vue
@@ -84,7 +84,7 @@
:hide-asterisk="true">
-
+
diff --git a/orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue b/orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
index bca64d5a..67c931d7 100644
--- a/orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
+++ b/orion-visor-ui/src/views/asset/host-key/components/host-key-form-drawer.vue
@@ -179,13 +179,15 @@
// 选择公钥文件
const selectPublicFile = async (fileList: FileItem[]) => {
- formModel.value.publicKey = await readFileText(fileList[0].file as File);
+ formModel.value.publicKey = await readFileText(fileList[fileList.length - 1].file as File);
+ fileList.length = 0;
formRef.value.clearValidate('publicKey');
};
// 选择私钥文件
const selectPrivateFile = async (fileList: FileItem[]) => {
- formModel.value.privateKey = await readFileText(fileList[0].file as File);
+ formModel.value.privateKey = await readFileText(fileList[fileList.length - 1].file as File);
+ fileList.length = 0;
formRef.value.clearValidate('privateKey');
};
diff --git a/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts b/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
index 0531c012..4be4187d 100644
--- a/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-command-log/types/table.columns.ts
@@ -22,6 +22,7 @@ const columns = [
slotName: 'command',
align: 'left',
ellipsis: true,
+ minWidth: 238,
}, {
title: '执行用户',
dataIndex: 'username',
diff --git a/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts b/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
index e67a9958..fbf24deb 100644
--- a/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/upload-task/types/table.columns.ts
@@ -31,6 +31,7 @@ const columns = [
align: 'left',
ellipsis: true,
tooltip: true,
+ minWidth: 238,
}, {
title: '上传状态',
dataIndex: 'status',
diff --git a/orion-visor-ui/src/views/host/terminal/components/new-connection/new-connection-view.vue b/orion-visor-ui/src/views/host/terminal/components/new-connection/new-connection-view.vue
index fda7c28e..c3f73de3 100644
--- a/orion-visor-ui/src/views/host/terminal/components/new-connection/new-connection-view.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/new-connection/new-connection-view.vue
@@ -18,6 +18,7 @@
:allow-clear="true"
:data="filterOptions"
:filter-option="tagLabelFilter">
+
@@ -107,7 +108,7 @@
.host-view-container {
width: 100%;
- height: calc(100vh - 240px);
+ height: calc(100vh - 242px);
position: relative;
}
}
diff --git a/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue b/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue
index 6dbff224..05d34cf9 100644
--- a/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/setting/display/terminal-display-block.vue
@@ -22,10 +22,12 @@
:options="toOptions(fontFamilyKey)"
:allow-create="true"
:filter-option="labelFilter">
-
+
+
{{ data.label }}
-
+
+
{{ data.label }}
diff --git a/orion-visor-ui/src/views/host/terminal/components/setting/theme/terminal-theme-block.vue b/orion-visor-ui/src/views/host/terminal/components/setting/theme/terminal-theme-block.vue
index b1c2dfe2..2d832024 100644
--- a/orion-visor-ui/src/views/host/terminal/components/setting/theme/terminal-theme-block.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/setting/theme/terminal-theme-block.vue
@@ -10,7 +10,9 @@
-
+
@@ -18,9 +20,9 @@
选择后会立刻保存, 刷新页面后生效