@yeeyoon/library 1.8.7 → 1.8.11

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import { Menu, Image, Modal } from 'antd';
 import { AppstoreOutlined } from '@ant-design/icons';
 import PropTypes from 'prop-types';
@@ -6,6 +6,7 @@ import PlatformModal from '../PlatformModal';
 import { getCollabRedirectUrl } from '../../env';
 import ls from 'local-storage';
 import styles from './index.less';
+import { fetchSystemToken } from '../../service';
 
 const { SubMenu } = Menu;
 
@@ -14,39 +15,30 @@ const ProductListMenu = (props) => {
 	const [openKeys] = useState(['sub1', 'sub2']);
 	const [platModal, setPlatModal] = useState(false);
 	const [platforms, setPlatforms] = useState([]);
-	const [newProductList, setNewProductList] = useState([]);
-	useEffect(() => {
-		setNewProductList([
-			{
-				code: 200000729,
-				description: '团队协作，任务分配一站式敏捷开发',
-				domainName: null,
-				icon:
-					'https://demo-yeeyoon-fm.oss-cn-zhangjiakou.aliyuncs.com/userCenter/productLogo/yiyunxietong.png',
-				id: '9f4f6e1a063711ecb0c00c42a1ff8370',
-				isClose: 0,
-				level: 1,
-				name: '宜云协同',
-				parentId: null,
-				tenants: null,
-			},
-			...productList,
-		]);
-	}, [productList]);
 	const enterDetail = (item) => {
 		if (item.code == 200000729) {
 			window.open(`${getCollabRedirectUrl()}?token=${ls.get('X-Auth-Token')}`);
-		} else {
+		} else if (item.platforms?.length > 1) {
 			setPlatModal(true);
 			setPlatforms(item.platforms);
+		} else if (item.platforms?.length == 1) {
+			getSystemToken(item.platforms[0]);
+		}
+	};
+	const getSystemToken = async (item) => {
+		const resp = await fetchSystemToken({ platformId: item.id });
+		const { success, data } = resp;
+		if (success) {
+			const { token, ...rest } = data;
+			window.open(`${item.forwardDomainName}?token=${token}&userInfo=${rest}`);
 		}
 	};
 	return (
 		<div className={styles['product-menu']}>
 			<Menu mode="inline" openKeys={openKeys} style={{ width: 256 }}>
 				<SubMenu key="sub1" icon={<AppstoreOutlined />} title="我的产品">
-					{newProductList.length ? (
-						newProductList.map((item) => {
+					{productList.length ? (
+						productList.map((item) => {
 							return (
 								<Menu.Item key={item.code} onClick={() => enterDetail(item)}>
 									<div style={{ display: 'flex', alignItems: 'center' }}>

package/lib/components/Header/env.js

@@ -69,21 +69,29 @@ export function getProfileRedirectUrl(path) {
 	}
 }
 
-export function getOfficialSiteRedirectUrl(sysName) {
-	if (sysName !== 'profile') return;
+export function getOfficialSiteRedirectUrl() {
 	let url;
 	switch (host) {
+		case 'localhost:8000':
 		case 'localhost:8003':
+		case 'localhost:8009':
+		case 'localhost:8010':
 		case 'testing-profile.yeeyoon.com':
+		case 'testing-collab.yeeyoon.com':
+		case 'testing-bpm.yeeyoon.com':
 			url = `https://testing.yeeyoon.com`;
 			break;
 		case 'demo-profile.yeeyoon.com':
 			url = `https://demonstration.yeeyoon.com`;
 			break;
 		case 'staging-profile.yeeyoon.com':
+		case 'staging-collab.yeeyoon.com':
+		case 'staging-bpm.yeeyoon.com':
 			url = `https://staging.yeeyoon.com`;
 			break;
 		case 'profile.yeeyoon.com':
+		case 'collab.yeeyoon.com':
+		case 'bpm.yeeyoon.com':
 		default:
 			url = `https://yeeyoon.com`;
 			break;

package/lib/components/Header/index.jsx

@@ -99,9 +99,8 @@ const Header = (props) => {
 	}, [tenantId]);
 
 	const backToIam = () => {
-		window.location.href = `${getIamRedirectUrl()}?redirect=${
-			window.location.origin
-		}`;
+		const { origin, pathname } = window.location;
+		window.location.href = `${getIamRedirectUrl()}?redirect=${origin}${pathname}`;
 	};
 
 	const getCySystemToken = async () => {
@@ -184,25 +183,28 @@ const Header = (props) => {
 							}}
 						/>
 					</Tooltip>
-					<img
-						src={getSysBrandConfig().logo}
+					<span
 						className={styles['comp-header__logo']}
-						style={{ height: productName !== 'profile' ? '40px' : '32px' }}
 						onClick={() => {
 							getOfficialSiteRedirectUrl();
 						}}
-					/>
-					{productName !== 'profile' && (
-						<span
-							style={{
-								color: 'rgba(0, 0, 0, .85)',
-								fontSize: '24px',
-								marginLeft: '5px',
-							}}
-						>
-							{getSysBrandConfig().name}
-						</span>
-					)}
+					>
+						<img
+							src={getSysBrandConfig().logo}
+							style={{ height: productName !== 'profile' ? '40px' : '32px' }}
+						/>
+						{productName !== 'profile' && (
+							<span
+								style={{
+									color: 'rgba(0, 0, 0, .85)',
+									fontSize: '24px',
+									marginLeft: '5px',
+								}}
+							>
+								{getSysBrandConfig().name}
+							</span>
+						)}
+					</span>
 				</div>
 				<div className={styles['comp-header__right-content']}>
 					<Tooltip title="任务中心" className={styles['comp-header__icon']}>

package/lib/components/Header/index.less

@@ -9,6 +9,9 @@
 	border-radius: 5px;
 	&__logo {
 		margin-left: 10px;
+		cursor: pointer;
+		display: flex;
+		align-items: center;
 	}
 	&__logo__name {
 		font-size: 24px;

package/package.json

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