From 8c003b9d1dda72371183faffac688d5883b7ad12 Mon Sep 17 00:00:00 2001
From: awenes <1121353141@qq.com>
Date: Thu, 5 Oct 2023 11:20:22 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/UserList/components/User/User.tsx | 47 +++++++------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
index 40db28ee..dbb73d48 100644
--- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
+++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx
@@ -39,7 +39,6 @@ import {
   Table,
   Tooltip,
   Typography,
-  Tag,
   Popover,
 } from 'antd';
 import React, { useRef, useState } from 'react';
@@ -185,46 +184,34 @@ export default (props: UserListProps) => {
       search: false,
       ellipsis: true,
       render: (_, record) => {
-        console.log(record.primaryOrgDisplayPath);
         return (
           <Popover
             key="pop"
-            title={
-              record.primaryOrgDisplayPath && (
-                <Tag color={'geekblue'} key={record.orgDisplayPath}>
-                  {record.primaryOrgDisplayPath}
-                </Tag>
-              )
-            }
+            title={intl.formatMessage({
+              id: 'pages.account.user_list.user.columns.org_display_path',
+            })}
             content={
-              <Space direction="vertical" size="small" style={{ display: 'flex' }}>
-                {record.orgDisplayPath?.split(',')?.map((p: string) => {
-                  return (
-                    <Tag color={'green'} key={p}>
-                      {p}
-                    </Tag>
-                  );
-                })}
-              </Space>
+              <>
+                {record.primaryOrgDisplayPath && (
+                  <Space key="primary_path">{record.primaryOrgDisplayPath}</Space>
+                )}
+                {record.orgDisplayPath && (
+                  <Space key="path" direction="vertical" size="small" style={{ display: 'flex' }}>
+                    {record.orgDisplayPath?.split(',')?.map((p: string) => {
+                      return p;
+                    })}
+                  </Space>
+                )}
+              </>
             }
           >
             {record.primaryOrgDisplayPath && (
-              <Space key="primary_path">
-                {
-                  <Tag color={'geekblue'} key={record.primaryOrgDisplayPath}>
-                    {record.primaryOrgDisplayPath}
-                  </Tag>
-                }
-              </Space>
+              <Space key="primary_path">{record.primaryOrgDisplayPath}</Space>
             )}
             {record.orgDisplayPath && (
               <Space key="path" direction="vertical" size="small" style={{ display: 'flex' }}>
                 {record.orgDisplayPath?.split(',')?.map((p: string) => {
-                  return (
-                    <Tag color={'green'} key={p}>
-                      {p}
-                    </Tag>
-                  );
+                  return p;
                 })}
               </Space>
             )}