@bit-sun/business-component 2.3.28 → 2.4.1

package/src/components/Solution/RuleComponent/ruleFiled.js

@@ -3,7 +3,8 @@ import { Select, Input, InputNumber, DatePicker, TimePicker } from 'antd';
 import styles from './index.less';
 import { getRegularThresholdRange } from './services';
 import moment from 'moment';
-import { handleError, judgeIsEmpty } from '../../../utils/utils';
+import { judgeIsEmpty } from '../../../utils/utils';
+import { handleError } from '../../../utils/requestUtils';
 import { queryIdentityInfo, findChangedThresholdQuery, setParams, dateFormat, fullDateFormat } from './util';
 import { request as SulaRequest } from 'bssula';
 import { stringify } from 'querystring';

package/src/plugin/TableColumnSetting/index.tsx

@@ -19,6 +19,7 @@ import fixedLeftActive from '../../assets/fixed-left-active.svg';
 import fixedRight from '../../assets/fixed-right.svg';
 import fixedRightActive from '../../assets/fixed-right-active.svg';
 import './index.less';
+import { handleRequestUrl, judgeIsRequestSuccess } from '@/utils/requestUtils';
 
 interface TableColumnSettingProps {
   /** tableCode必填，做用户存储关键key，*/
@@ -54,7 +55,7 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
   };
 
   patchUserColumnConfig = (config: any) => {
-    const { tableCode }: any = this.props;
+    const { tableCode, appRequestConfig }: any = this.props;
     if (!tableCode) return;
     let configvalue = config.map((item:any) => ({
       key: item.key,
@@ -65,14 +66,14 @@ class TableColumnSetting extends React.Component<TableColumnSettingProps> {
     }))
 
     axios({
-      url: '/user/appConfig/saveUserOrder',
+      url: handleRequestUrl('/user','/appConfig/saveUserOrder',appRequestConfig),
       method:'POST',
       data: {
         "code": tableCode,
         "detail": JSON.stringify(configvalue)
       },
     }).then((res:any) => {
-      if (res?.data?.status === '0') {
+      if (judgeIsRequestSuccess(res?.data)) {
         setConfigTableColumns(configvalue, tableCode)
       } else {
         message.error('保存表头列自定义失败，请稍后尝试');

package/src/utils/CustomLoginInfo.ts

@@ -0,0 +1,39 @@
+import ENUM from '@/utils/enumConfig';
+
+const resposne = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
+//--------赢家项目登录信息---------
+export function getEekaSessionId() {
+  return resposne?.sessionId || '';
+}
+export function getEekaAccountId() {
+  return resposne?.personDetailResDto?.accountId || -1;
+}
+export function getEekaEmployeeId() {
+  return resposne?.personDetailResDto?.employeeId || 2;
+}
+export function getEekaTenantId() {
+  return resposne?.personDetailResDto?.tenantId || 1;
+}
+export function getEekaToken() {
+  return resposne?.token;
+}
+//--------赢家项目登录信息---------
+
+
+//--------国药项目登录信息---------
+export function getGuoyaoshukeSessionId() {
+  return resposne?.sessionId || '';
+}
+export function getGuoyaoshukeAccountId() {
+  return resposne?.accountPersonDetail?.accountId || -1;
+}
+export function getGuoyaoshukeEmployeeId() {
+  return resposne?.employeeResVo?.id || 2;
+}
+export function getGuoyaoshukeTenantId() {
+  return resposne?.personDetailResDto?.tenantId || 1;
+}
+export function getGuoyaoshukeToken() {
+  return resposne?.token || '';
+}
+//--------国药项目登录信息---------

package/src/utils/requestUtils.ts

@@ -1,6 +1,9 @@
 import axios from 'axios';
 import ENUM from './enumConfig';
 import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId } from './LocalstorageUtils';
+import { getEekaSessionId, getEekaAccountId, getEekaEmployeeId, getEekaTenantId, getEekaToken,
+  getGuoyaoshukeSessionId, getGuoyaoshukeAccountId, getGuoyaoshukeEmployeeId, getGuoyaoshukeToken,
+} from './CustomLoginInfo';
 
 export function handleRequestAuthHeader(config?: any) {
   // https://www.kdocs.cn/l/coNbPpjamr5v这个表格里面涉及的接口，接口请求头里需要添加参数：x-biz-code 值就是列表里的code
@@ -15,20 +18,149 @@ export function handleRequestAuthHeader(config?: any) {
   }
 }
 
-// 处理请求头
+
+/*
+* 获取当前组件服务项目
+*  */
+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 = {
+        'sso-sessionid': getGuoyaoshukeSessionId(),
+        'gksk-account-id': getGuoyaoshukeAccountId(),
+        'gksk-employee-id': getGuoyaoshukeEmployeeId(),
+        'gksk-tenant-id': getCurrentTenantId(),
+        'gksk-user-token': getGuoyaoshukeToken()
+      }
+      break;
+    default:
+      commonHeaders = defaultHeaders
+      break;
+  }
+ return commonHeaders
+}
+
+
+/*
+* 处理请求头方法-包含一般请求头、权限请求头。组件默认统一处理一遍，若组件使用处需要可以单独在组件处传参进来处理
+* @param {*} config         请求参数配置
+*  */
 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()
+
+  let commonHeaders = handleCommonHeader();
+
   if (localStorage.getItem('x-user-auth-context')) {
-    config.headers['x-user-auth-context'] = 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
   }
-  handleRequestAuthHeader(config)
 }
 
+
 // 拦截器
 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/utils.ts

@@ -189,24 +189,3 @@ 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;
-}