@bit-sun/business-component 3.0.0-alpha.21 → 3.0.0-alpha.23

package/src/utils/constant.ts

@@ -1,39 +1,39 @@
-export const FORMAT_TIME_STR = 'YYYY-MM-DD HH:mm:ss';
-export const FORMAT_DAY_STR = 'YYYY-MM-DD';
-export const FUNCTION_UNDEFINED = 'undefined'
-export const FUNCTION_GET = 'GET'
-export const REQUEST_SUCCESS_CODE = '000000'
-export const FORMAT_ARRAY_START = 'YYYY-MM-DD 00:00:00';
-export const FORMAT_ARRAY_END = 'YYYY-MM-DD 23:59:59';
-export const APPLICATION_SHEET = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-export const MENU_AUTH_KEY = 'menuAuth_mainProject'
-export const DIC_DATA_KEY = 'dicData'
-/* 字面量 */
-// 字面量数字
-export const NUMBER_VALUE = Object.freeze({
-  ZERO: 0,
-  ONE: 1,
-  TWO: 2,
-  THREE: 3,
-  FOUR: 4,
-  FIVE: 5,
-  SIX: 6,
-  SEVEN: 7,
-  EIGHT: 8,
-  NINE: 9,
-  TEN: 10,
-  ELEVEN: 11,
-  TWELVE: 12,
-  THIRTEEN: 13,
-  FOURTEEN: 14,
-  FIFTEEN: 15,
-  SIXTEEN: 16,
-  SEVENTEEN: 17,
-  EIGHTEEN: 18,
-  NINETEEN: 19,
-  TWENTY: 20,
-  TWENTY_ONE: 21,
-  TWENTY_TWO: 22,
-  TWENTY_THREE: 23,
-  TWENTY_FOUR: 24,
+export const FORMAT_TIME_STR = 'YYYY-MM-DD HH:mm:ss';
+export const FORMAT_DAY_STR = 'YYYY-MM-DD';
+export const FUNCTION_UNDEFINED = 'undefined'
+export const FUNCTION_GET = 'GET'
+export const REQUEST_SUCCESS_CODE = '000000'
+export const FORMAT_ARRAY_START = 'YYYY-MM-DD 00:00:00';
+export const FORMAT_ARRAY_END = 'YYYY-MM-DD 23:59:59';
+export const APPLICATION_SHEET = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+export const MENU_AUTH_KEY = 'menuAuth_mainProject'
+export const DIC_DATA_KEY = 'dicData'
+/* 字面量 */
+// 字面量数字
+export const NUMBER_VALUE = Object.freeze({
+  ZERO: 0,
+  ONE: 1,
+  TWO: 2,
+  THREE: 3,
+  FOUR: 4,
+  FIVE: 5,
+  SIX: 6,
+  SEVEN: 7,
+  EIGHT: 8,
+  NINE: 9,
+  TEN: 10,
+  ELEVEN: 11,
+  TWELVE: 12,
+  THIRTEEN: 13,
+  FOURTEEN: 14,
+  FIFTEEN: 15,
+  SIXTEEN: 16,
+  SEVENTEEN: 17,
+  EIGHTEEN: 18,
+  NINETEEN: 19,
+  TWENTY: 20,
+  TWENTY_ONE: 21,
+  TWENTY_TWO: 22,
+  TWENTY_THREE: 23,
+  TWENTY_FOUR: 24,
 });

package/src/utils/index.ts

@@ -1,6 +1,6 @@
-export * from './requestUtils';
-export * from './checkUtils';
-export * from './LocalstorageUtils';
-export * from './TableUtils';
-export * from './businessUtils';
-export * from './utils';
+export * from './requestUtils';
+export * from './checkUtils';
+export * from './LocalstorageUtils';
+export * from './TableUtils';
+export * from './businessUtils';
+export * from './utils';

package/src/utils/request.ts

@@ -1,53 +1,53 @@
-// @ts-nocheck
-import request from "umi-request";
-
-const get = (url, params?: any) => {
-  return request.get(url, {
-    ...params,
-  }).then(handleResponseData);
-};
-
-const post = (url, data?: any) => {
-  return request.post(url, {
-    data,
-  }).then(handleResponseData);
-};
-
-const patch = (url, data?: any) => {
-  return request.patch(url, {
-    data,
-  }).then(handleResponseData);
-};
-
-const put = (url, data?: any) => {
-  return request.put(url, {
-    data,
-  }).then(handleResponseData);
-};
-
-const deleteS = (url, data?: any) => {
-  return request.delete(url, {
-    data,
-  }).then(handleResponseData);
-};
-
-const requestUtil: any = ({ url, ...parms }: { url: string; parms: any }) => {
-  return request(url, parms).then(handleResponseData);
-
-  
-};
-
-const handleResponseData = async (response: any) => {
-  return Promise.resolve({
-    data: response,
-    status: response.status
-  })
-}
-
-requestUtil.get = get;
-requestUtil.post = post;
-requestUtil.patch = patch;
-requestUtil.put = put;
-requestUtil.delete = deleteS;
-
-export default requestUtil;
+// @ts-nocheck
+import request from "umi-request";
+
+const get = (url, params?: any) => {
+  return request.get(url, {
+    ...params,
+  }).then(handleResponseData);
+};
+
+const post = (url, data?: any) => {
+  return request.post(url, {
+    data,
+  }).then(handleResponseData);
+};
+
+const patch = (url, data?: any) => {
+  return request.patch(url, {
+    data,
+  }).then(handleResponseData);
+};
+
+const put = (url, data?: any) => {
+  return request.put(url, {
+    data,
+  }).then(handleResponseData);
+};
+
+const deleteS = (url, data?: any) => {
+  return request.delete(url, {
+    data,
+  }).then(handleResponseData);
+};
+
+const requestUtil: any = ({ url, ...parms }: { url: string; parms: any }) => {
+  return request(url, parms).then(handleResponseData);
+
+  
+};
+
+const handleResponseData = async (response: any) => {
+  return Promise.resolve({
+    data: response,
+    status: response.status
+  })
+}
+
+requestUtil.get = get;
+requestUtil.post = post;
+requestUtil.patch = patch;
+requestUtil.put = put;
+requestUtil.delete = deleteS;
+
+export default requestUtil;

package/src/utils/requestUtils.ts

@@ -1,193 +1,193 @@
-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,
-  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 handleAxioRequestHeader = (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) => {
-  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,
-  };
-});
-
-
-/**
- * 处理请求路径前缀/请求路径等使用不一的问题
- * @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;
-};
+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,
+  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 handleAxioRequestHeader = (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) => {
+  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,
+  };
+});
+
+
+/**
+ * 处理请求路径前缀/请求路径等使用不一的问题
+ * @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;
+};