@bit-sun/business-component 2.3.21 → 2.3.22-beta10

package/src/styles/bsDefault.less

@@ -25,8 +25,8 @@
 @menu-item-color: #ffffff;
 @menu-item-group-title-color: #ffffff;
 @menu-item-active-bg: rgba(65, 105, 225, 0.1);
-@primary-color: #005cff;
-@primary-color-hover: #8bc7ff;
+@primary-color: #02B56E;
+@primary-color-hover: #02B56E;
 @menu-bg: #222224;
 
 html,
@@ -1063,17 +1063,8 @@ ol {
     color: #ffffff;
   }
 
-  .ant-menu-dark.ant-menu-dark:not(.ant-menu-horizontal)
-    .ant-menu-item-selected {
-    background: linear-gradient(
-      to left,
-      #000c17 0%,
-      #000c17 30%,
-      rgb(0, 54, 144)
-    );
-  }
   .ant-pro-sider .ant-menu {
-    background: #141620 !important;
+    background: #494B4A !important;
     color: #b1bad4;
   }
   .ant-menu-dark .ant-menu-item,
@@ -1088,10 +1079,10 @@ ol {
     display: flex;
     align-items: center;
     height: 48px;
-    background: #141620;
+    background: #494B4A;
 
     .ant-input {
-      background: #141620;
+      background: #494B4A;
       color: #fff;
     }
 
@@ -1112,14 +1103,14 @@ ol {
       padding-left: 32px;
       color: #798094;
       font-size: 12px;
-      background: #141620;
+      background: #494B4A;
       border: 1px solid #3d4047;
       border-radius: 4px;
 
       // 搜索功能完善 menu  start
       .ant-input-affix-wrapper,
       .ant-input-group-addon {
-        background: #141620 !important;
+        background: #494B4A !important;
         border: none;
       }
       .ant-input-group-addon {
@@ -1483,7 +1474,7 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
 
   .ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed {
     box-shadow: none !important;
-    background-color: #141620;
+    background-color: #494B4A;
   }
   body .ant-pro-sider-logo {
     background-color: #f3f3f3;
@@ -1504,18 +1495,11 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
   .ant-menu-submenu-title,
   .ant-menu-item {
     border: 0px !important;
-    border-color: #005cff !important;
+    border-color: #02B56E !important;
   }
 
   .ant-menu-submenu-title:hover,
   .ant-menu-item:hover {
-    background: linear-gradient(
-      to left,
-      #000c17 0%,
-      #000c17 30%,
-      rgb(0, 54, 144)
-    );
-    border-left: 2px solid #005cff !important;
     box-sizing: border-box;
   }
 
@@ -1524,7 +1508,7 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
   }
   .ant-pro-sider-link:hover {
     border: 0px !important;
-    background: #141620 !important;
+    background: #494B4A !important;
   }
 
   .ant-table-column-sorters {
@@ -1591,13 +1575,7 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
   .ant-pro-sider-menu
     > .ant-menu-item-group
     > .ant-menu-item-group-title:hover {
-    background: linear-gradient(
-      to left,
-      #000c17 0%,
-      #000c17 30%,
-      rgb(0, 54, 144)
-    );
-    border-left: 2px solid #005cff !important;
+    border-left: 2px solid #02B56E !important;
     box-sizing: border-box;
     cursor: pointer;
     color: white;
@@ -1653,7 +1631,7 @@ body .ant-table .ant-table-container .ant-table-thead > tr > th {
   }
 
   .tab_title_content:hover {
-    color: #005cff;
+    color: #02B56E;
     .ant-dropdown-trigger {
       display: inline-block;
     }

package/src/utils/LocalstorageUtils.ts

@@ -68,9 +68,28 @@ export function getEmployeeCode() {
 export function getSessionId() {
   return resposne?.sessionId || '';
 }
+//--------赢家项目登录信息---------
+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 getAccountId() {
   return resposne?.accountPersonDetail?.accountId || -1;
 }
+
 export function getUserId() {
   return resposne.accountPersonDetail?.username;
 }

package/src/utils/requestUtils.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import ENUM from './enumConfig';
-import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId } from './LocalstorageUtils';
+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
@@ -17,10 +17,18 @@ export function handleRequestAuthHeader(config?: any) {
 
 // 处理请求头
 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['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');
   }