cfel-base-components 2.6.5 → 2.6.7

package/package.json

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

package/src/apiRequest/config.ts

@@ -10,36 +10,57 @@ instance.interceptors.request.use(
   (config: any) => {
     config.headers = {
       ...config.headers,
-      'Accept-Language': currentLanguage,
+      'Accept-Language': currentLanguage
     } as AxiosRequestHeaders
 
     config.params = {
       ...config.params,
-      productCode: (window as any)?.g_config?.productCode,
+      productCode: (window as any)?.g_config?.productCode
     }
 
     return config
   },
-  (error: any) => Promise.reject(error),
+  (error: any) => Promise.reject(error)
 )
 
 instance.interceptors.response.use(
   //状态码为2xx的时候执行
   (response: any) => {
+    //如果返回值是blob，则直接返回
+    if (response.data instanceof Blob) {
+      return response
+    }
+
     const { data = {} } = response
     const { success, content, errorCode, errorMsg } = data
 
     if (!success) {
       notification.error({
-        message: errorMsg,
+        message: errorMsg
       })
-      return Promise.reject(data)
+      return Promise.reject(response)
     }
 
     return content
   },
   //状态码不为2xx的时候执行
   (error: any) => {
+    // 如果是业务错误（在响应拦截器中已处理），直接返回
+    // 检查是否是业务错误：reject 的是 response 对象，且 success === false
+    if (error.data && error.data.success === false) {
+      // 业务错误已经在响应拦截器中显示了 errorMsg，这里直接返回
+      return Promise.reject(error)
+    }
+    // 兼容旧的判断方式
+    if (
+      error.data &&
+      error.response &&
+      error.response.status >= 200 &&
+      error.response.status < 300
+    ) {
+      return Promise.reject(error)
+    }
+
     const { response = {} } = error
     const { status } = response
 
@@ -58,18 +79,21 @@ instance.interceptors.response.use(
       '服务器发生错误，请检查服务器。' = 500,
       '网关错误。' = 502,
       '服务不可用，服务器暂时过载或维护。' = 503,
-      '网关超时。' = 504,
+      '网关超时。' = 504
     }
 
     notification.error({
-      message: response?.data?.errorMsg || CodeMessage[status] || '服务暂不可用，请检查网络',
+      message: response?.data?.errorMsg || CodeMessage[status] || '服务暂不可用，请检查网络'
     })
     // 如果后端在非2xx响应中也返回了业务 errorCode，处理 PRODUCT_NOT_REGISTRY
     const respData = response?.data || {}
-    if ((respData && respData.errorCode === 'PRODUCT_NOT_REGISTRY') || respData.errorCode === 'ACCESS_DENIED') {
+    if (
+      (respData && respData.errorCode === 'PRODUCT_NOT_REGISTRY') ||
+      respData.errorCode === 'ACCESS_DENIED'
+    ) {
       if (typeof (window as any).showProductNotRegisteredOverlay === 'function') {
         ;(window as any).showProductNotRegisteredOverlay({
-          onAction: () => {},
+          onAction: () => {}
         })
       } else {
         if (!(window as any).__PRODUCT_NOT_REGISTRY_SHOWN__) {
@@ -77,7 +101,7 @@ instance.interceptors.response.use(
           Modal.warning({
             title: '产品未开通',
             content: '当前产品未开通或产品编码错误，请联系管理员或检查产品编码。',
-            okText: '知道了',
+            okText: '知道了'
           })
         }
       }
@@ -86,7 +110,7 @@ instance.interceptors.response.use(
     }
 
     return Promise.reject(error)
-  },
+  }
 )
 
 export default instance
@@ -101,13 +125,20 @@ export function request<T = any>(config: Parameters<typeof instance.request>[0])
 /**
  * GET 请求，支持类型推断
  */
-export function get<T = any>(url: string, config?: Omit<Parameters<typeof instance.get>[1], 'url'>) {
+export function get<T = any>(
+  url: string,
+  config?: Omit<Parameters<typeof instance.get>[1], 'url'>
+) {
   return instance.get<T, T>(url, config)
 }
 
 /**
  * POST 请求，支持类型推断
  */
-export function post<T = any>(url: string, data?: any, config?: Omit<Parameters<typeof instance.post>[2], 'url' | 'data'>) {
+export function post<T = any>(
+  url: string,
+  data?: any,
+  config?: Omit<Parameters<typeof instance.post>[2], 'url' | 'data'>
+) {
   return instance.post<T, T>(url, data, config)
 }

package/src/components/layout/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState, ReactNode } from 'react'
 import { Layout, List, Menu, MenuProps, Popover } from 'antd'
 import UserCard from './user-card'
 import RcMenu, { SubMenu, MenuItem } from 'rc-menu'
@@ -41,6 +41,12 @@ export interface LiosLayoutlProps {
   logoutUrl?: string
   switchTenantUrl?: string
   defaultOpenKeys?: string[]
+  /** 自定义用户信息卡片内容（将完全替换内置的 UserCard） */
+  userCard?: ReactNode
+  /** 自定义搜索输入占位文案，默认“搜索菜单...” */
+  searchPlaceholder?: string
+  /** 自定义“最近访问”标题文案，默认“最近访问” */
+  searchHistoryTitle?: string
   isHideHeader?: boolean //是否隐藏header
   onCollapse?: (value: boolean) => void
   type?: string
@@ -64,6 +70,9 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     amountInfo,
     myWalletInfoAction,
     myLoginInfoAction,
+    userCard,
+    searchPlaceholder,
+    searchHistoryTitle,
     isHideHeader,
     onCollapse,
     type,
@@ -273,7 +282,16 @@ export default function LiosLayout(props: LiosLayoutlProps) {
           {!collapsed && <div style={{ height: 24 }}></div>}
 
           <div style={{ width: '100%', padding: '0 16px' }}>
-            <Search menuList={menuList} collapsed={collapsed} type={type || ''} umiHistory={umiHistory} setSelectKey={setSelectKey} findKeyPath={findKeyPath} />
+            <Search
+              menuList={menuList}
+              collapsed={collapsed}
+              type={type || ''}
+              umiHistory={umiHistory}
+              setSelectKey={setSelectKey}
+              findKeyPath={findKeyPath}
+              searchPlaceholder={searchPlaceholder}
+              searchHistoryTitle={searchHistoryTitle}
+            />
           </div>
 
           {!collapsed && <div style={{ height: 12 }}></div>}
@@ -500,7 +518,16 @@ export default function LiosLayout(props: LiosLayoutlProps) {
             <Popover
               placement="bottom"
               content={
-                <UserCard myWalletInfo={myWalletInfo} MyLoginInfo={MyLoginInfo} amountInfo={amountInfo} customAction={customAction} isCopied={isCopied} copyTextToClipboard={copyTextToClipboard} />
+                userCard ?? (
+                  <UserCard
+                    myWalletInfo={myWalletInfo}
+                    MyLoginInfo={MyLoginInfo}
+                    amountInfo={amountInfo}
+                    customAction={customAction}
+                    isCopied={isCopied}
+                    copyTextToClipboard={copyTextToClipboard}
+                  />
+                )
               }
               arrow={false}
               trigger="click"
@@ -556,8 +583,19 @@ type SearchProps = {
   umiHistory: any
   setSelectKey: any
   findKeyPath: (pathname: string) => string[]
+  searchPlaceholder?: string
+  searchHistoryTitle?: string
 }
-function Search({ menuList, collapsed, type, umiHistory, setSelectKey, findKeyPath }: SearchProps) {
+function Search({
+  menuList,
+  collapsed,
+  type,
+  umiHistory,
+  setSelectKey,
+  findKeyPath,
+  searchPlaceholder,
+  searchHistoryTitle,
+}: SearchProps) {
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       if ((navigator.platform.toLowerCase().includes('mac') ? event.metaKey : event.ctrlKey) && event.key.toLowerCase() === 'k') {
@@ -676,7 +714,7 @@ function Search({ menuList, collapsed, type, umiHistory, setSelectKey, findKeyPa
               value={searchTerm}
               onChange={(e) => handleSearch(e.target.value)}
               className="search-input"
-              placeholder="搜索菜单..."
+              placeholder={searchPlaceholder ?? '搜索菜单...'}
               onFocus={() => setIsFocused(true)}
             />
             <div className="search-icon">
@@ -700,7 +738,7 @@ function Search({ menuList, collapsed, type, umiHistory, setSelectKey, findKeyPa
                   <List
                     split={false}
                     className="lists"
-                    header="最近访问"
+                    header={searchHistoryTitle ?? '最近访问'}
                     size="small"
                     bordered
                     dataSource={searchHistory}

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

@@ -1,162 +1,133 @@
-import React from "react";
-import {
-  SwapOutlined,
-  FormOutlined,
-  CopyOutlined,
-  LogoutOutlined,
-} from "@ant-design/icons";
-import "./index.scss";
+import React from 'react'
+import { SwapOutlined, CopyOutlined, LogoutOutlined } from '@ant-design/icons'
+import './index.scss'
 
 interface UserType {
-  name: string;
-  avatar: string;
-  roleInfo: any[];
-  id: string;
-  account: string;
-  isMaster: boolean;
+  name: string
+  avatar: string
+  roleInfo: any[]
+  id: string
+  account: string
+  isMaster: boolean
 }
-interface CustomType {
-  type: string;
-  isCompleted: number;
-  isAudited: number;
-  hrefUrl: string;
-  historyAction?: any;
-}
-interface MyWalletInfoType {
-  availableCashAmount: string;
-  availableAmount: string;
-  currency: string;
-}
-interface MyLoginInfoType {
-  isAdmin: any;
+
+export interface MyWalletInfoType {
+  availableCashAmount: string
+  availableAmount: string
+  currency: string
 }
-interface AmountInfoType {
-  residueNum: string;
-  currencyCode: string;
+export interface MyLoginInfoType {
+  isAdmin: any
 }
 
-const renderCurrency = (currency: string) => {
-  switch (currency) {
-    case "CNY":
-      return "¥ ";
-    case "USD":
-      return "$ ";
-    case "JPY":
-      return "JP¥ ";
-    default:
-      return "¥ ";
-  }
-};
-
-export default function UserCard({
-  myWalletInfo,
-  MyLoginInfo,
-  amountInfo,
-  customAction,
-  isCopied,
-  copyTextToClipboard,
-}: any) {
-  const { user, tenant, custom, switchTenantUrl, logoutUrl } = (window as any)
-    ?.g_config;
+export interface UserCardProps {
+  myWalletInfo?: MyWalletInfoType
+  MyLoginInfo?: MyLoginInfoType
+  isCopied?: Record<string, boolean>
+  copyTextToClipboard?: (value: string, key: string) => void
+}
 
-  const { name, avatar, roleInfo, id, account, isMaster }: UserType =
-    user || {};
+export default function UserCard({ MyLoginInfo, isCopied, copyTextToClipboard }: UserCardProps) {
+  const { user, tenant, switchTenantUrl, logoutUrl } = (window as any)?.g_config
 
-  const { isCompleted, isAudited }: CustomType = custom || {};
+  const { name, avatar, roleInfo, id, account }: UserType = user || {}
 
-  const { isAdmin }: MyLoginInfoType = MyLoginInfo || {};
-    
-  const { residueNum, currencyCode }: AmountInfoType = amountInfo || {};
+  const { isAdmin }: MyLoginInfoType = (MyLoginInfo || {}) as MyLoginInfoType
 
   const UserCard = () => {
     return (
-        <div className="layout-user-card">
-          <div className="user-info">
-            <div className="user-avatarBox">
-              <img className="user-avatar" src={avatar}/>
-              <div className="user-mater">{isAdmin ? "主账号" : "子账号"}</div>
-            </div>
-            <div className="user-info-right">
-              <span className="name">{name}</span>
-              <div className="role-list">
-                {roleInfo?.map((i) => (
-                    <span className="role-item" key={i}>
+      <div className="layout-user-card">
+        <div className="user-info">
+          <div className="user-avatarBox">
+            <img className="user-avatar" src={avatar} />
+            <div className="user-mater">{isAdmin ? '主账号' : '子账号'}</div>
+          </div>
+          <div className="user-info-right">
+            <span className="name">{name}</span>
+            <div className="role-list">
+              {roleInfo?.map((i) => (
+                <span className="role-item" key={i}>
                   {i}
                 </span>
-                ))}
-              </div>
+              ))}
             </div>
           </div>
-          <div className="lios-userInfo">
-            <div className="lios-li li-flex">
-              <div className="lios-keyMare">账号ID</div>
-              <div className="lios-valueMare" title={id}>{id}</div>
-              <div
-                  className={isCopied?.['id'] ? "lios-iconDone" : "lios-icon"}
-                  onClick={() => {
-                    copyTextToClipboard(id, 'id');
-                  }}
-              >
-                {isCopied?.['id'] ? "已复制" : <CopyOutlined/>}
-              </div>
+        </div>
+        <div className="lios-userInfo">
+          <div className="lios-li li-flex">
+            <div className="lios-keyMare">账号ID</div>
+            <div className="lios-valueMare" title={id}>
+              {id}
             </div>
-            <div className="lios-li  li-flex">
-              <div className="lios-keyMare">账号</div>
-              <div className="lios-valueMare" title={account}>
-                {account}
-              </div>
-              <div
-                  className={isCopied?.['account'] ? "lios-iconDone" : "lios-icon"}
-                  onClick={() => {
-                    copyTextToClipboard(account, 'account');
-                  }}
-              >
-                {isCopied?.['account'] ? "已复制" : <CopyOutlined/>}
-              </div>
+            <div
+              className={isCopied?.['id'] ? 'lios-iconDone' : 'lios-icon'}
+              onClick={() => {
+                copyTextToClipboard && copyTextToClipboard(id, 'id')
+              }}
+            >
+              {isCopied?.['id'] ? '已复制' : <CopyOutlined />}
             </div>
-
-            <div className="lios-li li-flex">
-              <div className="lios-keyMare">租户ID</div>
-              <div className="lios-valueMare" title={tenant?.id}>{tenant?.id}</div>
-              <div
-                  className={isCopied?.['tenantId'] ? "lios-iconDone" : "lios-icon"}
-                  onClick={() => {
-                    copyTextToClipboard(tenant?.id, 'tenantId');
-                  }}
-              >
-                {isCopied?.['tenantId'] ? "已复制" : <CopyOutlined/>}
-              </div>
+          </div>
+          <div className="lios-li  li-flex">
+            <div className="lios-keyMare">账号</div>
+            <div className="lios-valueMare" title={account}>
+              {account}
             </div>
-            <div className="lios-li li-flex">
-              <div className="lios-keyMare">租户</div>
-              <div className="lios-valueMare" title={tenant?.name}>{tenant?.name}</div>
+            <div
+              className={isCopied?.['account'] ? 'lios-iconDone' : 'lios-icon'}
+              onClick={() => {
+                copyTextToClipboard && copyTextToClipboard(account, 'account')
+              }}
+            >
+              {isCopied?.['account'] ? '已复制' : <CopyOutlined />}
             </div>
           </div>
 
-
-          <div className="lios-logoutBox">
-            <div
-                className="lios-logout"
-                onClick={() => {
-                  location.href = switchTenantUrl;
-                }}
-            >
-              <SwapOutlined className="logout-icon"/>
-              切换租户
+          <div className="lios-li li-flex">
+            <div className="lios-keyMare">租户ID</div>
+            <div className="lios-valueMare" title={tenant?.id}>
+              {tenant?.id}
             </div>
             <div
-                className="lios-logout"
-                onClick={() => {
-                  location.href = logoutUrl;
-                }}
+              className={isCopied?.['tenantId'] ? 'lios-iconDone' : 'lios-icon'}
+              onClick={() => {
+                copyTextToClipboard && copyTextToClipboard(tenant?.id, 'tenantId')
+              }}
             >
-              <LogoutOutlined className="logout-icon"/>
-              退出登录
+              {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>
-    );
-  };
 
-  return UserCard();
+        <div className="lios-logoutBox">
+          <div
+            className="lios-logout"
+            onClick={() => {
+              location.href = switchTenantUrl
+            }}
+          >
+            <SwapOutlined className="logout-icon" />
+            切换租户
+          </div>
+          <div
+            className="lios-logout"
+            onClick={() => {
+              location.href = logoutUrl
+            }}
+          >
+            <LogoutOutlined className="logout-icon" />
+            退出登录
+          </div>
+        </div>
+      </div>
+    )
+  }
+
+  return UserCard()
 }