@bit-sun/business-component 4.0.13-alpha.9 → 4.2.0-aiwei-alpha.1

package/src/utils/cachedRequest.ts

@@ -0,0 +1,288 @@
+/**
+ * 带缓存功能的请求工具
+ * 基于现有的request工具，增加1秒缓存机制
+ */
+
+import request from "umi-request";
+import RequestCacheManager from "./RequestCacheManager";
+import { message } from "antd";
+import { judgeIsRequestError } from "./requestUtils";
+
+// 创建缓存管理器实例，设置1秒缓存时间
+const cacheManager = RequestCacheManager.getInstance({
+  ttl: 1000, // 1秒缓存时间
+  maxSize: 100 // 最大缓存100个请求
+});
+
+interface RequestOptions {
+  url?: string;
+  method?: string;
+  params?: any;
+  data?: any;
+  headers?: any;
+  [key: string]: any;
+}
+
+/**
+ * 处理响应数据
+ */
+const handleResponseData = async (response: any) => {
+  return Promise.resolve({
+    data: response,
+    status: response.status
+  });
+};
+
+/**
+ * 生成请求配置的唯一标识
+ */
+const generateRequestId = (url: string, options?: RequestOptions): string => {
+  return `${url}_${JSON.stringify(options || {})}`;
+};
+
+/**
+ * 带缓存的请求方法（支持并发请求合并）
+ */
+const cachedRequest = async (url: string, options?: RequestOptions) => {
+  const startTime = Date.now();
+  const method = (options?.method || 'GET').toUpperCase();
+  const params = options?.params || options?.data;
+
+  // 1) 检查缓存命中
+  const cachedData = cacheManager.getCache(url, params, method);
+  if (cachedData) {
+    console.log(`[RequestCache] 命中缓存: ${url}`, {
+      原始起止时间: `${cachedData.startTime} - ${cachedData.endTime}`,
+      更新时间: Date.now()
+    });
+
+    // 返回缓存数据，起止时间在缓存命中时已更新
+    return Promise.resolve({
+      data: cachedData.data,
+      status: cachedData.data.status
+    });
+  }
+
+  // 2) 检查是否已有进行中的同键请求，若有则直接复用该Promise
+  const pending = cacheManager.getPending(url, params, method);
+  if (pending) {
+    console.log(`[RequestCache] 复用进行中请求: ${url}`);
+    return pending.then((response) => handleResponseData(response));
+  }
+
+  // 3) 没有缓存且没有进行中请求，发起真实请求并注册为进行中
+  // 兼容部分旧代码使用的 body 字段（映射到 data）
+  const normalizedOptions = { ...(options || {}) };
+  if (normalizedOptions.body !== undefined && normalizedOptions.data === undefined) {
+    normalizedOptions.data = normalizedOptions.body;
+    delete normalizedOptions.body;
+  }
+  const realRequestPromise = request(url, normalizedOptions)
+    .then((response) => {
+      const endTime = Date.now();
+      // 缓存成功的响应
+      if (!judgeIsRequestError(response)) {
+        cacheManager.setCache(url, params, method, response, startTime, endTime);
+        console.log(`[RequestCache] 缓存请求: ${url}`, {
+          起止时间: `${startTime} - ${endTime}`,
+          耗时: endTime - startTime
+        });
+      }
+      return response;
+    })
+    .catch((error) => {
+      console.error(`[RequestCache] 请求失败: ${url}`, error);
+      throw error;
+    })
+    .finally(() => {
+      // 无论成功失败都清理进行中状态
+      cacheManager.clearPending(url, params, method);
+    });
+
+  cacheManager.setPending(url, params, method, realRequestPromise);
+  return realRequestPromise.then((response) => handleResponseData(response));
+};
+
+/**
+ * GET 请求
+ */
+// 兼容旧签名与 umi-request 签名的辅助函数
+const normalizeParamsOptions = (paramsOrOptions?: any, options?: RequestOptions): { params?: any; options?: RequestOptions } => {
+  if (options !== undefined) {
+    return { params: paramsOrOptions, options };
+  }
+  const o = paramsOrOptions;
+  if (o && (o.params !== undefined || o.headers !== undefined || o.data !== undefined || o.method !== undefined || o.timeout !== undefined)) {
+    return { options: o };
+  }
+  return { params: o };
+};
+
+/**
+ * GET 请求（兼容两种签名：get(url, params?, options?) 与 get(url, options)）
+ */
+const cachedGet = (url: string, paramsOrOptions?: any, options?: RequestOptions) => {
+  const { params, options: opt } = normalizeParamsOptions(paramsOrOptions, options);
+  return cachedRequest(url, {
+    ...opt,
+    method: 'GET',
+    params
+  });
+};
+
+/**
+ * POST 请求（兼容两种签名：post(url, data?, options?) 与 post(url, options)）
+ */
+const cachedPost = (url: string, dataOrOptions?: any, options?: RequestOptions) => {
+  let data = undefined;
+  let opt: RequestOptions | undefined = undefined;
+  if (options !== undefined) {
+    data = dataOrOptions;
+    opt = options;
+  } else {
+    const o = dataOrOptions;
+    if (o && (o.params !== undefined || o.headers !== undefined || o.data !== undefined || o.method !== undefined || o.timeout !== undefined)) {
+      opt = o;
+      data = o?.data;
+    } else {
+      data = o;
+    }
+  }
+  return cachedRequest(url, {
+    ...opt,
+    method: 'POST',
+    data
+  });
+};
+
+/**
+ * PATCH 请求（兼容两种签名）
+ */
+const cachedPatch = (url: string, dataOrOptions?: any, options?: RequestOptions) => {
+  let data = undefined;
+  let opt: RequestOptions | undefined = undefined;
+  if (options !== undefined) {
+    data = dataOrOptions;
+    opt = options;
+  } else {
+    const o = dataOrOptions;
+    if (o && (o.params !== undefined || o.headers !== undefined || o.data !== undefined || o.method !== undefined || o.timeout !== undefined)) {
+      opt = o;
+      data = o?.data;
+    } else {
+      data = o;
+    }
+  }
+  return cachedRequest(url, {
+    ...opt,
+    method: 'PATCH',
+    data
+  });
+};
+
+/**
+ * PUT 请求（兼容两种签名）
+ */
+const cachedPut = (url: string, dataOrOptions?: any, options?: RequestOptions) => {
+  let data = undefined;
+  let opt: RequestOptions | undefined = undefined;
+  if (options !== undefined) {
+    data = dataOrOptions;
+    opt = options;
+  } else {
+    const o = dataOrOptions;
+    if (o && (o.params !== undefined || o.headers !== undefined || o.data !== undefined || o.method !== undefined || o.timeout !== undefined)) {
+      opt = o;
+      data = o?.data;
+    } else {
+      data = o;
+    }
+  }
+  return cachedRequest(url, {
+    ...opt,
+    method: 'PUT',
+    data
+  });
+};
+
+/**
+ * DELETE 请求（兼容两种签名）
+ */
+const cachedDelete = (url: string, dataOrOptions?: any, options?: RequestOptions) => {
+  let data = undefined;
+  let opt: RequestOptions | undefined = undefined;
+  if (options !== undefined) {
+    data = dataOrOptions;
+    opt = options;
+  } else {
+    const o = dataOrOptions;
+    if (o && (o.params !== undefined || o.headers !== undefined || o.data !== undefined || o.method !== undefined || o.timeout !== undefined)) {
+      opt = o;
+      data = o?.data;
+    } else {
+      data = o;
+    }
+  }
+  return cachedRequest(url, {
+    ...opt,
+    method: 'DELETE',
+    data
+  });
+};
+
+/**
+ * 通用请求方法（兼容现有接口）
+ * 支持两种调用：
+ * 1) request(url: string, options?: RequestOptions)
+ * 2) request({ url: string, ...options })
+ */
+const cachedRequestUtil: any = (...args: any[]) => {
+  if (typeof args[0] === 'string') {
+    const url: string = args[0];
+    const options: RequestOptions = args[1] || {};
+    return cachedRequest(url, options);
+  }
+  if (typeof args[0] === 'object' && args[0] && args[0].url) {
+    const { url, ...parms } = args[0];
+    return cachedRequest(url, parms);
+  }
+  throw new Error('[RequestCache] invalid request arguments');
+};
+
+/**
+ * 清除缓存
+ */
+const clearRequestCache = (url?: string, params?: any, method?: string) => {
+  cacheManager.clearCache(url, params, method);
+  console.log(`[RequestCache] 清除缓存: ${url || '所有缓存'}`);
+};
+
+/**
+ * 获取缓存统计信息
+ */
+const getCacheStats = () => {
+  const stats = cacheManager.getCacheStats();
+  console.log('[RequestCache] 缓存统计:', stats);
+  return stats;
+};
+
+// 绑定方法到请求工具对象
+cachedRequestUtil.get = cachedGet;
+cachedRequestUtil.post = cachedPost;
+cachedRequestUtil.patch = cachedPatch;
+cachedRequestUtil.put = cachedPut;
+cachedRequestUtil.delete = cachedDelete;
+cachedRequestUtil.clearCache = clearRequestCache;
+cachedRequestUtil.getCacheStats = getCacheStats;
+
+export default cachedRequestUtil;
+export {
+  cachedRequest,
+  cachedGet,
+  cachedPost,
+  cachedPatch,
+  cachedPut,
+  cachedDelete,
+  clearRequestCache,
+  getCacheStats
+};

package/src/utils/index.ts

@@ -18,4 +18,5 @@ export * from './businessUtils';
 export * from './utils';
 export * from './xlsxUtil';
 export * from './TreeUtils';
+export * from './cachedRequest';
 

package/src/utils/request.ts

@@ -7,27 +7,31 @@ const get = (url, params?: any) => {
   }).then(handleResponseData);
 };
 
-const post = (url, data?: any) => {
+const post = (url, data?: any, params?: any) => {
   return request.post(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const patch = (url, data?: any) => {
+const patch = (url, data?: any, params?: any) => {
   return request.patch(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const put = (url, data?: any) => {
+const put = (url, data?: any, params?: any) => {
   return request.put(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 
-const deleteS = (url, data?: any) => {
+const deleteS = (url, data?: any, params?: any) => {
   return request.delete(url, {
     data,
+    ...params,
   }).then(handleResponseData);
 };
 

package/src/utils/requestUtils.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import request from "umi-request";
-import ENUM from './enumConfig';
+// 注意：本文件的导入保留，用于工具函数内部兼容；业务代码请使用 '@/utils/cachedRequest'import ENUM from './enumConfig';
 import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId } from './LocalstorageUtils';
 import { getEekaSessionId, getEekaAccountId, getEekaEmployeeId, getEekaTenantId, getEekaToken,
   getGuoyaoshukeCompanyId, getGuoyaoshukeTenantId, getGuoyaoshukeTenantCode, getGuoyaoshukeToken, getGuoyaoshukeUscCode

package/src/utils/utils.ts

@@ -87,16 +87,13 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   } else if (col.timeRender) {
     // 处理不显示 时分秒的时间
     col.render = ({ text }: any) => handleTooltip(text, col.timeRender);
-  }
-  // 处理有问题，弃用
-  // else if (col.textOverflow) {
-  //   // 处理文字太长
-  //   const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width));
-  //   const originalRender = col?.render;
-  //   const renderText = (params) => originalRender ? originalRender(params) : params.text;
-  //   col.render = (params) => handleTextOverflowNoTooltip(renderText(params), colWidth);
-  // } 
-  else if (col.images) {
+  } else if (col.textOverflow) {
+    // 处理文字太长
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width));
+    const originalRender = col?.render;
+    const renderText = (params) => originalRender ? originalRender(params) : params.text;
+    col.render = (params) => handleTextOverflowNoTooltip(renderText(params), colWidth);
+  } else if (col.images) {
     col.render = ({ text }: any) => tableColumnsImage(text);
   } else if (col.double) {
     col.render = ({ record }: any) =>
@@ -127,12 +124,11 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   if (col.timeRender) {
     col.render = (text: any) => handleTooltip(text, col.timeRender);
   }
-  // 处理有问题，弃用
   // 处理文字太长
-  // if (col.textOverflow) {
-  //   const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
-  //   col.render = (text: any) => handleTextOverflow(text,colWidth);
-  // }
+  if (col.textOverflow) {
+    const colWidth = typeof col?.width === 'number' ? col.width : (col.width && parseWidth(col.width))
+    col.render = (text: any) => handleTextOverflow(text,colWidth);
+  }
   if (col.images) {
     col.render = (text: any) => tableColumnsImage(text);
   }
@@ -271,4 +267,44 @@ export const handleConvertResponse = (items: any, total: number): object => {
 
 export const noEmptyArray = (targetObj: any) => {
   return Array.isArray(targetObj) && targetObj.length !== 0;
-};
+};
+
+export const formContainerAndItemLayout = (type: string, title: any, name: string) => {
+  return type === 'form' ? {
+    container: {
+      type: 'card',
+      props: {
+        title,
+        id: Math.random(),
+        level: 1,
+        name
+      },
+    },
+    itemLayout: {
+      span: 8, // span表示每项所占的栅格数
+      labelCol: {
+        span: 8,
+      },
+      wrapperCol: {
+        span: 18,
+      },
+    },
+  } : {
+    container: {
+      type: 'card',
+      props: {
+        title,
+        id: Math.random(),
+        level: 1,
+        bordered: null,
+        isWhiteCard: true,
+        name
+      },
+    },
+    itemLayout: {
+      wrapperCol: {
+        span: 0,
+      },
+    },
+  }
+}