cfel-base-components 2.5.1 → 2.5.3

package/package.json

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

package/src/components/layout/index.scss

@@ -152,6 +152,7 @@ body {
 .layout-main {
   flex: 1;
   height: 100%;
+  overflow: auto;
 }
 
 .layout-content {

package/src/components/layout/index.tsx

@@ -12,7 +12,7 @@ export interface LiosLayoutlProps {
   menuList: any;
   onMenuClick: (item: any) => void;
   selectedKeys: string[];
-  customAction: (item: any) => void;
+  customAction?: (item: any) => void;
   actions?: any[];
   myWalletInfo?: {
     availableCashAmount: string;

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

@@ -5,8 +5,7 @@ import "./index.scss";
 interface UserType {
   name: string;
   avatar: string;
-  tenantName: string;
-  role: any[];
+  roleInfo: any[];
 }
 interface CustomType {
   type: string;
@@ -44,10 +43,10 @@ export default function UserCard({
   amountInfo,
   customAction,
 }: any) {
-  const { user, custom, switchTenantUrl, logoutUrl } = (window as any)
+  const { user, tenant, custom, switchTenantUrl, logoutUrl } = (window as any)
     ?.g_config;
 
-  const { name, avatar, tenantName, role }: UserType = user || {};
+  const { name, avatar, roleInfo }: UserType = user || {};
 
   const { isCompleted, isAudited }: CustomType = custom || {};
 
@@ -63,7 +62,7 @@ export default function UserCard({
           <div className="user-info-right">
             <span className="name">{name}</span>
             <div className="role-list">
-              {role?.map((i) => (
+              {roleInfo?.map((i) => (
                 <span className="role-item" key={i}>
                   {i}
                 </span>
@@ -125,11 +124,11 @@ export default function UserCard({
           </div>
         )}
 
-        {tenantName && (
+        {tenant?.name && (
           <div className="lios-tenant">
             <div className="tenant-label">租户</div>
             <div className="tenant-switch">
-              <div className="tenant-value">{tenantName}</div>
+              <div className="tenant-value">{tenant?.name}</div>
               {switchTenantUrl && (
                 <div
                   className="tenant-icon"