From de176466df23d25a158812883408c9d1d9b2cf43 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 6 Feb 2023 15:02:48 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compenents/el-data-table/el-data-table.vue | 14 +++++++------- src/i18n/langs/en.json | 15 +++++++++++---- src/i18n/langs/ja.json | 13 ++++++++++--- src/i18n/langs/zh.json | 9 ++++++++- .../AccountPush/AccountPushCreateUpdate.vue | 7 ------- .../CommandFilterAclCreateUpdate.vue | 4 ---- .../CommandFilterDetail/RulesCreateUpdate.vue | 4 ---- src/views/ops/Job/VariableHelpDialog.vue | 2 +- .../PlaybookDetail/Editor/NewNodeDialog.vue | 4 ++-- .../PlaybookDetail/FileNameInputDialog.vue | 2 +- src/views/settings/Applet/Applet/UploadDialog.vue | 2 +- .../AppletHost/AppletHostDetail/Applets.vue | 2 +- src/views/settings/Basic/index.vue | 1 - src/views/tickets/components/Steps.vue | 2 +- 14 files changed, 43 insertions(+), 38 deletions(-) diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue index 5cefbfa6a..227403eb9 100644 --- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue +++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue @@ -361,28 +361,28 @@ export default { */ newText: { type: String, - default: '新增' + default: this.$t('ops.Add') }, /** * 修改按钮文案 */ editText: { type: String, - default: '修改' + default: this.$t('ops.Modify') }, /** * 查看按钮文案 */ viewText: { type: String, - default: '查看' + default: this.$t('ops.View') }, /** * 删除按钮文案 */ deleteText: { type: String, - default: '删除' + default: this.$t('ops.Delete') }, /** * 删除提示语。接受要删除的数据（单个对象或数组）；返回字符串 @@ -392,7 +392,7 @@ export default { deleteMessage: { type: Function, default() { - return `确认${this.deleteText}吗?` + return this.$t('ops.Confirm') + this.deleteText + '?' } }, /** @@ -451,7 +451,7 @@ export default { onSuccess: { type: Function, default() { - return this.$message.success('操作成功') + return this.$message.success(this.$t('ops.SuccessfulOperation')) } }, /** @@ -1159,7 +1159,7 @@ export default { * @param {object|object[]} - 要删除的数据对象或数组 */ onDefaultDelete(data) { - this.$confirm(this.deleteMessage(data), '提示', { + this.$confirm(this.deleteMessage(data), this.$t('common.Info'), { type: 'warning', confirmButtonClass: 'el-button--danger', beforeClose: async(action, instance, done) => { diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index e47e6bc10..8a9b25c4b 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -748,7 +748,8 @@ "NotSpecialEmoji": "No special emoji allowed", "Task": "Task", "Cas": "CAS", - "Invalid": "Invalid" + "Invalid": "Invalid", + "Filename": "Filename" }, "dashboard": { "ActiveAsset": "Asset active", @@ -954,7 +955,12 @@ "TaskDispatch": "The task was sent successfully", "PrivilegedFirst": "Prefer privileged accounts", "CloseConfirm": "Confirm close", - "SelectCreateMethod": "Choose how to create" + "SelectCreateMethod": "Choose how to create", + "View": "View", + "BuiltinVariable": "Builtin variable", + "Add": "Add", + "SuccessfulOperation": "Successful operation", + "Modify": "Modify" }, "perms": { "": "", @@ -1614,7 +1620,8 @@ "TwoAssignee": "Secondary Recipient", "SuperAdmin": "Super administrator", "FlowDetail": "Flow detail", - "OneAssignee": "First-level Assignee" + "OneAssignee": "First-level Assignee", + "RelevantAssignees": "Relevant assignees" }, "tree": { "AddAssetToNode": "Add asset to node", @@ -2014,4 +2021,4 @@ "PublishStatus": "Publish status", "NoPublished": "Unpublished" } -} +} \ No newline at end of file diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index 72f5b72b8..6e0c458a0 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -747,7 +747,8 @@ "Task": "タスク", "Invalid": "無効", "PublishAllApplets": "すべてのアプリを公開する", - "Sync": "同期する" + "Sync": "同期する", + "Filename": "ファイル名" }, "dashboard": { "ActiveAsset": "最近ログインされました", @@ -953,7 +954,12 @@ "RunasPolicy": "アカウント ポリシー", "PrivilegedFirst": "優先特権アカウント", "CloseConfirm": "閉じることを確認", - "SelectCreateMethod": "作り方を選ぶ" + "SelectCreateMethod": "作り方を選ぶ", + "View": "チェック", + "BuiltinVariable": "組み込み変数", + "Add": "追加", + "SuccessfulOperation": "成功した操作", + "Modify": "改訂" }, "perms": { "": "", @@ -1605,7 +1611,8 @@ "ApplyRunSystemUser": "実行を申請するシステムユーザー", "ApplyRunCommand": "実行を申請するコマンド", "ApplyFromSession": "会話", - "ApplyFromCMDFilterRule": "コマンドフィルタルール" + "ApplyFromCMDFilterRule": "コマンドフィルタルール", + "RelevantAssignees": "関連する譲受人" }, "tree": { "AddAssetToNode": "ノードにアセットを追加", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index bdee27711..2ea9a2016 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -425,6 +425,7 @@ "ReLoginErr": "登录时长已超过 5 分钟，请重新登录" }, "common": { + "Filename": "文件名", "ApproverNumbers": "审批人数量", "Overview": "概览", "Now": "现在", @@ -812,7 +813,12 @@ "Weekly": "按周" }, "ops": { + "Add": "新增", + "Modify": "修改", + "View": "查看", "Confirm": "确认", + "Delete": "删除", + "SuccessfulOperation": "操作成功", "Cancel": "取消", "DeleteFile": "删除文件", "DeleteConfirmMessage": "删除后无法恢复,是否继续?", @@ -823,7 +829,6 @@ "NewFile": "新建文件", "NewDirectory": "新建目录", "Rename": "重命名", - "Delete": "删除", "SelectCreateMethod": "选择创建方式", "Workspace": "工作空间", "UploadPlaybook": "上传 Playbook", @@ -858,6 +863,7 @@ "ScriptDetail": "脚本详情", "AssetResultDetail": "资产结果", "VariableHelpText": "您可以在命令中使用 {{ key }} 读取内置变量", + "BuiltinVariable": "内置变量", "ChdirHelpText": "默认执行目录为执行用户的 home 目录", "OpenCommand": "打开命令", "SaveCommand": "保存命令 ", @@ -1533,6 +1539,7 @@ "testHelpText": "请输入目的地址进行测试" }, "tickets": { + "RelevantAssignees": "相关受理人", "OneAssigneeType": "一级受理人类型", "OneAssignee": "一级受理人", "TwoAssigneeType": "二级受理人类型", diff --git a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue index 87ea920c1..c861c79e0 100644 --- a/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue +++ b/src/views/accounts/AccountPush/AccountPushCreateUpdate.vue @@ -26,13 +26,6 @@ export default { }, url: '/api/v1/accounts/push-account-automations/', fields: [ - // ['触发方式', ['triggers']], - // [this.$t('assets.Account'), [ - // 'username', 'dynamic_username', - // 'secret_type', 'secret_strategy', 'secret', - // 'password_rules', 'ssh_key', 'passphrase' - // ]], - // [this.$t('common.Action'), ['action', 'ssh_key_change_strategy']], [this.$t('common.Basic'), ['name']], [this.$t('xpack.Asset'), ['accounts', 'assets', 'nodes']], [ diff --git a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue index 1e8ad9706..2f8f3524b 100644 --- a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue +++ b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate.vue @@ -49,10 +49,6 @@ export default { accounts: { fields: ['username_group'] }, - priority: { - // helpText: '优先级可选范围为1-100，1最低优先级，100最高优先级' - // helpText: this.$t('assets.CommandFilterRulePriorityHelpText') - }, action: { }, command_groups: { diff --git a/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue b/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue index cf94bfa31..1eaf34806 100644 --- a/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue +++ b/src/views/assets/CommandFilter/CommandFilterDetail/RulesCreateUpdate.vue @@ -64,10 +64,6 @@ export default { }, helpText: '' }, - priority: { - // helpText: '优先级可选范围为1-100，1最低优先级，100最高优先级' - // helpText: this.$t('assets.CommandFilterRulePriorityHelpText') - }, reviewers: { hidden: (item) => item.action !== 2, rules: [rules.RequiredChange], diff --git a/src/views/ops/Job/VariableHelpDialog.vue b/src/views/ops/Job/VariableHelpDialog.vue index b0db70b61..0f2e7448d 100644 --- a/src/views/ops/Job/VariableHelpDialog.vue +++ b/src/views/ops/Job/VariableHelpDialog.vue @@ -31,7 +31,7 @@ export default { }, data() { return { - title: '内置变量', + title: this.$t('ops.BuiltinVariable'), variables: {} } }, diff --git a/src/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue b/src/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue index 1d0836376..a4234b2a5 100644 --- a/src/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue +++ b/src/views/ops/Template/Playbook/PlaybookDetail/Editor/NewNodeDialog.vue @@ -1,7 +1,7 @@