@yeeyoon/library 2.9.8 → 3.0.3

package/lib/components/Header/components/ProductListMenu/index.jsx

@@ -22,16 +22,7 @@ const ProductListMenu = (props) => {
 		let _link = document.createElement('a');
 		let link = document.body.appendChild(_link);
 		link.setAttribute('target', '_blank');
-		if (item.code == 200000729) {
-			link.setAttribute(
-				'href',
-				`${getCollabRedirectUrl()}?token=${ls.get(
-					'X-Auth-Token'
-				)}&tenantId=${tenantId}`
-			);
-			link.click();
-			return;
-		} else if (item.platforms.length > 1) {
+		if (item.platforms.length > 1) {
 			setPlatModal(true);
 			setPlatforms(item.platforms);
 		} else if (item.platforms.length == 1) {

package/lib/components/Header/index.jsx

@@ -60,6 +60,7 @@ const Header = (props) => {
 		avatar,
 		userName,
 		slot = <></>,
+		handleException,
 	} = props;
 	const [platforms, setPlatforms] = useState([]);
 	const [userInfo, setUserInfo] = useState(null);
@@ -151,6 +152,11 @@ const Header = (props) => {
 		const { success, data } = resp;
 		if (success) {
 			const { platforms, tenants, id, name } = data;
+			if (!platforms.length || !tenants.length) {
+				handleException && handleException();
+				return;
+			}
+
 			ls.set('X-Auth-Username', name);
 			ls.set('X-Auth-Userid', id);
 			// if (platforms.filter((item) => item.id === CY_PLATFORM_ID).length) {
@@ -177,6 +183,9 @@ const Header = (props) => {
 			allProduct = data;
 			leftProduct = _xorBy(allProduct, currentProduct, 'id');
 		}
+		if (!data.filter((item) => item.code === 200000728).length) {
+			handleException && handleException();
+		}
 	};
 
 	const doLogout = async (userId) => {
@@ -339,6 +348,7 @@ Header.propTypes = {
 	avatar: PropTypes.string,
 	userName: PropTypes.string,
 	slot: PropTypes.node,
+	handleException: PropTypes.func,
 };
 
 export default Header;

package/lib/utils/request.js

@@ -4,6 +4,8 @@ import qs from 'qs';
 import ls from 'local-storage';
 import { notification } from 'antd';
 
+import { HOST_IAM } from '../config/env';
+
 const TOKEN_KEY = 'X-Auth-Token';
 const ID_KEY = 'X-Auth-Id';
 const REST_KEY = 'Login-Rest-Info';
@@ -40,6 +42,11 @@ rest && ls.set(REST_KEY, JSON.stringify(rest));
 // };
 /** 异常处理程序 */
 
+const backToIam = () => {
+	const { origin, pathname } = window.location;
+	window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
+};
+
 const errorHandler = (error) => {
 	const { response } = error;
 
@@ -89,6 +96,9 @@ request.interceptors.response.use(async (response) => {
 			m === 'token不一致'
 		) {
 			window.top.postMessage('tcTokenExpired', '*'); // 通知宿主窗口
+			setTimeout(() => {
+				backToIam();
+			}, 1000);
 		}
 		return resp;
 	} else if (success && (!code || code === 200)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeeyoon/library",
-  "version": "2.9.8",
+  "version": "3.0.3",
   "description": "宜云前端组件库和通用服务",
   "main": "index.js",
   "repository": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@ant-design/pro-layout": "^6.26.0",
     "@ant-design/pro-list": "^1.12.0",
-    "antd": "^4.17.3",
+    "antd": "^4.10.0",
     "dva": "^2.6.0-beta.6",
     "local-storage": "^2.0.0",
     "lodash": "^4.17.21",

package/src/pages/index.js

@@ -1,27 +1,7 @@
-import React, { useEffect } from 'react';
-import { notification } from 'antd';
+import React from 'react';
 import Header from '../../lib/components/Header/';
-import TenantSelector from '../../lib/components/TenantSelector/';
-import CustomDefaultFooter from '../../lib/components/DefaultFooter/';
-import PageLoading from '../../lib/components/PageLoading/';
-// import ModifyPassword from '../../lib/components/ModifyPassword/';
 
 // eslint-disable-next-line react/display-name
 export default function () {
-	useEffect(() => {
-		notification.config({ maxCount: 1 });
-		notification.error({ message: '测试信息' });
-	}, []);
-	return (
-		<>
-			<Header productName="profile" slot={<div>nasa</div>} />
-			{/* <TenantSelector
-				tenantId="14bfb5d71d1011eca9820c42a1f6bf88"
-				tenantIdChangeCb={(id) => console.log(id)}
-			/> */}
-			{/* <CustomDefaultFooter /> */}
-			{/* <PageLoading /> */}
-			{/* {<ModifyPassword />} */}
-		</>
-	);
+	return <Header productName="bpm" slot={<div>nasa</div>} />;
 }