Merge pull request #6742 from GuoLiBin6/automated-cherry-pick-of-#673…

…8-upstream-release-3.9 Automated cherry pick of #6738: fix(v3.9): Operation logs display resource type from _i18n
yunionio · Jun 19, 2024 · 2e491e6 · 2e491e6
2 parents dba91cc + 51edc30
commit 2e491e6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/sections/EventList/index.vue b/src/sections/EventList/index.vue
@@ -242,8 +242,14 @@ export default {
           title: this.$t('scope.text_653'),
           field: 'obj_type',
           hideField: true,
-          message: row => this.$te(`dictionary.${row.obj_type}`) ? this.$t(`dictionary.${row.obj_type}`) : row.obj_type,
-          slotCallback: row => this.$te(`dictionary.${row.obj_type}`) ? this.$t(`dictionary.${row.obj_type}`) : row.obj_type,
+          message: row => {
+            const { _i18n = {} } = row
+            return _i18n.obj_type || (this.$te(`dictionary.${row.obj_type}`) ? this.$t(`dictionary.${row.obj_type}`) : row.obj_type)
+          },
+          slotCallback: row => {
+            const { _i18n = {} } = row
+            return _i18n.obj_type || (this.$te(`dictionary.${row.obj_type}`) ? this.$t(`dictionary.${row.obj_type}`) : row.obj_type)
+          },
         }),
         {
           title: this.$t('common.operation_type'),