@bit-sun/business-component 2.4.4 → 2.4.5

package/dist/index.esm.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import cookie from 'js-cookie';
 import { message as message$1, Image, Popover, Card, Avatar, Tooltip, Menu, Space, Dropdown, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
 import _, { omit, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import { history, formatMessage, useLocation, Link, useModel, useIntl } from 'umi';
@@ -716,11 +717,36 @@ function getEekaToken() {
 }
 //--------赢家项目登录信息---------
 //--------国药项目登录信息---------
-function getGuoyaoshukeSessionId() {
-  return (resposne$1 === null || resposne$1 === void 0 ? void 0 : resposne$1.sessionId) || '';
+function getLoginHeaderInfo(headerkey) {
+  var storage = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'cookie';
+  if (storage) {
+    if ('localStorage' === storage) {
+      return localStorage.getItem(headerkey);
+    } else if ('sessionStorage' === storage) {
+      return sessionStorage.getItem(headerkey);
+    } else if ('cookie' === storage) {
+      return cookie.get(headerkey);
+    } else {
+      return localStorage.getItem(headerkey);
+    }
+  } else {
+    return localStorage.getItem(headerkey);
+  }
+}
+function getGuoyaoshukeCompanyId() {
+  return getLoginHeaderInfo('COMPANY_ID');
+}
+function getGuoyaoshukeTenantCode() {
+  return getLoginHeaderInfo('TENANT_ID');
+}
+function getGuoyaoshukeTenantId() {
+  return getLoginHeaderInfo('TENANT_CODE') || 1;
 }
 function getGuoyaoshukeToken() {
-  return (resposne$1 === null || resposne$1 === void 0 ? void 0 : resposne$1.token) || '';
+  return getLoginHeaderInfo('gksk-access-token');
+}
+function getGuoyaoshukeUscCode() {
+  return getLoginHeaderInfo('USC_CODE');
 }
 //--------国药项目登录信息---------
 
@@ -776,11 +802,11 @@ var handleCommonHeader = function handleCommonHeader() {
       break;
     case 'GuoYao':
       commonHeaders = {
-        'sso-sessionid': getGuoyaoshukeSessionId(),
-        // 'gksk-account-id': getGuoyaoshukeAccountId(),
-        // 'gksk-employee-id': getGuoyaoshukeEmployeeId(),
-        'Gksk-Tenant-Id': getCurrentTenantId(),
-        'Gksk-Access-Token': getGuoyaoshukeToken()
+        'gksk-company-id': getGuoyaoshukeCompanyId(),
+        'gksk-tenant-id': getGuoyaoshukeTenantId(),
+        'gksk-tenant-code': getGuoyaoshukeTenantCode(),
+        'gksk-access-token': getGuoyaoshukeToken(),
+        'gksk-usc-code': getGuoyaoshukeUscCode()
       };
       break;
     default:

package/dist/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var axios = require('axios');
+var cookie = require('js-cookie');
 var antd = require('antd');
 var _ = require('lodash');
 var umi = require('umi');
@@ -32,6 +33,7 @@ var isArray$1 = require('lodash/isArray');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
+var cookie__default = /*#__PURE__*/_interopDefaultLegacy(cookie);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
@@ -735,11 +737,36 @@ function getEekaToken() {
 }
 //--------赢家项目登录信息---------
 //--------国药项目登录信息---------
-function getGuoyaoshukeSessionId() {
-  return (resposne$1 === null || resposne$1 === void 0 ? void 0 : resposne$1.sessionId) || '';
+function getLoginHeaderInfo(headerkey) {
+  var storage = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'cookie';
+  if (storage) {
+    if ('localStorage' === storage) {
+      return localStorage.getItem(headerkey);
+    } else if ('sessionStorage' === storage) {
+      return sessionStorage.getItem(headerkey);
+    } else if ('cookie' === storage) {
+      return cookie__default['default'].get(headerkey);
+    } else {
+      return localStorage.getItem(headerkey);
+    }
+  } else {
+    return localStorage.getItem(headerkey);
+  }
+}
+function getGuoyaoshukeCompanyId() {
+  return getLoginHeaderInfo('COMPANY_ID');
+}
+function getGuoyaoshukeTenantCode() {
+  return getLoginHeaderInfo('TENANT_ID');
+}
+function getGuoyaoshukeTenantId() {
+  return getLoginHeaderInfo('TENANT_CODE') || 1;
 }
 function getGuoyaoshukeToken() {
-  return (resposne$1 === null || resposne$1 === void 0 ? void 0 : resposne$1.token) || '';
+  return getLoginHeaderInfo('gksk-access-token');
+}
+function getGuoyaoshukeUscCode() {
+  return getLoginHeaderInfo('USC_CODE');
 }
 //--------国药项目登录信息---------
 
@@ -795,11 +822,11 @@ var handleCommonHeader = function handleCommonHeader() {
       break;
     case 'GuoYao':
       commonHeaders = {
-        'sso-sessionid': getGuoyaoshukeSessionId(),
-        // 'gksk-account-id': getGuoyaoshukeAccountId(),
-        // 'gksk-employee-id': getGuoyaoshukeEmployeeId(),
-        'Gksk-Tenant-Id': getCurrentTenantId(),
-        'Gksk-Access-Token': getGuoyaoshukeToken()
+        'gksk-company-id': getGuoyaoshukeCompanyId(),
+        'gksk-tenant-id': getGuoyaoshukeTenantId(),
+        'gksk-tenant-code': getGuoyaoshukeTenantCode(),
+        'gksk-access-token': getGuoyaoshukeToken(),
+        'gksk-usc-code': getGuoyaoshukeUscCode()
       };
       break;
     default:

package/dist/utils/CustomLoginInfo.d.ts

@@ -3,8 +3,9 @@ export declare function getEekaAccountId(): any;
 export declare function getEekaEmployeeId(): any;
 export declare function getEekaTenantId(): any;
 export declare function getEekaToken(): any;
-export declare function getGuoyaoshukeSessionId(): any;
-export declare function getGuoyaoshukeAccountId(): any;
-export declare function getGuoyaoshukeEmployeeId(): any;
-export declare function getGuoyaoshukeTenantId(): any;
-export declare function getGuoyaoshukeToken(): any;
+export declare function getLoginHeaderInfo(headerkey: string, storage?: string): string | null | undefined;
+export declare function getGuoyaoshukeCompanyId(): string | null | undefined;
+export declare function getGuoyaoshukeTenantCode(): string | null | undefined;
+export declare function getGuoyaoshukeTenantId(): string | 1;
+export declare function getGuoyaoshukeToken(): string | null | undefined;
+export declare function getGuoyaoshukeUscCode(): string | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -53,7 +53,8 @@
     "react-resizable": "^3.0.4",
     "react-sortable-hoc": "^2.0.0",
     "warning": "^4.0.3",
-    "ast-types": "^0.13.3"
+    "ast-types": "^0.13.3",
+    "js-cookie": "^3.0.1"
   },
   "devDependencies": {
     "@ant-design/pro-layout": "^7.1.3",

package/src/components/Business/SearchSelect/index.md

@@ -1157,6 +1157,7 @@ export default () => {
   const props2 = {
     ...props,
     // prefixUrl: { selectPrefix: '/user/api', formSelectFix: '/user/api' },
+    // prefixUrl: { selectPrefix: '/api/user-manage/', formSelectFix: '/api/user-manage/' },
     modalTableProps: {
       needTypeSearch: true
     },

package/src/utils/CustomLoginInfo.ts

@@ -1,4 +1,5 @@
 import ENUM from '@/utils/enumConfig';
+import cookie from 'js-cookie'
 
 const resposne = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
 //--------赢家项目登录信息---------
@@ -21,19 +22,34 @@ export function getEekaToken() {
 
 
 //--------国药项目登录信息---------
-export function getGuoyaoshukeSessionId() {
-  return resposne?.sessionId || '';
-}
-export function getGuoyaoshukeAccountId() {
-  return resposne?.accountPersonDetail?.accountId || -1;
-}
-export function getGuoyaoshukeEmployeeId() {
-  return resposne?.employeeResVo?.id || 2;
+export function getLoginHeaderInfo(headerkey: string,storage='cookie') {
+  if (storage) {
+    if ('localStorage' === storage) {
+      return localStorage.getItem(headerkey)
+    } else if ('sessionStorage' === storage) {
+      return sessionStorage.getItem(headerkey)
+    } else if ('cookie' === storage) {
+      return cookie.get(headerkey)
+    } else {
+      return localStorage.getItem(headerkey)
+    }
+  } else {
+    return localStorage.getItem(headerkey)
+  }
+}
+export function getGuoyaoshukeCompanyId() {
+  return getLoginHeaderInfo('COMPANY_ID');
+}
+export function getGuoyaoshukeTenantCode() {
+  return getLoginHeaderInfo('TENANT_ID');
 }
 export function getGuoyaoshukeTenantId() {
-  return resposne?.personDetailResDto?.tenantId || 1;
+  return getLoginHeaderInfo('TENANT_CODE') || 1;
 }
 export function getGuoyaoshukeToken() {
-  return resposne?.token || '';
+  return getLoginHeaderInfo('gksk-access-token');
+}
+export function getGuoyaoshukeUscCode() {
+  return getLoginHeaderInfo('USC_CODE');
 }
 //--------国药项目登录信息---------

package/src/utils/requestUtils.ts

@@ -2,7 +2,7 @@ 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,
+  getGuoyaoshukeCompanyId, getGuoyaoshukeTenantId, getGuoyaoshukeTenantCode, getGuoyaoshukeToken, getGuoyaoshukeUscCode
 } from './CustomLoginInfo';
 
 export function handleRequestAuthHeader(config?: any) {
@@ -59,11 +59,11 @@ const handleCommonHeader = () => {
       break;
     case 'GuoYao':
       commonHeaders = {
-        'sso-sessionid': getGuoyaoshukeSessionId(),
-        // 'gksk-account-id': getGuoyaoshukeAccountId(),
-        // 'gksk-employee-id': getGuoyaoshukeEmployeeId(),
-        'Gksk-Tenant-Id': getCurrentTenantId(),
-        'Gksk-Access-Token': getGuoyaoshukeToken()
+        'gksk-company-id': getGuoyaoshukeCompanyId(),
+        'gksk-tenant-id': getGuoyaoshukeTenantId(),
+        'gksk-tenant-code': getGuoyaoshukeTenantCode(),
+        'gksk-access-token': getGuoyaoshukeToken(),
+        'gksk-usc-code': getGuoyaoshukeUscCode(),
       }
       break;
     default: