From 69d963f2a9b8e68d55496e1ce6eb966e1c256f38 Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Mon, 7 Mar 2022 15:05:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8C=BA=E5=88=86=E7=B3=BB=E7=BB=9F=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E3=80=81=E7=BB=84=E7=BB=87=E8=A7=92=E8=89=B2=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=80=E8=AF=B7=E7=94=A8=E6=88=B7=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/GenericDetailPage/index.vue    | 12 ++++++++----
 src/views/users/Role/RoleDetail/index.vue            |  7 +++++++
 .../users/User/components/InviteUsersDialog.vue      |  7 ++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/GenericDetailPage/index.vue b/src/layout/components/GenericDetailPage/index.vue
index 7f5f883a5..33e65f5c9 100644
--- a/src/layout/components/GenericDetailPage/index.vue
+++ b/src/layout/components/GenericDetailPage/index.vue
@@ -37,6 +37,11 @@ export default {
       type: Object,
       required: true
     },
+    titlePrefix: {
+      type: String,
+      required: false,
+      default: ''
+    },
     title: {
       type: String,
       default: ''
@@ -66,12 +71,11 @@ export default {
     getTitle: {
       type: Function,
       default: function(obj) {
-        const objectType = this.$route.meta.title
-          .replace('Detail', '')
-          .replace('详情', '')
+        const objectType = this.$route.meta.title.replace('Detail', '').replace('详情', '')
         this.$log.debug('Object is: ', obj)
+        const titlePrefix = this.titlePrefix || objectType
         const objectName = this.getObjectName(obj)
-        let title = `${objectType}: ${objectName}`
+        let title = `${titlePrefix}: ${objectName}`
         if (title.length > 80) {
           title = title.slice(0, 80) + '...'
         }
diff --git a/src/views/users/Role/RoleDetail/index.vue b/src/views/users/Role/RoleDetail/index.vue
index d630699ae..f893bd541 100644
--- a/src/views/users/Role/RoleDetail/index.vue
+++ b/src/views/users/Role/RoleDetail/index.vue
@@ -26,11 +26,18 @@ export default {
     const vm = this
     const scope = this.$route.query['scope']
     const scopeRole = `${scope}role`
+    let titlePrefix = ''
+    if (scope === 'org') {
+      titlePrefix = vm.$t('route.OrgRole')
+    } else if (scope === 'system') {
+      titlePrefix = vm.$t('route.SystemRole')
+    }
     return {
       scope: scope,
       scopeRole: scope + 'role',
       role: { name: '', comment: '', users: [] },
       config: {
+        titlePrefix: titlePrefix,
         url: `/api/v1/rbac/${scope}-roles`,
         activeMenu: 'RoleInfo',
         actions: {
diff --git a/src/views/users/User/components/InviteUsersDialog.vue b/src/views/users/User/components/InviteUsersDialog.vue
index 1d2577ddc..dd49ed7aa 100644
--- a/src/views/users/User/components/InviteUsersDialog.vue
+++ b/src/views/users/User/components/InviteUsersDialog.vue
@@ -19,6 +19,7 @@ import Dialog from '@/components/Dialog'
 import { Select2 } from '@/components'
 import { GenericCreateUpdateForm } from '@/layout/components'
 import { mapGetters } from 'vuex'
+import rules from '@/components/DataForm/rules'
 export default {
   components: {
     Dialog,
@@ -48,11 +49,15 @@ export default {
             component: Select2,
             el: {
               ajax: {
-                url: '/api/v1/users/users/suggestions/?oid=root'
+                url: '/api/v1/users/users/suggestions/?oid=root',
+                transformOption: (item) => {
+                  return { label: `${item.name}(${item.username})`, value: item.id }
+                }
               }
             }
           },
           org_roles: {
+            rules: [rules.RequiredChange],
             component: Select2,
             el: {
               ajax: {