From ca8307338ff0e1f3c1dcb7a31bb2ac78fb51ec78 Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Thu, 10 Jun 2021 19:18:32 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=20(#842)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* perf: 修改命令存储创建

* perf: 继续优化名称

xxx

Co-authored-by: ibuler <ibuler@qq.com>
---
 src/i18n/langs/cn.json                    | 7 +++++--
 src/i18n/langs/en.json                    | 7 +++++--
 src/views/audits/CommandExecutionList.vue | 8 ++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 15d4327d3..2fe6cf88c 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -200,13 +200,14 @@
     "HostProtocol": "主机协议",
     "DatabaseProtocol": "数据库协议",
     "OtherProtocol": "其它协议"
-
   },
   "audits": {
     "Hosts": "主机",
     "RunUser": "运行用户",
     "User": "用户",
-    "View": "查看"
+    "Username": "用户名",
+    "View": "查看",
+    "SystemUserName": "系统用户名"
   },
   "auth": {
     "LoginRequiredMsg": "账号已退出，请重新登录",
@@ -303,6 +304,7 @@
     "View": "查看",
     "Yes": "是",
     "action": "动作",
+    "User": "用户",
     "activateSelected": "激活所选",
     "bulkDeleteErrorMsg": "批量删除失败: ",
     "bulkDeleteSuccessMsg": "批量删除成功",
@@ -931,6 +933,7 @@
     "UpdateNodeAssetHardwareInfo": "更新节点资产硬件信息"
   },
   "users": {
+    "UserName": "姓名",
     "Account": "账户",
     "Authentication": "认证",
     "Comment": "备注",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 8894ff87d..2b500bef2 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -198,12 +198,14 @@
     "ipDomain": "IP(Domain)",
     "HostProtocol": "Host Protocol",
     "DatabaseProtocol": "Database Protocol",
-    "Other Protocol": "Database Protocol"
+    "OtherProtocol": "Other Protocol"
   },
   "audits": {
     "Hosts": "Host",
     "RunUser": "Run user",
     "User": "User",
+    "Username": "Username",
+    "SystemUserName": "System username",
     "View": "View"
   },
   "auth": {
@@ -712,8 +714,8 @@
       "common": "common"
     },
     "Monitor": "Monitor",
-    "sessionMonitor": "Session Monitor",
     "XRDPNotSupport": "RDP Client session not support now",
+    "sessionMonitor": "Session Monitor",
     "TerminateTaskSendSuccessMsg": "Terminate task has been send, Please check later",
     "helpText": {
       "esUrl": "Tip: If you have multiple hosts, use comma (,) to split (eg: http://www.jumpserver.a.com,http://www.jumpserver.b.com)",
@@ -927,6 +929,7 @@
     "UpdateNodeAssetHardwareInfo": "Update node asset hardware information"
   },
   "users": {
+    "UserName": "Name",
     "Account": "Account",
     "Existing":"Existing",
     "Authentication": "Account",
diff --git a/src/views/audits/CommandExecutionList.vue b/src/views/audits/CommandExecutionList.vue
index 51239ef52..c0969fb57 100644
--- a/src/views/audits/CommandExecutionList.vue
+++ b/src/views/audits/CommandExecutionList.vue
@@ -99,12 +99,12 @@ export default {
         searchConfig: {
           options: [
             {
-              label: this.$t('audits.User'),
-              value: 'user__name'
+              label: this.$t('audits.Username'),
+              value: 'user__username'
             },
             {
-              label: this.$t('audits.RunUser'),
-              value: 'run_as__name'
+              label: this.$t('audits.SystemUserName'),
+              value: 'run_as__username'
             }
           ]
         },