Merge pull request #2001 from jumpserver/dev

v2.25.0

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

src/i18n/langs/en.json

@@ -671,6 +671,7 @@
   },
   "route": {
     "": "",
+    "AssignedTicketList": "Assigned tickets",
     "CreateEndpoint": "Create endpoint",
     "UpdateEndpoint": "Update endpoint",
     "CreateEndpointRule": "Create endpoint rule",

src/i18n/langs/ja.json

@@ -681,6 +681,7 @@
   },
   "route": {
     "": "",
+    "AssignedTicketList": "割り当て済みワークオーダー",
     "CreateEndpoint": "エンドポイントを作成する",
     "UpdateEndpoint": "エンドポイントを更新",
     "CreateEndpointRule": "エンドポイントルールを作成する",

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: []

src/views/audits/CommandExecutionList.vue

@@ -100,7 +100,7 @@ export default {
             options: [
               {
                 label: this.$t('audits.Hosts'),
-                value: 'asset__hostname'
+                value: 'hostname_ip'
               }
             ]
           },