@bit-sun/business-component 2.3.22-beta9 → 2.3.23-beta01

package/src/utils/requestUtils.ts

@@ -1,42 +1,166 @@
-import axios from 'axios';
-import ENUM from './enumConfig';
-import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId, getEekaSessionId, getEekaAccountId, getEekaEmployeeId, getEekaTenantId, getEekaToken } from './LocalstorageUtils';
-
-export function handleRequestAuthHeader(config?: any) {
-  // https://www.kdocs.cn/l/coNbPpjamr5v这个表格里面涉及的接口，接口请求头里需要添加参数：x-biz-code 值就是列表里的code
-  // 例：x-biz-code=STORE_CODE
-  // 物理仓选择组件
-  if(config?.url?.indexOf( '/stock/physicalWarehouse?') > -1) {
-    config.headers['x-biz-code'] = 'PW_STOCK_CODE';
-  }
-  // 逻辑仓选择组件
-  if(config?.url?.indexOf( '/stock/realWarehouse?') > -1) {
-    config.headers['x-biz-code'] = 'RW_STOCK_CODE';
-  }
-}
-
-// 处理请求头
-const handleRequestHeader = (config: any) => {
-  // config.headers['sso-sessionid']  = getSessionId()
-  // config.headers['x-account-id']  = getAccountId()
-  // config.headers['x-employee-id']  = getEmployeeId()
-  // config.headers['x-tenant-id'] = getCurrentTenantId()
-  
-  //赢家项目请求头
-  config.headers['x-sso-sessionid']  = getEekaSessionId()
-  config.headers['x-account-id']  = getEekaAccountId()
-  config.headers['x-employee-id']  = getEekaEmployeeId()
-  config.headers['x-tenant-id'] = getEekaTenantId()
-  config.headers['x-user-token'] = getEekaToken()
-
-  if (localStorage.getItem('x-user-auth-context')) {
-    config.headers['x-user-auth-context'] = localStorage.getItem('x-user-auth-context');
-  }
-  handleRequestAuthHeader(config)
-}
-
-// 拦截器
-axios.interceptors.request.use((config: any) => {
-  handleRequestHeader(config)
-  return config
-})
+import axios from 'axios';
+import ENUM from './enumConfig';
+import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId } from './LocalstorageUtils';
+import { getEekaSessionId, getEekaAccountId, getEekaEmployeeId, getEekaTenantId, getEekaToken,
+  getGuoyaoshukeCompanyId, getGuoyaoshukeTenantId, getGuoyaoshukeTenantCode, getGuoyaoshukeToken, getGuoyaoshukeUscCode
+} from './CustomLoginInfo';
+
+export function handleRequestAuthHeader(config?: any) {
+  // https://www.kdocs.cn/l/coNbPpjamr5v这个表格里面涉及的接口，接口请求头里需要添加参数：x-biz-code 值就是列表里的code
+  // 例：x-biz-code=STORE_CODE
+  // 物理仓选择组件
+  if(config?.url?.indexOf( '/stock/physicalWarehouse?') > -1) {
+    config.headers['x-biz-code'] = 'PW_STOCK_CODE';
+  }
+  // 逻辑仓选择组件
+  if(config?.url?.indexOf( '/stock/realWarehouse?') > -1) {
+    config.headers['x-biz-code'] = 'RW_STOCK_CODE';
+  }
+}
+
+
+/*
+* 获取当前组件服务项目
+*  */
+const getCurrentUseProject = () => {
+  let project = 'BitSun';
+  const hostname = window.location.hostname;
+  if(hostname?.indexOf('omni')>-1 || hostname?.indexOf('eeka')>-1 || hostname?.indexOf('koradior')>-1) {
+    project = 'YingJia'
+  }
+  if(hostname?.indexOf('guoyaoshuke')>-1 || hostname?.indexOf('10.31.249.136')>-1) {
+    project = 'GuoYao'
+  }
+  return project
+}
+
+/*
+* 处理一般请求头
+* @param {*} config        请求参数配置
+*  */
+const handleCommonHeader = () => {
+  let commonHeaders = {};
+  const defaultHeaders = {
+    'sso-sessionid': getSessionId(),
+    'x-account-id': getAccountId(),
+    'x-employee-id': getEmployeeId(),
+    'x-tenant-id': getCurrentTenantId()
+  };
+  const type = getCurrentUseProject()
+  switch (type) {
+    case 'YingJia':
+      commonHeaders = {
+        'x-sso-sessionid': getEekaSessionId(),
+        'x-account-id': getEekaAccountId(),
+        'x-employee-id': getEekaEmployeeId(),
+        'x-tenant-id': getEekaTenantId(),
+        'x-user-token': getEekaToken()
+      }
+      break;
+    case 'GuoYao':
+      commonHeaders = {
+        'gksk-company-id': getGuoyaoshukeCompanyId(),
+        'gksk-tenant-id': getGuoyaoshukeTenantId(),
+        'gksk-tenant-code': getGuoyaoshukeTenantCode(),
+        'gksk-access-token': getGuoyaoshukeToken(),
+        'gksk-usc-code': getGuoyaoshukeUscCode(),
+      }
+      break;
+    default:
+      commonHeaders = defaultHeaders
+      break;
+  }
+ return commonHeaders
+}
+
+
+/*
+* 处理请求头方法-包含一般请求头、权限请求头。组件默认统一处理一遍，若组件使用处需要可以单独在组件处传参进来处理
+* @param {*} config         请求参数配置
+*  */
+const handleRequestHeader = (config: any) => {
+
+  let commonHeaders = handleCommonHeader();
+
+  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
+  }
+}
+
+
+// 拦截器
+axios.interceptors.request.use((config: any) => {
+  handleRequestHeader(config)
+  return config
+})
+
+
+
+
+/**
+ * 处理请求路径前缀/请求路径等使用不一的问题
+ * @param {*} defaultUrl         默认请求路径
+ * @param {*} defaultPreFix    默认请求路径的前缀
+ * @param {*} config    更改请求前缀/路径集合
+ *      示例：
+ *          appRequestConfig： {
+ *            '/appConfig/saveUserOrder': ['/api/user-manage'],
+ *            '/appConfig/saveQueryCriteria': ['/api/user-manage']
+ *          }
+ */
+export const handleRequestUrl = (defaultPreFix: string,defaultUrl: string, config: any) => {
+  let rUrl = `${defaultPreFix}${defaultUrl}`;
+  if(config && Object.keys((config||{}))?.length) {
+    const value = config[defaultUrl] || []
+    const newPreFix = value[0] || defaultPreFix;
+    const newUrl = value[1] || defaultUrl;
+    rUrl = `${newPreFix}${newUrl}`;
+  }
+  return rUrl
+}
+
+
+/**
+ * 处理错误请求
+ * @param {*} response         返回结果
+ * @param {*} needBackError    是否需要将错误回传到页面单独处理
+ */
+export function handleError(response: object, needBackError?: boolean) {
+  if (judgeIsRequestError(response)) {
+    if (response && !needBackError) {
+      // @ts-ignore
+      response.msg && message.error(response.msg);
+    }
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * 判断为请求错误
+ *  @param {*} res         响应体
+ * */
+export const judgeIsRequestError = (res: any) => {
+  if (!res || (res?.status && res.status !== '0') || (res?.code && (res.code !== '000000' && res.code !== '0'))) {
+    return true;
+  }
+  return false;
+};
+/**
+ * 判断为请求成功
+ * @param {*} res         响应体
+ * */
+export const judgeIsRequestSuccess = (res: any) => {
+  if (res?.status === '0' || res?.code === '000000'|| res?.code === '0') {
+    return true;
+  }
+  return false;
+};

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

@@ -1,212 +1,191 @@
-// @ts-nocheck
-import memoizeOne from 'memoize-one';
-import { formatMessage, history } from 'umi';
-import isEqual from 'lodash/isEqual';
-import ENUM from './enumConfig';
-import {
-  handleTextDouble,
-  handleTextLineFeed,
-  handleTextOverflow,
-  handleTooltip,
-  handleTooltipHours,
-  tableColumnsImage,
-} from '@/components/Business/BsSulaQueryTable/utils';
-
-export function downloadExcel(data: any, fileName?: any, isResUrl?: boolean) {
-  const resUrl = isResUrl
-    ? data
-    : window.URL.createObjectURL(
-      new Blob([data], {
-        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-      }),
-    );
-  const save_link = document.createElement('a');
-  save_link.href = resUrl;
-  if (fileName) {
-    save_link.download = fileName; /// 设置下载文件名
-  }
-  save_link.click();
-}
-
-export const formatter = (data, parentAuthority, parentName) => {
-  return data
-    .map((item) => {
-      if (!item.name || !item.path) {
-        return null;
-      }
-
-      let locale = 'menu';
-      if (parentName) {
-        locale = `${parentName}.${item.name}`;
-      } else {
-        locale = `menu.${item.name}`;
-      }
-      const result = {
-        ...item,
-        name: formatMessage && formatMessage({ id: locale, defaultMessage: item.name }) || item.name,
-        locale,
-        authority: item.authority || parentAuthority,
-      };
-      if (item.routes) {
-        const children = formatter(item.routes, item.authority, locale);
-        // Reduce memory usage
-        result.children = children;
-      }
-      delete result.routes;
-      return result;
-    })
-    .filter((item) => item);
-};
-
-export const memoizeOneFormatter = memoizeOne(formatter, isEqual);
-
-export const go2BackAndClose = () => {
-  localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
-  history.goBack();
-}
-
-/**
- * 处理bssulaTable的公共回显样式
- * @param col 每一具体行
- */
-export const handleBssulaColumnsSpecialParams = (col: any) => {
-  if (col.timeRenderHour) {
-    col.render = ({ text }: any) =>
-      handleTooltipHours(text, col.timeRenderHour);
-  }
-  // 处理不显示 时分秒的时间
-  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) {
-    col.render = ({ text }: any) => tableColumnsImage(text);
-  }
-  if (col.double) {
-    col.render = ({ record }: any) =>
-      handleTextDouble(record[col.textOne], record[col.textTwo]);
-  }
-  if (col.lineFeed) {
-    col.render = ({ text }: any) => handleTextLineFeed(text);
-  }
-
-  // 处理序号
-  if (col.indexNumber) {
-    col.render = ({ index }: any) => index + 1;
-  }
-  // 没有值默认显示 - -
-  if (!col.render) {
-    // col.render = ({ text }: any) => text || '- -';
-    col.render = ({ text }: any) => text || '--';
-  }
-};
-/**
- * 处理antdTable的公共回显样式
- * @param col 每一具体行
- */
- export const handleAntdColumnsSpecialParams = (col: any) => {
-  if (col.timeRenderHour) {
-    col.render = (text: any) =>
-      handleTooltipHours(text, col.timeRenderHour);
-  }
-  // 处理不显示 时分秒的时间
-  if (col.timeRender) {
-    col.render = (text: any) => handleTooltip(text, col.timeRender);
-  }
-  // 处理文字太长
-  if (col.textOverflow) {
-    col.render = (text: any) => handleTextOverflow(text);
-  }
-  if (col.images) {
-    col.render = (text: any) => tableColumnsImage(text);
-  }
-  if (col.double) {
-    col.render = (_: any, record: any) =>
-      handleTextDouble(record[col.textOne], record[col.textTwo]);
-  }
-  if (col.lineFeed) {
-    col.render = (text: any) => handleTextLineFeed(text);
-  }
-
-  // 处理序号
-  if (col.indexNumber) {
-    col.render = (_: any, __: any, index: any) => index + 1;
-  }
-  // 没有值默认显示 - -
-  if (!col.render) {
-    // col.render = ({ text }: any) => text || '- -';
-    col.render = (text: any) => text || '--';
-  }
-}
-
-export const getDictionarySource = (dicCode: string, needConvertInterger = false) => {
-  let dicData: any = {};
-  let dictionaryData;
-  if (!dictionaryData) {
-    let storageDic = localStorage.getItem('dicData')
-      ? JSON.parse(localStorage.getItem('dicData') || '{}')
-      : {};
-    dicData = storageDic[dicCode];
-  } else {
-    dicData = dictionaryData[dicCode];
-  }
-  if (!dicData || !dicData.length) {
-    // throw new Error(`当前没有${dicCode}字典值`);
-  }
-
-  try {
-    if (needConvertInterger) {
-      dicData = dicData.map((item: { text: string; value: string }) => ({
-        ...item,
-        value: parseFloat(item.value),
-      }));
-    }
-  } catch (e) { }
-  return dicData;
-};
-
-export function uuid() {
-  const s = [];
-  const hexDigits = '0123456789abcdef';
-  for (let i = 0; i < 36; i++) {
-    s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-  }
-  s[14] = '4'; // bits 12-15 of the time_hi_and_version field to 0010
-  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
-  s[8] = s[13] = s[18] = s[23] = '-';
-
-  const uuid = s.join('');
-  return uuid;
-}
-
-export const judgeIsEmpty = (value: any) => {
-  // 判空函数，包含对0的处理
-  if (value == null || value == undefined || String(value).trim() == '') {
-    return true;
-  }
-  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;
-}
+// @ts-nocheck
+import memoizeOne from 'memoize-one';
+import { formatMessage, history } from 'umi';
+import isEqual from 'lodash/isEqual';
+import ENUM from './enumConfig';
+import {
+  handleTextDouble,
+  handleTextLineFeed,
+  handleTextOverflow,
+  handleTooltip,
+  handleTooltipHours,
+  tableColumnsImage,
+} from '@/components/Business/BsSulaQueryTable/utils';
+
+export function downloadExcel(data: any, fileName?: any, isResUrl?: boolean) {
+  const resUrl = isResUrl
+    ? data
+    : window.URL.createObjectURL(
+      new Blob([data], {
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      }),
+    );
+  const save_link = document.createElement('a');
+  save_link.href = resUrl;
+  if (fileName) {
+    save_link.download = fileName; /// 设置下载文件名
+  }
+  save_link.click();
+}
+
+export const formatter = (data, parentAuthority, parentName) => {
+  return data
+    .map((item) => {
+      if (!item.name || !item.path) {
+        return null;
+      }
+
+      let locale = 'menu';
+      if (parentName) {
+        locale = `${parentName}.${item.name}`;
+      } else {
+        locale = `menu.${item.name}`;
+      }
+      const result = {
+        ...item,
+        name: formatMessage && formatMessage({ id: locale, defaultMessage: item.name }) || item.name,
+        locale,
+        authority: item.authority || parentAuthority,
+      };
+      if (item.routes) {
+        const children = formatter(item.routes, item.authority, locale);
+        // Reduce memory usage
+        result.children = children;
+      }
+      delete result.routes;
+      return result;
+    })
+    .filter((item) => item);
+};
+
+export const memoizeOneFormatter = memoizeOne(formatter, isEqual);
+
+export const go2BackAndClose = () => {
+  localStorage.setItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK, 1);
+  history.goBack();
+}
+
+/**
+ * 处理bssulaTable的公共回显样式
+ * @param col 每一具体行
+ */
+export const handleBssulaColumnsSpecialParams = (col: any) => {
+  if (col.timeRenderHour) {
+    col.render = ({ text }: any) =>
+      handleTooltipHours(text, col.timeRenderHour);
+  }
+  // 处理不显示 时分秒的时间
+  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) {
+    col.render = ({ text }: any) => tableColumnsImage(text);
+  }
+  if (col.double) {
+    col.render = ({ record }: any) =>
+      handleTextDouble(record[col.textOne], record[col.textTwo]);
+  }
+  if (col.lineFeed) {
+    col.render = ({ text }: any) => handleTextLineFeed(text);
+  }
+
+  // 处理序号
+  if (col.indexNumber) {
+    col.render = ({ index }: any) => index + 1;
+  }
+  // 没有值默认显示 - -
+  if (!col.render) {
+    // col.render = ({ text }: any) => text || '- -';
+    col.render = ({ text }: any) => text || '--';
+  }
+};
+/**
+ * 处理antdTable的公共回显样式
+ * @param col 每一具体行
+ */
+ export const handleAntdColumnsSpecialParams = (col: any) => {
+  if (col.timeRenderHour) {
+    col.render = (text: any) =>
+      handleTooltipHours(text, col.timeRenderHour);
+  }
+  // 处理不显示 时分秒的时间
+  if (col.timeRender) {
+    col.render = (text: any) => handleTooltip(text, col.timeRender);
+  }
+  // 处理文字太长
+  if (col.textOverflow) {
+    col.render = (text: any) => handleTextOverflow(text);
+  }
+  if (col.images) {
+    col.render = (text: any) => tableColumnsImage(text);
+  }
+  if (col.double) {
+    col.render = (_: any, record: any) =>
+      handleTextDouble(record[col.textOne], record[col.textTwo]);
+  }
+  if (col.lineFeed) {
+    col.render = (text: any) => handleTextLineFeed(text);
+  }
+
+  // 处理序号
+  if (col.indexNumber) {
+    col.render = (_: any, __: any, index: any) => index + 1;
+  }
+  // 没有值默认显示 - -
+  if (!col.render) {
+    // col.render = ({ text }: any) => text || '- -';
+    col.render = (text: any) => text || '--';
+  }
+}
+
+export const getDictionarySource = (dicCode: string, needConvertInterger = false) => {
+  let dicData: any = {};
+  let dictionaryData;
+  if (!dictionaryData) {
+    let storageDic = localStorage.getItem('dicData')
+      ? JSON.parse(localStorage.getItem('dicData') || '{}')
+      : {};
+    dicData = storageDic[dicCode];
+  } else {
+    dicData = dictionaryData[dicCode];
+  }
+  if (!dicData || !dicData.length) {
+    // throw new Error(`当前没有${dicCode}字典值`);
+  }
+
+  try {
+    if (needConvertInterger) {
+      dicData = dicData.map((item: { text: string; value: string }) => ({
+        ...item,
+        value: parseFloat(item.value),
+      }));
+    }
+  } catch (e) { }
+  return dicData;
+};
+
+export function uuid() {
+  const s = [];
+  const hexDigits = '0123456789abcdef';
+  for (let i = 0; i < 36; i++) {
+    s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+  }
+  s[14] = '4'; // bits 12-15 of the time_hi_and_version field to 0010
+  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
+  s[8] = s[13] = s[18] = s[23] = '-';
+
+  const uuid = s.join('');
+  return uuid;
+}
+
+export const judgeIsEmpty = (value: any) => {
+  // 判空函数，包含对0的处理
+  if (value == null || value == undefined || String(value).trim() == '') {
+    return true;
+  }
+  return false;
+};