@yeeyoon/library 3.0.4 → 3.0.8

package/lib/components/Header/index.jsx

@@ -6,14 +6,13 @@ import { Menu, Dropdown, Tooltip, Avatar, Drawer, Modal, Divider } from 'antd';
 import {
 	UserOutlined,
 	SettingOutlined,
-	UsergroupAddOutlined,
 	PoweroffOutlined,
 } from '@ant-design/icons';
 // import Notification from '../Notification/recent';
 import ProductListMenu from './components/ProductListMenu/';
 import PlatformModal from './components/PlatformModal/';
 
-import { IconTodo, IconConsole, IconMore } from '../Icons/';
+import { IconTodo, IconConsole, IconMore, IconQunZuGuanLi } from '../Icons/';
 
 import {
 	fetchSystemToken,
@@ -68,8 +67,9 @@ 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('');
@@ -93,7 +93,7 @@ const Header = (props) => {
 				修改密码
 			</Menu.Item>
 			<Menu.Item
-				icon={<UsergroupAddOutlined />}
+				icon={<IconQunZuGuanLi style={{ fontSize: '14px' }} />}
 				onClick={() => {
 					window.location.href = `${HOST_PROFILE_GROUP}?token=${token}`;
 				}}
@@ -168,10 +168,6 @@ const Header = (props) => {
 			setUserId(id);
 			setAvatarProps({ src: data.headUrl || DEFAULT_AVATAR_URL });
 			currentProduct = tenants[0].applications || [];
-			if (!currentProduct.filter((item) => item.code === 200000728).length) {
-				handleException && handleException();
-				return;
-			}
 			getProductList(id);
 		} /*else {
 			setTimeout(() => {

package/lib/components/Icons/index.jsx

@@ -4,8 +4,9 @@ import { createFromIconfontCN } from '@ant-design/icons';
 const Icons = createFromIconfontCN({
 	scriptUrl: [
 		'//at.alicdn.com/t/font_2716486_dpnjwgvqpfn.js',
-		'//at.alicdn.com/t/font_2832661_kmrn4o901g.js',
+		'//at.alicdn.com/t/font_2832661_kmrn4o901g.js', //宜云协同iconfont
 		'//at.alicdn.com/t/font_2832313_vjeg45f5qof.js',
+		'//at.alicdn.com/t/font_2965204_9g0wekoduag.js', //租户管理
 	],
 });
 
@@ -30,6 +31,9 @@ const IconWodechanpin = (args) => {
 const IconTuijianchanpin = (args) => {
 	return <Icons type="icon-icon_tuijianchanpin" {...args} />;
 };
+const IconQunZuGuanLi = (args) => {
+	return <Icons type="icon-qunzuguanli" {...args} />;
+};
 
 export {
 	IconBell,
@@ -39,4 +43,5 @@ export {
 	IconCircle,
 	IconWodechanpin,
 	IconTuijianchanpin,
+	IconQunZuGuanLi,
 };

package/lib/components/TenantSelector/index.jsx

@@ -7,7 +7,7 @@ import { fetchUserInfo } from './service';
 const { Option } = Select;
 
 const TenantSelector = (props) => {
-	const { tenantId, tenantIdChangeCb } = props;
+	const { tenantId, tenantIdChangeCb, appId, handleException } = props;
 	const [tenantList, setTenantList] = useState([]);
 	const [currentTenantId, setCurrentTenantId] = useState('');
 
@@ -17,7 +17,17 @@ const TenantSelector = (props) => {
 		let id;
 		let name;
 		if (success) {
-			const { tenants } = data;
+			let { tenants } = data;
+			if (appId) {
+				tenants = tenants.filter((item) => {
+					const { applications } = item;
+					return applications.filter((item) => item.id === appId).length;
+				});
+			}
+			if (!tenants.length) {
+				handleException && handleException();
+				return;
+			}
 			const result = tenants.filter((item) => item.id === tenantId);
 			if (result.length) {
 				id = tenantId;
@@ -28,7 +38,7 @@ const TenantSelector = (props) => {
 			}
 			setTenantList(tenants);
 			setCurrentTenantId(id);
-			tenantIdChangeCb(id, name);
+			tenantIdChangeCb && tenantIdChangeCb(id, name);
 		}
 	}, []);
 
@@ -43,9 +53,7 @@ const TenantSelector = (props) => {
 			onChange={(value, option) => {
 				const { children } = option;
 				setCurrentTenantId(value);
-				if (tenantIdChangeCb) {
-					tenantIdChangeCb(value, children);
-				}
+				tenantIdChangeCb && tenantIdChangeCb(value, children);
 			}}
 		>
 			{tenantList.map((item) => {
@@ -61,7 +69,9 @@ const TenantSelector = (props) => {
 
 TenantSelector.propTypes = {
 	tenantId: PropTypes.string,
+	appId: PropTypes.string,
 	tenantIdChangeCb: PropTypes.func,
+	handleException: PropTypes.func,
 };
 
 export default TenantSelector;

package/package.json

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

package/src/pages/index.js

@@ -1,7 +1,17 @@
 import React from 'react';
 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="bpm" slot={<div>nasa</div>} />;
+	return (
+		<>
+			<Header productName="bpm" slot={<div>nasa</div>} />
+			<TenantSelector
+				tenantId="b7b0e19414927b878814094f33b43543"
+				appId="bbe5c8f0063711ecb0c00c42a1ff8370"
+				tenantIdChangeCb={() => {}}
+			/>
+		</>
+	);
 }