cfel-base-components 2.0.9 → 2.0.11

package/demo/src/index.jsx

@@ -2,7 +2,6 @@ import React from "react"
 import { createRoot } from 'react-dom/client';
 import style from './index.module.less';
 import { SwapOutlined, } from '@ant-design/icons';
-import { history } from 'umi';
 
 import './index.scss';
 import PageContainer from '../../src/components/base-component/PageContainer';
@@ -42,7 +41,7 @@ const App = () => {
             type:(window)?.g_config?.custom?.type,
             isCompleted:(window)?.g_config?.custom?.isCompleted,
             isAudited:(window)?.g_config?.custom?.isAudited,
-            hrefUrl='/web/user-info',
+            hrefUrl:'/web/user-info',
             historyAction:history
           }}
           logoutUrl={(window)?.g_config?.logoutUrl}

package/package.json

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

package/src/components/layout/index.scss

@@ -118,7 +118,7 @@ body {
             transition: all .3s;
             cursor: pointer;
             margin: 0 4px;
-            padding: 0 12px;
+            padding: 0 4px;
 
             display: flex;
             justify-content: center;

package/src/components/layout/index.tsx

@@ -21,14 +21,15 @@ export interface LiosLayoutlProps {
     type: string,
     isCompleted: number,
     isAudited: number,
-    hrefUrl:string,
+    hrefUrl: string,
     historyAction?: any;
   }
-  myWalletInfo?:{
-    availableCashAmount:string,
-    availableAmount:string,
-    currency:string
+  myWalletInfo?: {
+    availableCashAmount: string,
+    availableAmount: string,
+    currency: string
   }
+  myWalletInfoAction?: Function,
   logoutUrl?: string,
   switchTenantUrl?: string,
   defaultOpenKeys?: string[],
@@ -36,7 +37,8 @@ export interface LiosLayoutlProps {
   logoData?: {
     type: string,
     content: string
-  }
+  },
+  isHideHeader?:boolean //是否隐藏header
 }
 
 export default function LiosLayout(props: LiosLayoutlProps) {
@@ -53,7 +55,9 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     defaultOpenKeys,
     productList,
     logoData,
-    myWalletInfo
+    myWalletInfo,
+    myWalletInfoAction,
+    isHideHeader
   } = props
 
   const {
@@ -80,10 +84,9 @@ export default function LiosLayout(props: LiosLayoutlProps) {
 
   const [collapsed, setCollapsed] = useState(false);
   const [currencyList, setCurrencyList] = useState([
-    { value: 'JPY', label: '日元' },
-    { value: 'SAR', label: '沙特币' },
-    { value: 'USD', label: '美元' },
-    { value: 'CNY', label: '人民币' }
+    { value: 'JPY', label: '日元', icon: '￥' },
+    { value: 'USD', label: '美元', icon: "$" },
+    { value: 'CNY', label: '人民币', icon: '￥' }
   ])
   useEffect(() => {
     if (!productList) return
@@ -96,20 +99,20 @@ export default function LiosLayout(props: LiosLayoutlProps) {
   };
   const editUserInfo = () => {
     const { origin } = window.location
-    if(historyAction){
+    if (historyAction) {
       historyAction?.push({
         pathname: hrefUrl
       });
-    }else{
-      window.location.href = origin +  hrefUrl 
+    } else {
+      window.location.href = origin + hrefUrl
     }
-    
+
   }
-  const currencyText = (currencyText:string)=>{
+  const currencyText = (currencyText: string) => {
     let text = ''
-    currencyList.some((item:any)=>{
-      if(item.value == currencyText){
-        text =  item.label
+    currencyList.some((item: any) => {
+      if (item.value == currencyText) {
+        text = item.icon
         return true
       }
     })
@@ -132,18 +135,21 @@ export default function LiosLayout(props: LiosLayoutlProps) {
           </div>
         </div>
       </div>
-      
+
       {
         myWalletInfo && <div className='lios-userInfo'>
           <div className='lios-li'>
             <div className='lios-key'>现金余额</div>
-            <div className='lios-value'>{availableCashAmount || '加载中...'}
-            <span>{currencyText(currency)}</span></div>
+            <div className='lios-value'>
+              <span>{currencyText(currency)}</span>
+              {availableCashAmount || '加载中...'}
+            </div>
           </div>
           <div className='lios-li'>
             <div className='lios-key'>可用额度</div>
-            <div className='lios-value'>{availableAmount || '加载中...'}
-            <span>{currencyText(currency)}</span></div>
+            <div className='lios-value'><span>{currencyText(currency)}</span>
+              {availableAmount || '加载中...'}
+            </div>
           </div>
         </div>
       }
@@ -211,6 +217,8 @@ export default function LiosLayout(props: LiosLayoutlProps) {
   }
   return (
     <Layout className="layoutWarp">
+      {
+        !isHideHeader && 
       <div className="lios-header">
 
         <div className="background">
@@ -258,7 +266,11 @@ export default function LiosLayout(props: LiosLayoutlProps) {
           })}
         </div>
 
-        <Popover placement="bottom" content={<UserCard />} arrow={false} trigger="click">
+        <Popover placement="bottom" content={<UserCard />} arrow={false} trigger="click"
+          onOpenChange={((e) => {
+            if (!e) return
+            myWalletInfoAction()
+          })}>
           <div className="lios-header-user">
             <img
               className="author"
@@ -270,27 +282,30 @@ export default function LiosLayout(props: LiosLayoutlProps) {
           </div>
         </Popover>
       </div>
-
+      }
       <div className="lios-main">
-        <Sider
-          className="lios-side"
-          theme={"light"}
-          collapsible
-          collapsed={collapsed}
-          width={collapsed ? 60 : 256}
-          onCollapse={(value) => setCollapsed(value)}>
-          <Menu
-            mode="inline"
-            openKeys={openKeys}
-            onOpenChange={onOpenChange}
-            items={menuList}
-            style={MenuStyle}
-            onClick={(item): any => {
-              onMenuClick && onMenuClick(item)
-            }}
-            selectedKeys={selectedKeys}
-          />
-        </Sider>
+        {
+          menuList &&
+          <Sider
+            className="lios-side"
+            theme={"light"}
+            collapsible
+            collapsed={collapsed}
+            width={collapsed ? 60 : 256}
+            onCollapse={(value) => setCollapsed(value)}>
+            <Menu
+              mode="inline"
+              openKeys={openKeys}
+              onOpenChange={onOpenChange}
+              items={menuList}
+              style={MenuStyle}
+              onClick={(item): any => {
+                onMenuClick && onMenuClick(item)
+              }}
+              selectedKeys={selectedKeys}
+            />
+          </Sider>
+        }
         <div className="lios-content">
           {props.children}
         </div>

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

@@ -226,7 +226,14 @@ export default function RoleInfo() {
         }}
       />
 
-      <Pagination  {...pagination} />
+      <Pagination  {...pagination} 
+        onChange={(innerPageNo: number, innerPageSize: number) => {
+          execute({
+            innerPageNo,
+            innerPageSize,
+            "roleCode": roleCode
+          })
+        }}/>
       <EditAccountDrawer
         open={editAccountOpen} // 状态
         editOpenStatus={setEditAccountOpen} //修改弹框显隐事件