Browse Source

fix role page UI issue

Signed-off-by: ryjiang <jiangruiyi@gmail.com>
ryjiang 1 year ago
parent
commit
cad507e49d
1 changed files with 17 additions and 14 deletions
  1. 17 14
      client/src/pages/user/Roles.tsx

+ 17 - 14
client/src/pages/user/Roles.tsx

@@ -41,20 +41,7 @@ const Roles = () => {
     setRoles(
       roles.results.map((v: any) => ({
         name: v.role.name,
-        privilegeContent: (
-          <>
-            {v.entities.map((e: any) => {
-              return (
-                <Chip
-                  className={classes.chip}
-                  size="small"
-                  label={e.grantor.privilege.name}
-                  variant="outlined"
-                />
-              );
-            })}
-          </>
-        ),
+        privilegeContent: v,
         privileges: v.entities.map((e: any) => ({
           roleName: v.role.name,
           object: e.object.name,
@@ -181,6 +168,22 @@ const Roles = () => {
       id: 'privilegeContent',
       align: 'left',
       disablePadding: false,
+      formatter({ privilegeContent }) {
+        return (
+          <>
+            {privilegeContent.entities.map((e: any) => {
+              return (
+                <Chip
+                  className={classes.chip}
+                  size="small"
+                  label={e.grantor.privilege.name}
+                  variant="outlined"
+                />
+              );
+            })}
+          </>
+        );
+      },
       label: userTrans('privileges'),
     },
   ];