@yeeyoon/library 2.0.4 → 2.0.6

package/.umirc.js

@@ -1,5 +1,7 @@
 
 // ref: https://umijs.org/config/
+const { REACT_APP_ENV } = process.env;
+
 export default {
   treeShaking: true,
   routes: [
@@ -19,7 +21,7 @@ export default {
       dynamicImport: false,
       title: 'yeeyoon.library',
       dll: false,
-      
+
       routes: {
         exclude: [
           /models\//,
@@ -31,4 +33,7 @@ export default {
       },
     }],
   ],
+	define: {
+		REACT_APP_ENV: REACT_APP_ENV || false,
+	},
 }

package/lib/components/Header/index.jsx

@@ -6,9 +6,9 @@ import {
 	BarsOutlined,
 	FundProjectionScreenOutlined,
 	UserOutlined,
-	MoreOutlined,
 	SettingOutlined,
 	PoweroffOutlined,
+	AppstoreOutlined,
 } from '@ant-design/icons';
 import Notification from '../Notification/recent';
 import ProductListMenu from './components/ProductListMenu/';
@@ -21,10 +21,13 @@ import {
 	logout,
 } from './service';
 import {
-	getProfileRedirectUrl,
-	getIamRedirectUrl,
-	getOfficialSiteRedirectUrl,
-} from './env';
+	HOST_OFFICIAL,
+	HOST_IAM,
+	HOST_PROFILE_TASK,
+	HOST_PROFILE_DASH_BOARD,
+	HOST_PROFILE_USER,
+	HOST_PROFILE_PASSWORD,
+} from '../../config/env';
 
 import LogoProfile from './assets/profile.svg';
 import LogoCollab from './assets/collab.svg';
@@ -50,13 +53,11 @@ const Header = (props) => {
 	const [redirectUrl, setRedirectUrl] = useState('');
 
 	const menu = (
-		<Menu style={{ minWidth: '200px' }}>
+		<Menu>
 			<Menu.Item
 				icon={<UserOutlined />}
 				onClick={() => {
-					window.location.href = `${getProfileRedirectUrl(
-						'user-profile/profile/1'
-					)}?token=${token}`;
+					window.location.href = `${HOST_PROFILE_USER}?token=${token}`;
 				}}
 			>
 				个人中心
@@ -64,9 +65,7 @@ const Header = (props) => {
 			<Menu.Item
 				icon={<SettingOutlined />}
 				onClick={() => {
-					window.location.href = `${getProfileRedirectUrl(
-						'user-profile/profile/2'
-					)}?token=${token}`;
+					window.location.href = `${HOST_PROFILE_PASSWORD}?token=${token}`;
 				}}
 			>
 				修改密码
@@ -100,7 +99,7 @@ const Header = (props) => {
 
 	const backToIam = () => {
 		const { origin, pathname } = window.location;
-		window.location.href = `${getIamRedirectUrl()}?redirect=${origin}${pathname}`;
+		window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
 	};
 
 	const getCySystemToken = async () => {
@@ -176,8 +175,8 @@ const Header = (props) => {
 			<div className={styles['comp-header']}>
 				<div className={styles['comp-header__left-content']}>
 					<Tooltip title="更多产品">
-						<MoreOutlined
-							style={{ fontSize: '24px', cursor: 'pointer' }}
+						<AppstoreOutlined
+							style={{ fontSize: '28px', cursor: 'pointer' }}
 							onClick={() => {
 								setProductListMenuDrawerShow(true);
 							}}
@@ -186,7 +185,11 @@ const Header = (props) => {
 					<span
 						className={styles['comp-header__logo']}
 						onClick={() => {
-							getOfficialSiteRedirectUrl();
+							if (productName === 'profile') {
+								window.location.href = HOST_OFFICIAL;
+							} else {
+								window.location.reload();
+							}
 						}}
 					>
 						<img
@@ -211,10 +214,7 @@ const Header = (props) => {
 						<BarsOutlined
 							style={{ fontSize: '20px', color: 'rgba(0, 0, 0, .85)' }}
 							onClick={() => {
-								// window.location.href = `${getProfileRedirectUrl(
-								// 	'task-center/home/list'
-								// )}?token=${subToken}`;
-								setRedirectUrl(getProfileRedirectUrl('task-center/home/list'));
+								setRedirectUrl(HOST_PROFILE_TASK);
 								setPlatformsModalShow(true);
 							}}
 						/>
@@ -233,9 +233,7 @@ const Header = (props) => {
 						<FundProjectionScreenOutlined
 							style={{ fontSize: '20px', color: 'rgba(0, 0, 0, .85)' }}
 							onClick={() => {
-								window.location.href = `${getProfileRedirectUrl(
-									'user-profile'
-								)}?token=${token}`;
+								window.location.href = `${HOST_PROFILE_DASH_BOARD}?token=${token}`;
 							}}
 						/>
 					</Tooltip>
@@ -249,7 +247,7 @@ const Header = (props) => {
 							</Dropdown>
 						</>
 					)}
-					{!userInfo && <a href={getIamRedirectUrl()}>去登录</a>}
+					{!userInfo && <a href={HOST_IAM}>去登录</a>}
 				</div>
 			</div>
 			<Drawer

package/lib/components/Header/service.js

@@ -1,10 +1,10 @@
 import request from '../../utils/request';
-import { getIamApiHost } from './env';
+import { API_IAM } from '../../config/env';
 
 // 换子系统token
 export async function fetchSystemToken(params) {
 	return request('/getSystemToken', {
-		prefix: `${getIamApiHost()}/api/oidc/v1/user`,
+		prefix: `${API_IAM}/api/oidc/v1/user`,
 		method: 'post',
 		data: params,
 	});
@@ -13,7 +13,7 @@ export async function fetchSystemToken(params) {
 // 获取用户信息
 export async function fetchUserInfo() {
 	return request('/findOidcUser', {
-		prefix: `${getIamApiHost()}/api/oidc/v1/oidcuser`,
+		prefix: `${API_IAM}/api/oidc/v1/oidcuser`,
 		method: 'post',
 		data: {},
 	});
@@ -22,7 +22,7 @@ export async function fetchUserInfo() {
 // 获取用户产品列表
 export async function fetchProductList(params) {
 	return request('/findOidcApplicationList', {
-		prefix: `${getIamApiHost()}/api/oidc/v1/oidcapplication`,
+		prefix: `${API_IAM}/api/oidc/v1/oidcapplication`,
 		method: 'post',
 		data: params,
 	});
@@ -31,7 +31,7 @@ export async function fetchProductList(params) {
 // 登出
 export async function logout(params) {
 	return request('/loginOut', {
-		prefix: `${getIamApiHost()}/api/oidc/v1/user`,
+		prefix: `${API_IAM}/api/oidc/v1/user`,
 		method: 'post',
 		data: params,
 	});

package/lib/config/env.js

@@ -1,3 +1,5 @@
+const REACT_APP_ENV = REACT_APP_ENV || 'testing';
+
 const envApi = {
 	// IAM
 	iam: {
@@ -19,11 +21,15 @@ const envApi = {
 	zhongtai_xlt: {},
 
 	// Profile
-	profile: {},
-	// 任务中心
-	profile_task: {},
-	// 消息中心
-	profile_message: {},
+	profile_cy: {
+		testing: 'testing-api',
+		demo: 'demo-api',
+		staging: 'staging-api',
+		prod: 'api',
+	},
+	profile_xlt: {
+		prod: 'xlt-api',
+	},
 
 	// 协同
 	collab: {},
@@ -59,15 +65,40 @@ function getEnvHost(product, path = '') {
 	return `${prefix}${REACT_APP_ENV}${product}${suffix}${path}`;
 }
 
-function getEnvApi(product) {
+function getEnvApi(product, path = '') {
 	const env = REACT_APP_ENV === 'dev' ? 'testing' : REACT_APP_ENV;
 	const api = envApi[product][env];
-	return `https://${api}.yeeyoon.com`;
+	return `https://${api}.yeeyoon.com${path}`;
 }
 
 // HOST
 export const HOST_OFFICIAL = getEnvHost('official');
+export const HOST_IAM = getEnvHost('iam', '/login');
+export const HOST_COLLAB = getEnvHost('collab');
+export const HOST_BPM = getEnvHost('bpm');
+export const HOST_PROFILE_TASK = getEnvHost(
+	'profile',
+	'/task-center/home/list'
+);
+export const HOST_PROFILE_DASH_BOARD = getEnvHost(
+	'profile',
+	'/user-profile/home'
+);
+export const HOST_PROFILE_USER = getEnvHost(
+	'profile',
+	'/user-profile/profile/1'
+);
+export const HOST_PROFILE_PASSWORD = getEnvHost(
+	'profile',
+	'/user-profile/profile/2'
+);
+export const HOST_PROFILE_MESSAGE = getEnvHost(
+	'profile',
+	'/message-center/home/list'
+);
 
 // API
 export const API_IAM = getEnvApi('iam');
 export const API_ZHONGTAI_CY = getEnvApi('zhongtai_cy');
+export const API_PROFILE_TASK_CY = getEnvApi('profile_cy', '/task');
+export const API_PROFILE_TASK_XLT = getEnvApi('profile_xlt', '/task');

package/package.json

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

package/src/pages/index.js

@@ -5,10 +5,16 @@ import Header from '../../lib/components/Header/';
 export default function () {
 	const [tenantId, setTenantId] = useState('');
 	useEffect(() => {
-		setTimeout(() => {
-			setTenantId('053a033a063711ecb0c00c42a1ff8370');
-			// setTenantId('f12a71b6063611ecb0c00c42a1ff8370');
-		}, 3000);
+		// setTimeout(() => {
+		// 	setTenantId('053a033a063711ecb0c00c42a1ff8370');
+		// 	// setTenantId('f12a71b6063611ecb0c00c42a1ff8370');
+		// }, 3000);
 	}, []);
-	return <Header productName="bpm" tenantId={tenantId} />;
+	return (
+		<Header
+			productName="collab"
+			// tenantId={tenantId}
+			token="NjIzOWMwMjhkMTM5NDRlZjliZWIzZWMxNTljOGJhMTU1MjE2MzIzNzM2OTcyMDQ="
+		/>
+	);
 }