@bit-sun/business-component 2.4.22 → 2.4.24

package/src/utils/requestUtils.ts

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import request from "umi-request";
 import ENUM from './enumConfig';
 import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId } from './LocalstorageUtils';
 import { getEekaSessionId, getEekaAccountId, getEekaEmployeeId, getEekaTenantId, getEekaToken,
@@ -78,7 +79,7 @@ const handleCommonHeader = () => {
 * 处理请求头方法-包含一般请求头、权限请求头。组件默认统一处理一遍，若组件使用处需要可以单独在组件处传参进来处理
 * @param {*} config         请求参数配置
 *  */
-const handleRequestHeader = (config: any) => {
+const handleAxioRequestHeader = (config: any) => {
 
   let commonHeaders = handleCommonHeader();
 
@@ -97,11 +98,37 @@ const handleRequestHeader = (config: any) => {
 
 // 拦截器
 axios.interceptors.request.use((config: any) => {
-  handleRequestHeader(config)
+  handleAxioRequestHeader(config)
   return config
 })
 
 
+const handleRequestHeader = (url: any, options: any) => {
+
+  let commonHeaders = handleCommonHeader();
+
+  let config = { url,  headers: { ...options?.headers } }
+
+  if (localStorage.getItem('x-user-auth-context')) {
+    // @ts-ignore
+    commonHeaders['x-user-auth-context'] = localStorage.getItem('x-user-auth-context');
+  }
+  !!!config.headers['x-biz-code'] && handleRequestAuthHeader(config)
+
+  config.headers = {
+    ...commonHeaders,
+    ...config.headers
+  }
+
+  options.headers = config.headers
+}
+request.interceptors.request.use((url, options) => {
+  handleRequestHeader(url, options)
+  return {
+    url,
+    options,
+  };
+});
 
 
 /**

package/src/utils/serialize.js

@@ -1,7 +1,7 @@
-import serialize from 'serialize-javascript';
-
-export default serialize;
-
-export const deserialize = data => {
-  return eval('(' + data + ')');
-};
+import serialize from 'serialize-javascript';
+
+export default serialize;
+
+export const deserialize = data => {
+  return eval('(' + data + ')');
+};

package/src/utils/utils.ts

@@ -4,6 +4,7 @@ import { formatMessage, history } from 'umi';
 import isEqual from 'lodash/isEqual';
 import ENUM from './enumConfig';
 import {
+  authFn,
   handleTextDouble,
   handleTextLineFeed,
   handleTextOverflow,
@@ -77,34 +78,28 @@ export const handleBssulaColumnsSpecialParams = (col: any) => {
   if (col.timeRenderHour) {
     col.render = ({ text }: any) =>
       handleTooltipHours(text, col.timeRenderHour);
-  }
-  // 处理不显示 时分秒的时间
-  if (col.timeRender) {
+  } else if (col.timeRender) {
+    // 处理不显示 时分秒的时间
     col.render = ({ text }: any) => handleTooltip(text, col.timeRender);
-  }
-  // 处理文字太长
-  if (col.textOverflow) {
-    col.render = ({ text }: any) => handleTextOverflow(text,col.width);
-  }
-  if (col.images) {
+  } else if (col.textOverflow) {
+    // 处理文字太长
+    col.render = ({ text }: any) => handleTextOverflow(text, col.width);
+  } else if (col.images) {
     col.render = ({ text }: any) => tableColumnsImage(text);
-  }
-  if (col.double) {
+  } else if (col.double) {
     col.render = ({ record }: any) =>
       handleTextDouble(record[col.textOne], record[col.textTwo]);
-  }
-  if (col.lineFeed) {
+  } else if (col.lineFeed) {
     col.render = ({ text }: any) => handleTextLineFeed(text);
-  }
-
-  // 处理序号
-  if (col.indexNumber) {
+  } else if (col.indexNumber) {
+    // 处理序号
     col.render = ({ index }: any) => index + 1;
-  }
-  // 没有值默认显示 - -
-  if (!col.render) {
+  } else if (col.isPermissionColumn && Array.isArray(col?.render)) {
+    col.render = col.render.filter((item) => authFn(item.code));
+  } else if (!col.render) {
+    // 没有值默认显示 - -
     // col.render = ({ text }: any) => text || '- -';
-    col.render = ({ text }: any) => text || '--';
+    col.render = ({ text }: any) => text ?? '--';
   }
 };
 /**
@@ -193,3 +188,51 @@ export const judgeIsEmpty = (value: any) => {
   }
   return false;
 };
+
+// /**
+//  * 处理错误请求
+//  * @param {*} response         返回结果
+//  * @param {*} needBackError    是否需要将错误回传到页面单独处理
+//  */
+// export function handleError(response: object, needBackError?: boolean) {
+//   // @ts-ignore
+//   if (
+//     !response ||
+//     (response.code ? response.code !== '000000' : response.status !== '0')
+//   ) {
+//     if (response && !needBackError) {
+//       // @ts-ignore
+//       response.msg && message.error(response.msg);
+//     }
+//     return false;
+//   }
+
+//   return true;
+// }
+
+/**
+ * 判断一个对象是否为非空对象
+ * @param obj 要判断的对象
+ * @returns boolean
+ */
+export const noEmptyArr = (obj: any) => Array.isArray(obj) && obj.length > 0;
+
+
+/**
+ * 生成任意长度随机字符串
+ * @param len 长度
+ * @returns 字符串
+ */
+export const randomString = (len?: any) => {
+  len = len || 32;
+  const $chars =
+    'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz'; /** **默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1*** */
+  const maxPos = $chars.length;
+  let pwd = '';
+  for (let i = 0; i < len; i++) {
+    pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
+  }
+  return pwd;
+};
+
+export const createUniqID = length => Number(Math.random().toString().substr(3, length) + Date.now()).toString(36);