@yeeyoon/library 3.5.1 → 3.5.4

package/lib/components/Header/index.jsx

@@ -12,7 +12,13 @@ import {
 import ProductListMenu from './components/ProductListMenu/';
 import PlatformModal from './components/PlatformModal/';
 
-import { IconTodo, IconConsole, IconMore, IconQunZuGuanLi } from '../Icons/';
+import {
+	IconTodo,
+	IconConsole,
+	IconMore,
+	IconQunZuGuanLi,
+	IconVersion,
+} from '../Icons/';
 
 import {
 	fetchSystemToken,
@@ -28,6 +34,8 @@ import {
 	HOST_PROFILE_USER,
 	HOST_PROFILE_PASSWORD,
 	HOST_PROFILE_GROUP,
+	HOST_HUASHAN_LOGIN,
+	HOST_HUASHAN_BPM,
 } from '../../config/env';
 
 import LogoProfile from './assets/profile.svg';
@@ -134,7 +142,11 @@ const Header = (props) => {
 
 	const backToIam = () => {
 		const { origin, pathname } = window.location;
-		window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
+		if (origin.indexOf(HOST_HUASHAN_BPM) > -1) {
+			window.location.href = HOST_HUASHAN_LOGIN;
+		} else {
+			window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
+		}
 	};
 
 	// eslint-disable-next-line no-unused-vars
@@ -219,7 +231,7 @@ const Header = (props) => {
 			case 'bpm-share':
 				return {
 					logo: LogoBpm,
-					name: '周转物资系统管理平台',
+					name: '周转物资协同管理平台',
 				};
 			case 'mms':
 				return {
@@ -292,6 +304,26 @@ const Header = (props) => {
 						<IconTodo style={IconStyle} />
 						任务中心
 					</span>
+					{(productName === 'bpm' || productName === 'mms') && (
+						<span
+							className={styles['comp-header__icon']}
+							onClick={() => {
+								let system = '';
+								switch (productName) {
+									case 'bpm':
+										system = 'bpm';
+										break;
+									case 'mms':
+										system = 'wms';
+										break;
+								}
+								window.location.href = `${HOST_OFFICIAL}/version?system=${system}&token=${token}`;
+							}}
+						>
+							<IconVersion style={IconStyle} />
+							版本中心
+						</span>
+					)}
 					{/* {systemUserInfo && (
 						<Notification
 							customStyles={{

package/lib/components/Icons/index.jsx

@@ -7,6 +7,7 @@ const Icons = createFromIconfontCN({
 		'//at.alicdn.com/t/font_2832661_kmrn4o901g.js', //宜云协同iconfont
 		'//at.alicdn.com/t/font_2832313_vjeg45f5qof.js',
 		'//at.alicdn.com/t/font_2965204_9g0wekoduag.js', //租户管理
+		'//at.alicdn.com/t/font_3133477_q292mp6e2u.js',
 	],
 });
 
@@ -34,6 +35,9 @@ const IconTuijianchanpin = (args) => {
 const IconQunZuGuanLi = (args) => {
 	return <Icons type="icon-qunzuguanli" {...args} />;
 };
+const IconVersion = (args) => {
+	return <Icons type="icon-tag" {...args} />;
+};
 
 export {
 	IconBell,
@@ -44,4 +48,5 @@ export {
 	IconWodechanpin,
 	IconTuijianchanpin,
 	IconQunZuGuanLi,
+	IconVersion,
 };

package/lib/config/env.js

@@ -91,6 +91,16 @@ function getEnvHost(product, path = '') {
 	}
 }
 
+function getHuashanEnvHost(isLogin = false) {
+	if (REACT_APP_ENV === 'prod') {
+		if (isLogin) return 'https://huashan-login.yeeyoon.com';
+		else return 'https://huashan.yeeyoon.com';
+	} else {
+		if (isLogin) return 'https://testing-huashan-login.yeeyoon.com';
+		else return 'https://testing-huashan.yeeyoon.com';
+	}
+}
+
 function getEnvApi(product, path = '') {
 	const env = REACT_APP_ENV === 'dev' ? 'testing' : REACT_APP_ENV;
 	const api = envApi[product][env];
@@ -128,6 +138,9 @@ export const HOST_PROFILE_GROUP = getEnvHost('profile', '/user-profile/group');
 export const HOST_ZHONGTAI_XLT = getEnvHost('zhongtai_cy');
 export const HOST_ZHONGTAI_CY = getEnvHost('zhongtai_xlt');
 
+export const HOST_HUASHAN_LOGIN = `${getHuashanEnvHost(true)}/login`;
+export const HOST_HUASHAN_BPM = getHuashanEnvHost();
+
 // API
 export const API_IAM = getEnvApi('iam');
 export const API_ZHONGTAI_CY = getEnvApi('zhongtai_cy');
@@ -149,6 +162,8 @@ console.log(
 	`HOST_PROFILE_MESSAGE: ${HOST_PROFILE_MESSAGE}\n`,
 	`HOST_ZHONGTAI_XLT: ${HOST_ZHONGTAI_XLT}\n`,
 	`HOST_ZHONGTAI_CY: ${HOST_ZHONGTAI_CY}\n`,
+	`HOST_HUASHAN_LOGIN: ${HOST_HUASHAN_LOGIN}\n`,
+	`HOST_HUASHAN_BPM: ${HOST_HUASHAN_BPM}\n`,
 	`------------------------------------\n`,
 	`API_IAM: ${API_IAM}\n`,
 	`API_ZHONGTAI_CY: ${API_ZHONGTAI_CY}\n`,

package/lib/utils/request.js

@@ -44,7 +44,11 @@ rest && ls.set(REST_KEY, JSON.stringify(rest));
 
 const backToIam = () => {
 	const { origin, pathname } = window.location;
-	window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
+	if (origin.indexOf('huashan') > -1) {
+		window.location.href = 'https://testing-huashan-login.yeeyoon.com/login';
+	} else {
+		window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
+	}
 };
 
 const errorHandler = (error) => {
@@ -78,36 +82,39 @@ const request = extend({
 	},
 });
 
-request.interceptors.response.use(async (response) => {
-	const resp = await response.clone().json();
-	const { data, code, message, msg, errormsg, success } = resp;
-	if (!data && !code && !message && !msg && !errormsg && !success) {
-		return response;
-	}
-	const m = msg || message || errormsg;
-	if (code !== 200 && code !== 201 && !success) {
-		m !== '操作过于频繁' &&
-			m.indexOf('存在重复的物资') < 0 &&
-			notification.error({
-				message: m,
-				maxCount: 1,
-			});
-		if (
-			code === 401 ||
-			code === 402 ||
-			m === 'token验证失败' ||
-			m === 'token不一致'
-		) {
-			window.top.postMessage('tcTokenExpired', '*'); // 通知宿主窗口
-			setTimeout(() => {
-				backToIam();
-			}, 1000);
+request.interceptors.response.use(
+	async (response) => {
+		const resp = await response.clone().json();
+		const { data, code, message, msg, errormsg, success } = resp;
+		if (!data && !code && !message && !msg && !errormsg && !success) {
+			return response;
 		}
-		return resp;
-	} else if (success && (!code || code === 200)) {
-		return resp;
-	}
-	return data;
-}, { global: false });
+		const m = msg || message || errormsg;
+		if (code !== 200 && code !== 201 && !success) {
+			m !== '操作过于频繁' &&
+				m.indexOf('存在重复的物资') < 0 &&
+				notification.error({
+					message: m,
+					maxCount: 1,
+				});
+			if (
+				code === 401 ||
+				code === 402 ||
+				m === 'token验证失败' ||
+				m === 'token不一致'
+			) {
+				window.top.postMessage('tcTokenExpired', '*'); // 通知宿主窗口
+				setTimeout(() => {
+					backToIam();
+				}, 1000);
+			}
+			return resp;
+		} else if (success && (!code || code === 200)) {
+			return resp;
+		}
+		return data;
+	},
+	{ global: false }
+);
 
 export default request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeeyoon/library",
-  "version": "3.5.1",
+  "version": "3.5.4",
   "description": "宜云前端组件库和通用服务",
   "main": "index.js",
   "repository": {

package/src/global.css

@@ -4,7 +4,7 @@ html, body, #root {
 
 body {
   margin: 0;
-	/* background-color: #000 !important; */
+	background-color: #000 !important;
 }
 
 body * {