cfel-base-components 2.5.75 → 2.5.77

package/package.json

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

package/src/.umi/core/helmet.ts

@@ -2,7 +2,7 @@
 // This file is generated by Umi automatically
 // DO NOT CHANGE IT MANUALLY!
 import React from 'react';
-import { HelmetProvider } from '/Users/wujingang/Desktop/workspace/base-components/node_modules/@umijs/renderer-react';
+import { HelmetProvider } from '/Users/lionaillen/Documents/work/cfel/base-components/node_modules/.pnpm/@umijs+renderer-react@4.0.72_react-dom@18.1.0_react@18.1.0__react@18.1.0/node_modules/@umijs/renderer-react';
 import { context } from './helmetContext';
 
 export const innerProvider = (container) => {

package/src/apiRequest/config.ts

@@ -1,75 +1,93 @@
-import axios, { AxiosRequestHeaders } from "axios";
-import { notification } from "antd";
+import axios, { AxiosRequestHeaders } from 'axios'
+import { notification } from 'antd'
 
-let UMI_APP_BASEURL: any = window.location.origin || process.env;
-const instance = axios.create({ baseURL: UMI_APP_BASEURL });
+let UMI_APP_BASEURL: any = window.location.origin || process.env
+const instance = axios.create({ baseURL: UMI_APP_BASEURL })
 
 instance.interceptors.request.use(
   (config: any) => {
     config.headers = {
       ...config.headers,
-    } as AxiosRequestHeaders;
+    } as AxiosRequestHeaders
 
     config.params = {
       ...config.params,
       productCode: (window as any)?.g_config?.productCode,
-    };
+    }
 
-    return config;
+    return config
   },
   (error: any) => Promise.reject(error)
-);
+)
 
 instance.interceptors.response.use(
   //状态码为2xx的时候执行
   (response: any) => {
-    const { data = {} } = response;
-    const { success, content, errorCode, errorMsg } = data;
+    const { data = {} } = response
+    const { success, content, errorCode, errorMsg } = data
 
     if (!success) {
       notification.error({
         message: errorMsg,
-      });
-      return Promise.reject(data);
+      })
+      return Promise.reject(data)
     }
 
-    return content;
+    return content
   },
   //状态码不为2xx的时候执行
   (error: any) => {
-    const { response = {} } = error;
-    const { status } = response;
+    const { response = {} } = error
+    const { status } = response
 
-    if (error.code === "ERR_CANCELED") {
-      return Promise.reject(error);
+    if (error.code === 'ERR_CANCELED') {
+      return Promise.reject(error)
     }
 
     enum CodeMessage {
-      "发出的请求有错误，服务器没有进行新建或修改数据的操作。" = 400,
-      "用户未登录。" = 401,
-      "用户未得到授权，访问是被禁止的。" = 403,
-      "发出的请求针对的是不存在的记录，服务器没有进行操作。" = 404,
-      "请求的格式不可得。" = 406,
-      "请求的资源被永久删除，且不会再得到的。" = 410,
-      "当创建一个对象时，发生一个验证错误。" = 422,
-      "服务器发生错误，请检查服务器。" = 500,
-      "网关错误。" = 502,
-      "服务不可用，服务器暂时过载或维护。" = 503,
-      "网关超时。" = 504,
+      '发出的请求有错误，服务器没有进行新建或修改数据的操作。' = 400,
+      '用户未登录。' = 401,
+      '用户未得到授权，访问是被禁止的。' = 403,
+      '发出的请求针对的是不存在的记录，服务器没有进行操作。' = 404,
+      '请求的格式不可得。' = 406,
+      '请求的资源被永久删除，且不会再得到的。' = 410,
+      '当创建一个对象时，发生一个验证错误。' = 422,
+      '服务器发生错误，请检查服务器。' = 500,
+      '网关错误。' = 502,
+      '服务不可用，服务器暂时过载或维护。' = 503,
+      '网关超时。' = 504,
     }
 
     notification.error({
-      message:
-        response?.data?.errorMsg ||
-        CodeMessage[status] ||
-        "服务暂不可用，请检查网络",
-    });
+      message: response?.data?.errorMsg || CodeMessage[status] || '服务暂不可用，请检查网络',
+    })
 
     if (status === 401) {
     }
 
-    return Promise.reject(error);
+    return Promise.reject(error)
   }
-);
+)
+
+export default instance
+
+/**
+ * 通用请求方法，支持类型推断
+ */
+export function request<T = any>(config: Parameters<typeof instance.request>[0]) {
+  return instance.request<T, T>(config)
+}
+
+/**
+ * GET 请求，支持类型推断
+ */
+export function get<T = any>(url: string, config?: Omit<Parameters<typeof instance.get>[1], 'url'>) {
+  return instance.get<T, T>(url, config)
+}
 
-export default instance;
+/**
+ * POST 请求，支持类型推断
+ */
+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

@@ -138,7 +138,6 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     tenantId: false,
   })
 
-
   useEffect(() => {
     //在这里找到当前菜单的上层目录
     const paMenu = findParentMenu(menuList, '/' + location.pathname.split('/')[2])
@@ -155,7 +154,6 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     setSelectKey(selectedPath)
   }, [location.pathname])
 
-
   const onOpenChange: MenuProps['onOpenChange'] = (keys) => {
     // Find the last opened key
     const latestOpenKey = keys.find((key) => openKeys.indexOf(key) === -1)
@@ -239,8 +237,7 @@ export default function LiosLayout(props: LiosLayoutlProps) {
               }}
             >
               {!collapsed && <img className={`logo-base current-logo`} src={logo || logoUrl} />}
-              {collapsed && <img className={`logo-sub`} src={subLogoUrl} />}
-              {/* {collapsed && <img className={`logo-base sub-logo`} src={logo || subLogoUrl} />} */}
+              {collapsed && <img className={`logo-sub`} src={subLogo || subLogoUrl} />}
             </div>
             {!collapsed && (
               <div

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "typescript.tsdk": "node_modules/typescript/lib"
-}