cfel-base-components 2.5.0 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "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,6 +12,7 @@ export interface LiosLayoutlProps {
   menuList: any;
   onMenuClick: (item: any) => void;
   selectedKeys: string[];
+  customAction: (item: any) => void;
   actions?: any[];
   myWalletInfo?: {
     availableCashAmount: string;
@@ -36,6 +37,8 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     menuList,
     onMenuClick,
     selectedKeys,
+
+    customAction,
     actions,
 
     defaultOpenKeys,
@@ -64,14 +67,14 @@ export default function LiosLayout(props: LiosLayoutlProps) {
         <Sider
           className="layout-side"
           style={{
-            backgroundSize: collapsed ? "1600%" : "800%",
+            backgroundSize: collapsed ? "1800%" : "900%",
           }}
           collapsible
           collapsed={collapsed}
           width={240}
-          onCollapse={(value) =>{
+          onCollapse={(value) => {
             localStorage.setItem("layout_collapsed", value.toString());
-            setCollapsed(value)
+            setCollapsed(value);
           }}
         >
           <div className="layout-logo">
@@ -136,7 +139,11 @@ export default function LiosLayout(props: LiosLayoutlProps) {
             <Popover
               placement="bottom"
               content={
-                <UserCard myWalletInfo={myWalletInfo} amountInfo={amountInfo} />
+                <UserCard
+                  myWalletInfo={myWalletInfo}
+                  amountInfo={amountInfo}
+                  customAction={customAction}
+                />
               }
               arrow={false}
               trigger="click"

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;
@@ -39,30 +38,22 @@ const renderCurrency = (currency: string) => {
   }
 };
 
-export default function UserCard({ myWalletInfo, amountInfo }) {
-  const { user, custom, switchTenantUrl, logoutUrl } = (window as any)
+export default function UserCard({
+  myWalletInfo,
+  amountInfo,
+  customAction,
+}: any) {
+  const { user, tenant, custom, switchTenantUrl, logoutUrl } = (window as any)
     ?.g_config;
 
-  const { name, avatar, tenantName, role }: UserType = user || {};
-  
-  const { isCompleted, isAudited, hrefUrl, historyAction }: CustomType =
-    custom || {};
+  const { name, avatar, roleInfo }: UserType = user || {};
+
+  const { isCompleted, isAudited }: CustomType = custom || {};
 
   const { availableCashAmount, availableAmount, currency }: MyWalletInfoType =
     myWalletInfo || {};
   const { residueNum, currencyCode }: AmountInfoType = amountInfo || {};
 
-  const editUserInfo = () => {
-    const { origin } = window.location;
-    if (historyAction) {
-      historyAction?.push({
-        pathname: hrefUrl,
-      });
-    } else {
-      window.location.href = origin + hrefUrl;
-    }
-  };
-
   const UserCard = () => {
     return (
       <div className="layout-user-card">
@@ -71,7 +62,7 @@ export default function UserCard({ myWalletInfo, amountInfo }) {
           <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>
@@ -116,7 +107,7 @@ export default function UserCard({ myWalletInfo, amountInfo }) {
               <div
                 className="lios-icon"
                 onClick={() => {
-                  editUserInfo();
+                  customAction && customAction();
                 }}
               >
                 <FormOutlined />
@@ -133,11 +124,11 @@ export default function UserCard({ myWalletInfo, amountInfo }) {
           </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"