@yeeyoon/library 2.1.1 → 2.1.5

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

@@ -6,13 +6,13 @@ import { fetchSystemToken } from '../../service';
 import ls from 'local-storage';
 
 const PlatformModal = (props) => {
-	const { platforms, redirectUrl } = props;
+	const { platforms, redirectUrl, tenantId } = props;
 	const enterProductDetail = (plat) => {
 		if (plat.code == '20210811003') {
 			window.open(
 				`${plat.forwardDomainName}?token=${ls.get(
 					'X-Auth-Token'
-				)}&userId=${ls.get('X-Auth-Id')}`
+				)}&userId=${ls.get('X-Auth-Id')}&tenantId=${tenantId}`
 			);
 		} else {
 			getSystemToken(plat);
@@ -24,12 +24,14 @@ const PlatformModal = (props) => {
 		if (success) {
 			const { token, ...rest } = data;
 			if (redirectUrl) {
-				window.open(`${redirectUrl}?token=${token}&userId=${rest.userId}`);
+				window.open(
+					`${redirectUrl}?token=${token}&userId=${rest.userId}&tenantId=${tenantId}`
+				);
 			} else if (plat.forwardDomainName) {
 				window.open(
 					`${plat.forwardDomainName}?token=${token}&userInfo=${JSON.stringify(
 						rest
-					)}`
+					)}&tenantId=${tenantId}`
 				);
 			} else {
 				message.error('该系统尚未开发，敬请期待');
@@ -71,6 +73,7 @@ const PlatformModal = (props) => {
 PlatformModal.propTypes = {
 	platforms: PropTypes.array,
 	redirectUrl: PropTypes.string,
+	tenantId: PropTypes.string,
 };
 
 export default PlatformModal;

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

@@ -11,13 +11,17 @@ import { fetchSystemToken } from '../../service';
 const { SubMenu } = Menu;
 
 const ProductListMenu = (props) => {
-	const { productList, recommendProductList } = props;
+	const { productList, recommendProductList, tenantId } = props;
 	const [openKeys] = useState(['sub1', 'sub2']);
 	const [platModal, setPlatModal] = useState(false);
 	const [platforms, setPlatforms] = useState([]);
 	const enterDetail = (item) => {
 		if (item.code == 200000729) {
-			window.open(`${getCollabRedirectUrl()}?token=${ls.get('X-Auth-Token')}`);
+			window.open(
+				`${getCollabRedirectUrl()}?token=${ls.get(
+					'X-Auth-Token'
+				)}&tenantId=${tenantId}`
+			);
 		} else if (item.platforms?.length > 1) {
 			setPlatModal(true);
 			setPlatforms(item.platforms);
@@ -30,7 +34,9 @@ const ProductListMenu = (props) => {
 		const { success, data } = resp;
 		if (success) {
 			const { token, ...rest } = data;
-			window.open(`${item.forwardDomainName}?token=${token}&userInfo=${rest}`);
+			window.open(
+				`${item.forwardDomainName}?token=${token}&userInfo=${rest}&tenantId=${tenantId}`
+			);
 		}
 	};
 	return (
@@ -91,7 +97,7 @@ const ProductListMenu = (props) => {
 				footer={null}
 				onCancel={() => setPlatModal(false)}
 			>
-				<PlatformModal platforms={platforms} />
+				<PlatformModal platforms={platforms} tenantId={tenantId} />
 			</Modal>
 		</div>
 	);
@@ -100,6 +106,7 @@ const ProductListMenu = (props) => {
 ProductListMenu.propTypes = {
 	productList: PropTypes.array,
 	recommendProductList: PropTypes.array,
+	tenantId: PropTypes.string,
 };
 
 export default ProductListMenu;

package/lib/components/Header/index.jsx

@@ -42,7 +42,13 @@ let leftProduct = [];
 const CY_PLATFORM_ID = 'f12a71b6063611ecb0c00c42a1ff8370';
 
 const Header = (props) => {
-	const { token, tenantId = '', productName = 'profile' } = props;
+	const {
+		token,
+		tenantId = '',
+		productName = 'profile',
+		avatar,
+		userName,
+	} = props;
 	const [platforms, setPlatforms] = useState([]);
 	const [userInfo, setUserInfo] = useState(null);
 	const [systemUserInfo, setSystemUserInfo] = useState(null);
@@ -98,6 +104,10 @@ const Header = (props) => {
 		}
 	}, [tenantId]);
 
+	useEffect(() => {
+		setAvatarProps({ src: avatar });
+	}, [avatar]);
+
 	const backToIam = () => {
 		const { origin, pathname } = window.location;
 		window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
@@ -244,7 +254,7 @@ const Header = (props) => {
 					{userInfo && (
 						<>
 							<span className={styles['comp-header__user-name']}>
-								{userInfo.name}
+								{userName || userInfo.name}
 							</span>
 							<Dropdown overlay={menu} placement="bottomRight">
 								<Avatar {...avatarProps} />
@@ -267,6 +277,7 @@ const Header = (props) => {
 				<ProductListMenu
 					productList={currentProduct}
 					recommendProductList={leftProduct}
+					tenantId={tenantId}
 				/>
 			</Drawer>
 			<Modal
@@ -297,6 +308,8 @@ Header.propTypes = {
 	token: PropTypes.string.isRequired,
 	tenantId: PropTypes.string,
 	productName: PropTypes.string,
+	avatar: PropTypes.string,
+	userName: PropTypes.string,
 };
 
 export default Header;

package/lib/components/TenantSelector/index.jsx

@@ -0,0 +1,55 @@
+import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { Select } from 'antd';
+
+import { fetchUserInfo } from './service';
+
+const { Option } = Select;
+
+const TenantSelector = (props) => {
+	const { tenantId, tenantIdChangeCb } = props;
+	const [tenantList, setTenantList] = useState([]);
+	const [currentTenantId, setCurrentTenantId] = useState('');
+
+	useEffect(async () => {
+		const resp = await fetchUserInfo();
+		const { data, success } = resp;
+		if (success) {
+			const { tenants } = data;
+			const id = tenantId || tenants[0].id;
+			setTenantList(tenants);
+			setCurrentTenantId(id);
+			tenantIdChangeCb(id);
+		}
+	}, []);
+
+	return (
+		<Select
+			bordered={false}
+			// size="large"
+			value={currentTenantId}
+			style={{ width: '200px' }}
+			onChange={(value) => {
+				setCurrentTenantId(value);
+				if (tenantIdChangeCb) {
+					tenantIdChangeCb(value);
+				}
+			}}
+		>
+			{tenantList.map((item) => {
+				return (
+					<Option value={item.id} key={item.id}>
+						{item.name}
+					</Option>
+				);
+			})}
+		</Select>
+	);
+};
+
+TenantSelector.propTypes = {
+	tenantId: PropTypes.string,
+	tenantIdChangeCb: PropTypes.func,
+};
+
+export default TenantSelector;

package/lib/components/TenantSelector/service.js

@@ -0,0 +1,11 @@
+import request from '../../utils/request';
+import { API_IAM } from '../../config/env';
+
+// 获取用户信息
+export async function fetchUserInfo() {
+	return request('/findOidcUser', {
+		prefix: `${API_IAM}/api/oidc/v1/oidcuser`,
+		method: 'post',
+		data: {},
+	});
+}

package/lib/styles/design-system-overwrite.less

@@ -321,6 +321,9 @@ body {
 			.ant-select-item-option-content {
 				color: @white;
 			}
+			&:hover {
+				background: @primary-color;
+			}
 		}
 		&.ant-select-item-option-selected {
 			.anticon {

package/lib/utils/request.js

@@ -8,11 +8,11 @@ const TOKEN_KEY = 'X-Auth-Token';
 const ID_KEY = 'X-Auth-Id';
 const REST_KEY = 'Login-Rest-Info';
 const qsData = qs.parse(window.location.search.slice(1));
-const { token, userId, rest } = qsData;
+const { token, userId, ...rest } = qsData;
 
 token && ls.set(TOKEN_KEY, token);
 userId && ls.set(ID_KEY, userId);
-rest && ls.set(REST_KEY, rest);
+rest && ls.set(REST_KEY, JSON.stringify(rest));
 
 // const codeMessage = {
 // 	200: '服务器成功返回请求的数据。',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeeyoon/library",
-  "version": "2.1.1",
+  "version": "2.1.5",
   "description": "宜云前端组件库和通用服务",
   "main": "index.js",
   "repository": {
@@ -13,7 +13,7 @@
   "author": "wangmeng",
   "license": "ISC",
   "scripts": {
-    "start": "REACT_APP_ENV=dev umi dev",
+    "start": "umi dev",
     "build": "umi build",
     "test": "umi test",
     "lint": "eslint {src,mock,tests}/**/*.{js,jsx} --fix",

package/src/pages/index.js

@@ -1,14 +1,20 @@
 import React from 'react';
-import PageLoading from '../../lib/components/PageLoading/';
+import Header from '../../lib/components/Header/';
+import TenantSelector from '../../lib/components/TenantSelector/';
 
 // eslint-disable-next-line react/display-name
 export default function () {
 	return (
 		// <Header
 		// 	productName="collab"
-		// 	// tenantId={tenantId}
-		// 	token="NjIzOWMwMjhkMTM5NDRlZjliZWIzZWMxNTljOGJhMTU1MjE2MzIzNzM2OTcyMDQ="
+		// 	tenantId="053a033a063711ecb0c00c42a1ff8370"
+		// 	token="YTI4ZjUwN2FjYjY0NGQ2NWE0NDZhMzdkN2M2NzRhMWY1NjE2MzI0NjQ5MzQzNjg="
+		// 	avatar="https://demo-yeeyoon-fm.oss-cn-zhangjiakou.aliyuncs.com/userCenter/userAvatar/user_avatar2.png"
+		// 	userName="王甍"
 		// />
-		<PageLoading />
+		<TenantSelector
+			tenantId="14bfb5d71d1011eca9820c42a1f6bf88"
+			tenantIdChangeCb={(id) => console.log(id)}
+		/>
 	);
 }