@yeeyoon/library 2.4.4 → 2.4.9

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

@@ -1,12 +1,12 @@
 import React, { useState } from 'react';
 import { Menu, Image, Modal } from 'antd';
-import { AppstoreOutlined } from '@ant-design/icons';
 import PropTypes from 'prop-types';
 import PlatformModal from '../PlatformModal';
 import { getCollabRedirectUrl } from '../../env';
 import ls from 'local-storage';
 import styles from './index.less';
 import { fetchSystemToken } from '../../service';
+import { IconWodechanpin, IconTuijianchanpin } from '../../../Icons';
 
 const { SubMenu } = Menu;
 
@@ -54,7 +54,12 @@ const ProductListMenu = (props) => {
 	return (
 		<div className={styles['product-menu']}>
 			<Menu mode="inline" openKeys={openKeys} style={{ width: 256 }}>
-				<SubMenu key="sub1" icon={<AppstoreOutlined />} title="我的产品">
+				<SubMenu
+					key="sub1"
+					icon={<IconWodechanpin style={{ fontSize: '16px' }} />}
+					title="我的产品"
+					style={{ fontSize: '16px' }}
+				>
 					{productList.length ? (
 						productList.map((item) => {
 							return (
@@ -78,7 +83,11 @@ const ProductListMenu = (props) => {
 						<Menu.Item key={1}>暂无数据</Menu.Item>
 					)}
 				</SubMenu>
-				<SubMenu key="sub2" icon={<AppstoreOutlined />} title="推荐产品">
+				<SubMenu
+					key="sub2"
+					icon={<IconTuijianchanpin style={{ fontSize: '16px' }} />}
+					title="推荐产品"
+				>
 					{recommendProductList.length ? (
 						recommendProductList.map((item) => {
 							return (

package/lib/components/Header/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import _xorBy from 'lodash/xorBy';
+import ls from 'local-storage';
 import { Menu, Dropdown, Tooltip, Avatar, Drawer, Modal, Divider } from 'antd';
 import {
 	UserOutlined,
@@ -46,6 +47,9 @@ const IconStyle = {
 	display: 'inline-block',
 };
 
+const DEFAULT_AVATAR_URL =
+	'https://demo-yeeyoon-fm.oss-cn-zhangjiakou.aliyuncs.com/userCenter/userAvatar/user_avatar3.png';
+
 const Header = (props) => {
 	const {
 		token,
@@ -59,9 +63,8 @@ const Header = (props) => {
 	const [systemUserInfo, setSystemUserInfo] = useState(null);
 	const [tenants, setTenants] = useState([]);
 	const [userId, setUserId] = useState([]);
-	const [productListMenuDrawerShow, setProductListMenuDrawerShow] = useState(
-		false
-	);
+	const [productListMenuDrawerShow, setProductListMenuDrawerShow] =
+		useState(false);
 	const [platformsModalShow, setPlatformsModalShow] = useState(false);
 	const [avatarProps, setAvatarProps] = useState({});
 	const [redirectUrl, setRedirectUrl] = useState('');
@@ -134,7 +137,8 @@ const Header = (props) => {
 		const resp = await fetchUserInfo();
 		const { success, data } = resp;
 		if (success) {
-			const { platforms, tenants, id } = data;
+			const { platforms, tenants, id, name } = data;
+			ls.set('X-Auth-Username', name);
 			if (platforms.filter((item) => item.id === CY_PLATFORM_ID).length) {
 				getCySystemToken();
 			}
@@ -142,14 +146,7 @@ const Header = (props) => {
 			setPlatforms(platforms);
 			setTenants(tenants);
 			setUserId(id);
-			setAvatarProps(
-				data.headUrl
-					? { src: data.headUrl }
-					: {
-							src:
-								'https://demo-yeeyoon-fm.oss-cn-zhangjiakou.aliyuncs.com/userCenter/userAvatar/user_avatar3.png',
-					  }
-			);
+			setAvatarProps({ src: data.headUrl || DEFAULT_AVATAR_URL });
 			currentProduct = tenants[0].applications || [];
 			getProductList(id);
 		} else {

package/lib/components/Icons/index.jsx

@@ -2,7 +2,10 @@ import React from 'react';
 import { createFromIconfontCN } from '@ant-design/icons';
 
 const Icons = createFromIconfontCN({
-	scriptUrl: '//at.alicdn.com/t/font_2716486_dpnjwgvqpfn.js',
+	scriptUrl: [
+		'//at.alicdn.com/t/font_2716486_dpnjwgvqpfn.js',
+		'//at.alicdn.com/t/font_2832661_kmrn4o901g.js',
+	],
 });
 
 const IconBell = (args) => {
@@ -17,5 +20,18 @@ const IconConsole = (args) => {
 const IconMore = (args) => {
 	return <Icons type="icon-more" {...args} />;
 };
+const IconWodechanpin = (args) => {
+	return <Icons type="icon-icon_wodechanpin" {...args} />;
+};
+const IconTuijianchanpin = (args) => {
+	return <Icons type="icon-icon_tuijianchanpin" {...args} />;
+};
 
-export { IconBell, IconTodo, IconConsole, IconMore };
+export {
+	IconBell,
+	IconTodo,
+	IconConsole,
+	IconMore,
+	IconWodechanpin,
+	IconTuijianchanpin,
+};

package/lib/components/Notification/service.js

@@ -1,9 +1,11 @@
 import request from '../../utils/request';
-import { getApiHost } from './env';
+// import { getApiHost } from './env';
+import { API_ZHONGTAI_CY } from '../../config/env';
 
 export async function queryLatestMessageList(params, userInfo) {
 	let data = {
-		prefix: getApiHost(),
+		// prefix: getApiHost(),
+		prefix: API_ZHONGTAI_CY,
 		params,
 	};
 	if (userInfo) {

package/lib/components/TenantSelector/index.jsx

@@ -14,9 +14,14 @@ const TenantSelector = (props) => {
 	useEffect(async () => {
 		const resp = await fetchUserInfo();
 		const { data, success } = resp;
+		let id;
 		if (success) {
 			const { tenants } = data;
-			const id = tenantId || tenants[0].id;
+			if (tenants.filter((item) => item.id === tenantId).length) {
+				id = tenantId;
+			} else {
+				id = tenants[0].id;
+			}
 			setTenantList(tenants);
 			setCurrentTenantId(id);
 			tenantIdChangeCb(id);

package/lib/config/env.js

@@ -38,6 +38,21 @@ const envApi = {
 	bpm: {},
 };
 
+const envHost = {
+	zhongtai_cy: {
+		testing: 'testing-zhongtai',
+		demo: 'demo',
+		staging: 'uat',
+		prod: 'zhongtai',
+	},
+
+	zhongtai_xlt: {
+		testing: 'xlttest',
+		staging: 'staging-xlt',
+		prod: 'xlt',
+	},
+};
+
 const devHostPortMap = {
 	iam: 8001,
 	profile: 8003,
@@ -51,9 +66,13 @@ function getEnvHost(product, path = '') {
 	const prefix = 'https://';
 	const suffix = '.yeeyoon.com';
 	const devPort = devHostPortMap[product];
+	const env = REACT_APP_ENV === 'dev' ? 'testing' : REACT_APP_ENV;
 	if (REACT_APP_ENV === 'dev') {
 		return `http://localhost:${devPort}/${path}`;
 	}
+	if (product === 'zhongtai_cy' || product === 'zhongtai_xlt') {
+		return `${prefix}${envHost[product][env]}${suffix}`;
+	}
 	if (product === 'official' && REACT_APP_ENV === 'demo') {
 		return `${prefix}demonstration${suffix}`;
 	}
@@ -102,6 +121,8 @@ export const HOST_PROFILE_MESSAGE = getEnvHost(
 	'profile',
 	'/message-center/home/list'
 );
+export const HOST_ZHONGTAI_XLT = getEnvHost('zhongtai_cy');
+export const HOST_ZHONGTAI_CY = getEnvHost('zhongtai_xlt');
 
 // API
 export const API_IAM = getEnvApi('iam');
@@ -119,6 +140,8 @@ console.log(
 	`HOST_PROFILE_USER: ${HOST_PROFILE_USER}\n`,
 	`HOST_PROFILE_PASSWORD: ${HOST_PROFILE_PASSWORD}\n`,
 	`HOST_PROFILE_MESSAGE: ${HOST_PROFILE_MESSAGE}\n`,
+	`HOST_ZHONGTAI_XLT: ${HOST_ZHONGTAI_XLT}\n`,
+	`HOST_ZHONGTAI_CY: ${HOST_ZHONGTAI_CY}\n`,
 	`------------------------------------\n`,
 	`API_IAM: ${API_IAM}\n`,
 	`API_ZHONGTAI_CY: ${API_ZHONGTAI_CY}\n`,

package/package.json

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

package/src/pages/index.js

@@ -8,11 +8,7 @@ import PageLoading from '../../lib/components/PageLoading/';
 export default function () {
 	return (
 		<>
-			<Header
-				productName="profile"
-				tenantId="053a033a063711ecb0c00c42a1ff8370"
-				token="ZmI1YzU4NzEyOTdlNDM2MTg2YjI0N2IyZGQzOGI3NDg1NDE2MzI2MjU4NjMzNzY="
-			/>
+			<Header productName="profile" />
 			{/* <TenantSelector
 				tenantId="14bfb5d71d1011eca9820c42a1f6bf88"
 				tenantIdChangeCb={(id) => console.log(id)}