cfel-base-components 2.5.20 → 2.5.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "2.5.20",
+  "version": "2.5.22",
   "description": "cfel-base-components",
   "main": "/src/index.tsx",
   "types": "src/index.d.ts",

package/src/components/layout/index.tsx

@@ -19,11 +19,15 @@ export interface LiosLayoutlProps {
     availableAmount: string;
     currency: string;
   };
+  MyLoginInfo?: {
+    isAdmin: any;
+  };
   amountInfo?: {
     residueNum: string;
     currencyCode: string;
   };
   myWalletInfoAction?: Function;
+  myLoginInfoAction?: Function;
   logoutUrl?: string;
   switchTenantUrl?: string;
   defaultOpenKeys?: string[];
@@ -43,8 +47,10 @@ export default function LiosLayout(props: LiosLayoutlProps) {
 
     defaultOpenKeys,
     myWalletInfo,
+    MyLoginInfo,
     amountInfo,
     myWalletInfoAction,
+    myLoginInfoAction,
     isHideHeader,
   } = props;
 
@@ -154,6 +160,7 @@ export default function LiosLayout(props: LiosLayoutlProps) {
               content={
                 <UserCard
                   myWalletInfo={myWalletInfo}
+                  MyLoginInfo={MyLoginInfo}
                   amountInfo={amountInfo}
                   customAction={customAction}
                   isCopied={isCopied}
@@ -171,6 +178,8 @@ export default function LiosLayout(props: LiosLayoutlProps) {
                   tenantId:false
                 });
                 myWalletInfoAction && myWalletInfoAction();
+                myLoginInfoAction && myLoginInfoAction();
+                
               }}
             >
               <div className="layout-header-user">

package/src/components/layout/user-card/index.tsx

@@ -27,7 +27,9 @@ interface MyWalletInfoType {
   availableAmount: string;
   currency: string;
 }
-
+interface MyLoginInfoType {
+  isAdmin: any;
+}
 interface AmountInfoType {
   residueNum: string;
   currencyCode: string;
@@ -48,6 +50,7 @@ const renderCurrency = (currency: string) => {
 
 export default function UserCard({
   myWalletInfo,
+  MyLoginInfo,
   amountInfo,
   customAction,
   isCopied,
@@ -63,6 +66,8 @@ export default function UserCard({
 
   const { availableCashAmount, availableAmount, currency }: MyWalletInfoType =
     myWalletInfo || {};
+  const { isAdmin }: MyLoginInfoType = MyLoginInfo || {};
+    
   const { residueNum, currencyCode }: AmountInfoType = amountInfo || {};
 
   const UserCard = () => {
@@ -71,7 +76,7 @@ export default function UserCard({
         <div className="user-info">
           <div className="user-avatarBox">
             <img className="user-avatar" src={avatar} />
-            <div className="user-mater">{isMaster ? "主账号" : "子账号"}</div>
+            <div className="user-mater">{isAdmin ? "主账号" : "子账号"}</div>
           </div>
           <div className="user-info-right">
             <span className="name">{name}</span>
@@ -111,10 +116,7 @@ export default function UserCard({
               {isCopied?.['account'] ? "已复制" : <CopyOutlined />}
             </div>
           </div>
-          <div className="lios-li li-flex">
-            <div className="lios-keyMare">租户</div>
-            <div className="lios-valueMare"  title={tenant?.name}>{tenant?.name}</div>
-          </div>
+          
           <div className="lios-li li-flex">
             <div className="lios-keyMare">租户ID</div>
             <div className="lios-valueMare"  title={tenant?.id}>{tenant?.id}</div>
@@ -127,6 +129,10 @@ export default function UserCard({
               {isCopied?.['tenantId'] ? "已复制" : <CopyOutlined />}
             </div>
           </div>
+          <div className="lios-li li-flex">
+            <div className="lios-keyMare">租户</div>
+            <div className="lios-valueMare"  title={tenant?.name}>{tenant?.name}</div>
+          </div>
         </div>
         
         

package/src/components/universal-pages/cpcAccountInfo/index.tsx

@@ -72,7 +72,7 @@ export default function AccountInfo({ isShowTab, getAuthTree, getAccountAuthTree
   ]) //tab 数据
   const TableResource: any = [
     {
-      title: '菜单名称',
+      title: '名称',
       dataIndex: 'name',
       key: 'name'
     }

package/src/components/universal-pages/cpcRoleInfo/index.tsx

@@ -143,7 +143,7 @@ export default function RoleInfo({
 
   const TableResource: any = [
     {
-      title: '菜单名称',
+      title: '名称',
       dataIndex: 'name',
       key: 'name'
     }