@bit-sun/business-component 2.3.22-beta7 → 2.3.22-beta9

package/src/utils/CheckOneUser/index.md

@@ -1,39 +1,39 @@
----
-nav:
-  title: '工具方法'
-  order: 2
-group:
-  title: 方法
-  order: 0
-title: 确保单用户登录
-order: 1
----
-
-## CheckOneUser
-
-Demo:
-
-```tsx
-import React, { useRef } from 'react';
-import { message } from 'antd';
-
-import { CheckOneUser } from '../../index';
-
-CheckOneUser('userInfo.a.information.name', 3, () => {
-  message.warning('检测新用户登录，当前页面会在3s之后刷新!');
-})
-
-export default () => {
-  
-  const handleOnChange = (value) => {
-    console.log(value);
-  };
-
-  return (
-    <div>
-    </div>
-  );
-};
-```
-
-More skills for writing demo: https://d.umijs.org/guide/demo-principle
+---
+nav:
+  title: '工具方法'
+  order: 2
+group:
+  title: 方法
+  order: 0
+title: 确保单用户登录
+order: 1
+---
+
+## CheckOneUser
+
+Demo:
+
+```tsx
+import React, { useRef } from 'react';
+import { message } from 'antd';
+
+import { CheckOneUser } from '../../index';
+
+CheckOneUser('userInfo.a.information.name', 3, () => {
+  message.warning('检测新用户登录，当前页面会在3s之后刷新!');
+})
+
+export default () => {
+  
+  const handleOnChange = (value) => {
+    console.log(value);
+  };
+
+  return (
+    <div>
+    </div>
+  );
+};
+```
+
+More skills for writing demo: https://d.umijs.org/guide/demo-principle

package/src/utils/CheckOneUser/index.ts

@@ -1,52 +1,52 @@
-/*
- * @Description: 
- * @Author: rodchen
- * @Date: 2022-01-14 14:12:01
- * @LastEditTime: 2022-01-14 17:17:26
- * @LastEditors: rodchen
- */
-export default (storageKeyString: string, seconds: number = 2, tipsCallFunction?: () =>{}) => {
-  if (typeof seconds !== 'number' ) throw new Error('seconds should be number');
-  
-  let cacheValue = getStorageVale(storageKeyString);
-
-  if (document.hidden !== undefined) {
-    document.addEventListener('visibilitychange', () => {
-      if (!document.hidden) {
-        let currentValue = getStorageVale(storageKeyString);
-        if (currentValue !== cacheValue) {
-          if (tipsCallFunction && typeof tipsCallFunction === 'function') {
-            tipsCallFunction();
-          } else {
-            window.alert('检测新用户登录，当前页面会在2s之后刷新!');
-          }
-  
-          setTimeout(() => {
-            window.location.reload();
-          }, seconds * 1000)
-        }
-      }
-    })
-  }
-}
-
-function getStorageVale (storageKeyString: string) {
-  var [localstorage, ...restKeyArrays] = storageKeyString.split('.');
-  let localStorageInfo = window.localStorage.getItem(localstorage)
-
-  if (!restKeyArrays.length) return localStorageInfo;
-
-  let returnVal = JSON.parse(localStorageInfo || '{}');
-
-  for(let i = 0; i < restKeyArrays.length; i++ ) {
-    returnVal = returnVal[restKeyArrays[i]]
-
-    if (!returnVal) return '';
-
-    if (typeof returnVal === 'string') {
-      return returnVal
-    }
-  }
-
-  return ""
+/*
+ * @Description: 
+ * @Author: rodchen
+ * @Date: 2022-01-14 14:12:01
+ * @LastEditTime: 2022-01-14 17:17:26
+ * @LastEditors: rodchen
+ */
+export default (storageKeyString: string, seconds: number = 2, tipsCallFunction?: () =>{}) => {
+  if (typeof seconds !== 'number' ) throw new Error('seconds should be number');
+  
+  let cacheValue = getStorageVale(storageKeyString);
+
+  if (document.hidden !== undefined) {
+    document.addEventListener('visibilitychange', () => {
+      if (!document.hidden) {
+        let currentValue = getStorageVale(storageKeyString);
+        if (currentValue !== cacheValue) {
+          if (tipsCallFunction && typeof tipsCallFunction === 'function') {
+            tipsCallFunction();
+          } else {
+            window.alert('检测新用户登录，当前页面会在2s之后刷新!');
+          }
+  
+          setTimeout(() => {
+            window.location.reload();
+          }, seconds * 1000)
+        }
+      }
+    })
+  }
+}
+
+function getStorageVale (storageKeyString: string) {
+  var [localstorage, ...restKeyArrays] = storageKeyString.split('.');
+  let localStorageInfo = window.localStorage.getItem(localstorage)
+
+  if (!restKeyArrays.length) return localStorageInfo;
+
+  let returnVal = JSON.parse(localStorageInfo || '{}');
+
+  for(let i = 0; i < restKeyArrays.length; i++ ) {
+    returnVal = returnVal[restKeyArrays[i]]
+
+    if (!returnVal) return '';
+
+    if (typeof returnVal === 'string') {
+      return returnVal
+    }
+  }
+
+  return ""
 }

package/src/utils/LocalstorageUtils.ts

@@ -1,95 +1,114 @@
-import ENUM from '@/utils/enumConfig';
-
-const resposne = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
-
-// 存储表头
-export const setConfigTableColumns = (configvalue: any, tableCode:string) => {
-  let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]'
-  let configArray = JSON.parse(config)
-  let currentSetting = configArray.filter((item:any) => item.code === tableCode)
-  if (currentSetting.length) {
-    currentSetting[0].detail = JSON.stringify(configvalue)
-  } else {
-    configArray.push({
-      "code": tableCode,
-      "detail": JSON.stringify(configvalue)
-    })
-  }
-
-  localStorage.setItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION, JSON.stringify(configArray))
-}
-
-// 取表头
-export const getConfigTableColumns = (tableCode: string) => {
-  if (!tableCode) return [];
-  let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
-  let configArray = JSON.parse(config);
-  let configSetting = configArray.filter(
-    (item:any) => item.code === tableCode,
-  );
-
-  if (configSetting.length) {
-    return JSON.parse(configSetting[0].detail || '[]');
-  }
-  return [];
-};
-
-// 登陆租户信息存储、获取、移除
-export const saveTenantList = (data: any) => {
-  const list = data?.length && data || [];
-  localStorage.setItem('tenant_list', JSON.stringify(list));
-}
-export const getTenantList = () => {
-  const list = JSON.parse(localStorage.getItem('tenant_list') || '[]');
-  return list
-}
-export const removeTenantList = () => {
-  localStorage.removeItem('tenant_list');
-}
-
-// 当前租户存储、获取、移除
-export const saveCurrentTenantId = (item: string) => {
-  localStorage.setItem('current_tenant_id', String(item));
-}
-export const getCurrentTenantId = () => {
-  return localStorage.getItem('current_tenant_id') || 1;
-}
-export const removeCurrentTenantId = () => {
-  localStorage.removeItem('current_tenant_id');
-}
-
-
-export function getEmployeeId() {
-  return resposne?.employeeResVo?.id || 2;
-}
-export function getEmployeeCode() {
-  return resposne?.employeeResVo?.employeeNumber;
-}
-export function getSessionId() {
-  return resposne?.sessionId || '';
-}
-export function getAccountId() {
-  return resposne?.accountPersonDetail?.accountId || -1;
-}
-export function getUserId() {
-  return resposne.accountPersonDetail?.username;
-}
-
-export function getAccountID() {
-  return resposne?.accountPersonDetail?.id;
-}
-
-export function getUserName() {
-  return resposne?.accountPersonDetail?.employeeName;
-}
-
-export function handleUserPhone() {
-  const str = resposne?.person?.phone || '';
-  const enStr = str && str.slice(0, 3) + '****' + str.slice(str.length - 4);
-  return enStr;
-}
-
-// 获取当前所选组织
-export function getCurrentTargetBgId() {
-  return localStorage.getItem('target_bg_id');
-}
+import ENUM from '@/utils/enumConfig';
+
+const resposne = JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.USER_INFO) || '{}');
+
+// 存储表头
+export const setConfigTableColumns = (configvalue: any, tableCode:string) => {
+  let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]'
+  let configArray = JSON.parse(config)
+  let currentSetting = configArray.filter((item:any) => item.code === tableCode)
+  if (currentSetting.length) {
+    currentSetting[0].detail = JSON.stringify(configvalue)
+  } else {
+    configArray.push({
+      "code": tableCode,
+      "detail": JSON.stringify(configvalue)
+    })
+  }
+
+  localStorage.setItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION, JSON.stringify(configArray))
+}
+
+// 取表头
+export const getConfigTableColumns = (tableCode: string) => {
+  if (!tableCode) return [];
+  let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+  let configArray = JSON.parse(config);
+  let configSetting = configArray.filter(
+    (item:any) => item.code === tableCode,
+  );
+
+  if (configSetting.length) {
+    return JSON.parse(configSetting[0].detail || '[]');
+  }
+  return [];
+};
+
+// 登陆租户信息存储、获取、移除
+export const saveTenantList = (data: any) => {
+  const list = data?.length && data || [];
+  localStorage.setItem('tenant_list', JSON.stringify(list));
+}
+export const getTenantList = () => {
+  const list = JSON.parse(localStorage.getItem('tenant_list') || '[]');
+  return list
+}
+export const removeTenantList = () => {
+  localStorage.removeItem('tenant_list');
+}
+
+// 当前租户存储、获取、移除
+export const saveCurrentTenantId = (item: string) => {
+  localStorage.setItem('current_tenant_id', String(item));
+}
+export const getCurrentTenantId = () => {
+  return localStorage.getItem('current_tenant_id') || 1;
+}
+export const removeCurrentTenantId = () => {
+  localStorage.removeItem('current_tenant_id');
+}
+
+
+export function getEmployeeId() {
+  return resposne?.employeeResVo?.id || 2;
+}
+export function getEmployeeCode() {
+  return resposne?.employeeResVo?.employeeNumber;
+}
+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;
+}
+
+export function getAccountID() {
+  return resposne?.accountPersonDetail?.id;
+}
+
+export function getUserName() {
+  return resposne?.accountPersonDetail?.employeeName;
+}
+
+export function handleUserPhone() {
+  const str = resposne?.person?.phone || '';
+  const enStr = str && str.slice(0, 3) + '****' + str.slice(str.length - 4);
+  return enStr;
+}
+
+// 获取当前所选组织
+export function getCurrentTargetBgId() {
+  return localStorage.getItem('target_bg_id');
+}

package/src/utils/TableUtils.tsx

@@ -1,18 +1,18 @@
-
-type mediaListType = {
-  type: number,
-  url: string,
-  [key: string]: any;
-}
-type recordType = {
-  mediaList?: mediaListType;
-  [key: string]: any;
-};
-export const getSkuImg = (
-  record: recordType,
-) => {
-  // 默认取sku图片、当没有设置时取商品图片，商品图片也没有返回空
-  const ImgList = record.mediaList?.length && record.mediaList.filter((i: any) => i.type == 1) || [] // 获取SKU、SPU图片数组集合
-  const imgShow = ImgList?.length && ImgList[0].url || null
-  return imgShow;
-};
+
+type mediaListType = {
+  type: number,
+  url: string,
+  [key: string]: any;
+}
+type recordType = {
+  mediaList?: mediaListType;
+  [key: string]: any;
+};
+export const getSkuImg = (
+  record: recordType,
+) => {
+  // 默认取sku图片、当没有设置时取商品图片，商品图片也没有返回空
+  const ImgList = record.mediaList?.length && record.mediaList.filter((i: any) => i.type == 1) || [] // 获取SKU、SPU图片数组集合
+  const imgShow = ImgList?.length && ImgList[0].url || null
+  return imgShow;
+};

package/src/utils/checkUtils.ts

@@ -1,39 +1,39 @@
-import { message } from 'antd';
-import _ from 'lodash';
-
-const checkQuantityAccuracy = (value: any, accuracy: any, errorInfo?: any) => {
-  let errorMessage= {showTips: true, tipsMessage: null,...errorInfo}
-  if (_.trim(value)) {
-    const target = `${value}`;
-    if (target.includes(".")) {
-      if (target.split(".")[1].length > accuracy) {
-        if(errorMessage?.showTips) {
-          message.warning(errorMessage?.tipsMessage || `系统设置数量最大精度为${accuracy}位`)
-        }
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-const precisionQuantity = (num: any, accuracy: any) => {
-  if (_.trim(num)) {
-    const target = `${num}`;
-    if (target.includes(".")) {
-      if (target.split(".")[1].length > accuracy) {
-        const beforeDot = target.split(".")[0];
-        const afterDot = target.split(".")[1]?.slice(0,accuracy)
-        const result = accuracy == 0 ? Number(`${beforeDot}`) : Number(`${beforeDot}.${afterDot}`)
-        return result
-      } else if (target.split(".")[1].length < accuracy) {
-        return Number(Number(num).toFixed(Math.abs(accuracy)))
-      } else {
-        return  Number(num)
-      }
-    }
-  }
-  return ''
-}
-
-export { checkQuantityAccuracy, precisionQuantity }
+import { message } from 'antd';
+import _ from 'lodash';
+
+const checkQuantityAccuracy = (value: any, accuracy: any, errorInfo?: any) => {
+  let errorMessage= {showTips: true, tipsMessage: null,...errorInfo}
+  if (_.trim(value)) {
+    const target = `${value}`;
+    if (target.includes(".")) {
+      if (target.split(".")[1].length > accuracy) {
+        if(errorMessage?.showTips) {
+          message.warning(errorMessage?.tipsMessage || `系统设置数量最大精度为${accuracy}位`)
+        }
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+const precisionQuantity = (num: any, accuracy: any) => {
+  if (_.trim(num)) {
+    const target = `${num}`;
+    if (target.includes(".")) {
+      if (target.split(".")[1].length > accuracy) {
+        const beforeDot = target.split(".")[0];
+        const afterDot = target.split(".")[1]?.slice(0,accuracy)
+        const result = accuracy == 0 ? Number(`${beforeDot}`) : Number(`${beforeDot}.${afterDot}`)
+        return result
+      } else if (target.split(".")[1].length < accuracy) {
+        return Number(Number(num).toFixed(Math.abs(accuracy)))
+      } else {
+        return  Number(num)
+      }
+    }
+  }
+  return ''
+}
+
+export { checkQuantityAccuracy, precisionQuantity }

package/src/utils/enumConfig.ts

@@ -1,12 +1,12 @@
-export default {
-  // 浏览器缓存信息
-  BROWSER_CACHE: {
-    COLUMN_CONDITION: 'columnCondition', //表格列信息缓存
-    MAIN_AUTH_CODES: 'menuAuth_mainProject', //按钮资源权限集合
-    LIMIT_MENU_DATA: 'limitedMenuData', //权限过滤后的菜单数据
-    USER_INFO: 'userInfo', //用户信息
-    DICT_CODES: 'dicData', //数据字典数据
-    CHILD_APP_BACK: 'child_app_back', //标记子应用goback事件
-    SEARCH_FIELDS_CONDITION: 'searchFieldsCondition', //表格搜索项信息缓存
-  }
+export default {
+  // 浏览器缓存信息
+  BROWSER_CACHE: {
+    COLUMN_CONDITION: 'columnCondition', //表格列信息缓存
+    MAIN_AUTH_CODES: 'menuAuth_mainProject', //按钮资源权限集合
+    LIMIT_MENU_DATA: 'limitedMenuData', //权限过滤后的菜单数据
+    USER_INFO: 'userInfo', //用户信息
+    DICT_CODES: 'dicData', //数据字典数据
+    CHILD_APP_BACK: 'child_app_back', //标记子应用goback事件
+    SEARCH_FIELDS_CONDITION: 'searchFieldsCondition', //表格搜索项信息缓存
+  }
 }

package/src/utils/getFormMode.js

@@ -1,12 +1,12 @@
-const getFormMode = props => {
-  let mode = 'create';
-  const { path } = props.match;
-  if (path.includes('edit')) {
-    mode = 'edit';
-  } else if (path.includes('view') || path.includes('detail')) {
-    mode = 'view';
-  }
-  return mode;
-};
-
-export default getFormMode;
+const getFormMode = props => {
+  let mode = 'create';
+  const { path } = props.match;
+  if (path.includes('edit')) {
+    mode = 'edit';
+  } else if (path.includes('view') || path.includes('detail')) {
+    mode = 'view';
+  }
+  return mode;
+};
+
+export default getFormMode;

package/src/utils/index.ts

@@ -1,4 +1,4 @@
-import './requestUtils';
-import './checkUtils';
-import './LocalstorageUtils';
-import './utils';
+import './requestUtils';
+import './checkUtils';
+import './LocalstorageUtils';
+import './utils';

package/src/utils/requestUtils.ts

@@ -1,34 +1,42 @@
-import axios from 'axios';
-import ENUM from './enumConfig';
-import { getCurrentTenantId, getEmployeeId, getSessionId, getAccountId } 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()
-  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, 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
+})

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 + ')');
+};