@yeeyoon/library 3.0.3 → 3.0.7

package/lib/components/Header/index.jsx

@@ -183,9 +183,6 @@ const Header = (props) => {
 			allProduct = data;
 			leftProduct = _xorBy(allProduct, currentProduct, 'id');
 		}
-		if (!data.filter((item) => item.code === 200000728).length) {
-			handleException && handleException();
-		}
 	};
 
 	const doLogout = async (userId) => {

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.3",
+  "version": "3.0.7",
   "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={() => {}}
+			/>
+		</>
+	);
 }