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 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: [] 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' } ] },