From bd41f96df3b017221308ce5507be22705043e210 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Thu, 18 Aug 2022 10:48:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=AD=97=E6=AE=B5=E5=80=BC=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/AutoDataForm/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue index 857c24bbf..0cb2360c9 100644 --- a/src/components/AutoDataForm/index.vue +++ b/src/components/AutoDataForm/index.vue @@ -79,14 +79,15 @@ export default { _cleanFormValue(form, remoteMeta) { for (const [k, v] of Object.entries(remoteMeta)) { let valueSet = form[k] - if (v.type === 'nested object') { + if (v.type === 'nested object' && v.children) { + // 有一些字段属性时 nested object 类型，但是没有 children，没有children的不需要走递归逻辑， + // 比如：认证配置中的属性映射字段 if (typeof valueSet !== 'object') { + // 处理一些前端没有设置初始值的情况 valueSet = {} } form[k] = valueSet - if (v.children) { - this._cleanFormValue(form[k], v.children) - } + this._cleanFormValue(valueSet, v.children) } if (valueSet !== undefined) { continue From 8ad0d2ac58d282d16a786d0a44c0e9ef04ea2f93 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Thu, 18 Aug 2022 11:44:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E6=89=B9=E9=87=8F=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E6=90=9C=E7=B4=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/audits/CommandExecutionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/audits/CommandExecutionList.vue b/src/views/audits/CommandExecutionList.vue index 68b482637..12eb83347 100644 --- a/src/views/audits/CommandExecutionList.vue +++ b/src/views/audits/CommandExecutionList.vue @@ -100,7 +100,7 @@ export default { options: [ { label: this.$t('audits.Hosts'), - value: 'asset__hostname' + value: 'hostname_ip' } ] }, From b10f7faf25a053fc68c87470a58f6e86f59174d4 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Thu, 18 Aug 2022 15:09:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en.json | 1 + src/i18n/langs/ja.json | 1 + src/router/tickets/index.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 4867ec99c..727a1a54b 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -671,6 +671,7 @@ }, "route": { "": "", + "AssignedTicketList": "Assigned tickets", "CreateEndpoint": "Create endpoint", "UpdateEndpoint": "Update endpoint", "CreateEndpointRule": "Create endpoint rule", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index 90fbecf53..a417185cf 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -681,6 +681,7 @@ }, "route": { "": "", + "AssignedTicketList": "割り当て済みワークオーダー", "CreateEndpoint": "エンドポイントを作成する", "UpdateEndpoint": "エンドポイントを更新", "CreateEndpointRule": "エンドポイントルールを作成する", diff --git a/src/router/tickets/index.js b/src/router/tickets/index.js index a11e6faf7..cfc4323c8 100644 --- a/src/router/tickets/index.js +++ b/src/router/tickets/index.js @@ -22,7 +22,7 @@ export default { name: 'MyTicketList', component: () => import('@/views/tickets/MyTicketList'), meta: { - title: i18n.t('route.MyTickets'), + title: i18n.t('tickets.MyTickets'), icon: 'file-text-o', showOrganization: false, permissions: []