cfel-base-components 2.6.5 → 2.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "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,8 @@ export interface LiosLayoutlProps {
   logoutUrl?: string
   switchTenantUrl?: string
   defaultOpenKeys?: string[]
+  /** 自定义用户信息卡片内容（将完全替换内置的 UserCard） */
+  userCard?: ReactNode
   isHideHeader?: boolean //是否隐藏header
   onCollapse?: (value: boolean) => void
   type?: string
@@ -64,6 +66,7 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     amountInfo,
     myWalletInfoAction,
     myLoginInfoAction,
+    userCard,
     isHideHeader,
     onCollapse,
     type,
@@ -500,7 +503,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"

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

@@ -22,19 +22,28 @@ interface CustomType {
   hrefUrl: string;
   historyAction?: any;
 }
-interface MyWalletInfoType {
+export interface MyWalletInfoType {
   availableCashAmount: string;
   availableAmount: string;
   currency: string;
 }
-interface MyLoginInfoType {
+export interface MyLoginInfoType {
   isAdmin: any;
 }
-interface AmountInfoType {
+export interface AmountInfoType {
   residueNum: string;
   currencyCode: string;
 }
 
+export interface UserCardProps {
+  myWalletInfo?: MyWalletInfoType;
+  MyLoginInfo?: MyLoginInfoType;
+  amountInfo?: AmountInfoType;
+  customAction?: CustomType | any;
+  isCopied?: Record<string, boolean>;
+  copyTextToClipboard?: (value: string, key: string) => void;
+}
+
 const renderCurrency = (currency: string) => {
   switch (currency) {
     case "CNY":
@@ -55,18 +64,18 @@ export default function UserCard({
   customAction,
   isCopied,
   copyTextToClipboard,
-}: any) {
+}: UserCardProps) {
   const { user, tenant, custom, switchTenantUrl, logoutUrl } = (window as any)
     ?.g_config;
 
   const { name, avatar, roleInfo, id, account, isMaster }: UserType =
     user || {};
 
-  const { isCompleted, isAudited }: CustomType = custom || {};
+  const { isCompleted, isAudited }: Partial<CustomType> = custom || {};
+
+  const { isAdmin }: MyLoginInfoType = (MyLoginInfo || {}) as MyLoginInfoType;
 
-  const { isAdmin }: MyLoginInfoType = MyLoginInfo || {};
-    
-  const { residueNum, currencyCode }: AmountInfoType = amountInfo || {};
+  const { residueNum, currencyCode }: AmountInfoType = (amountInfo || {}) as AmountInfoType;
 
   const UserCard = () => {
     return (
@@ -94,7 +103,7 @@ export default function UserCard({
               <div
                   className={isCopied?.['id'] ? "lios-iconDone" : "lios-icon"}
                   onClick={() => {
-                    copyTextToClipboard(id, 'id');
+                    copyTextToClipboard && copyTextToClipboard(id, 'id');
                   }}
               >
                 {isCopied?.['id'] ? "已复制" : <CopyOutlined/>}
@@ -108,7 +117,7 @@ export default function UserCard({
               <div
                   className={isCopied?.['account'] ? "lios-iconDone" : "lios-icon"}
                   onClick={() => {
-                    copyTextToClipboard(account, 'account');
+                    copyTextToClipboard && copyTextToClipboard(account, 'account');
                   }}
               >
                 {isCopied?.['account'] ? "已复制" : <CopyOutlined/>}
@@ -121,7 +130,7 @@ export default function UserCard({
               <div
                   className={isCopied?.['tenantId'] ? "lios-iconDone" : "lios-icon"}
                   onClick={() => {
-                    copyTextToClipboard(tenant?.id, 'tenantId');
+                    copyTextToClipboard && copyTextToClipboard(tenant?.id, 'tenantId');
                   }}
               >
                 {isCopied?.['tenantId'] ? "已复制" : <CopyOutlined/>}

package/src/index.tsx

@@ -1,4 +1,5 @@
 import LiosLayout, { LiosLayoutlProps } from './components/layout'
+import UserCard, { UserCardProps } from './components/layout/user-card'
 import PageContainer from './components/base-component/PageContainer'
 import CopyRight from './components/base-component/CopyRight'
 import QueryFilter from './components/base-component/QueryFilter'
@@ -20,6 +21,8 @@ import { getUrlParams, downloadFile, timeFormatter } from './utils/index'
 export {
   LiosLayout,
   LiosLayoutlProps,
+  UserCard,
+  UserCardProps,
   CopyRight,
   PageContainer,
   QueryFilter,