@yeeyoon/library 3.6.9 → 3.7.2

package/lib/components/Header/index.jsx

@@ -337,6 +337,9 @@ const Header = (props) => {
 					<span
 						className={styles['comp-header__icon']}
 						onClick={() => {
+							if (productName === 'wms' || productName === 'bpm') {
+								window.location.href = `${HOST_PROFILE_TASK}?token=${token}&source=${productName}&tenantId=${tenantId}`;
+							}
 							setRedirectUrl(HOST_PROFILE_TASK);
 							setPlatformsModalShow(true);
 						}}

package/lib/components/TenantSelector/index.jsx

@@ -1,86 +1,73 @@
-import React, { useState, useEffect } from 'react';
+import { AutoComplete } from 'antd';
 import PropTypes from 'prop-types';
-import { Select } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { fetchTenantList } from './service';
 
-import { fetchUserInfo } from './service';
-
-const { Option } = Select;
+let defaultTenantName;
 
 const TenantSelector = (props) => {
 	const {
 		tenantId,
 		tenantIdChangeCb,
 		appId,
-		handleException,
-		shareTenantIdList = [],
-		isSharePlatform = false,
+		// handleException,
 	} = props;
-	const [tenantList, setTenantList] = useState([]);
-	const [currentTenantId, setCurrentTenantId] = useState('');
+	const [options, setOptions] = useState([]);
+	const [value, setValue] = useState('');
+	const [placeholder, setPlaceholder] = useState('');
 
-	useEffect(async () => {
-		const resp = await fetchUserInfo();
-		const { data, success } = resp;
-		let id;
-		let name;
+	const searchTenant = async (value = '', tenantId) => {
+		setValue(value);
+		const resp = await fetchTenantList({
+			applicationId: appId,
+			key: value.trim(),
+		});
+		const { success, data } = resp;
 		if (success) {
-			let { tenants } = data;
-			if (appId) {
-				tenants = tenants.filter((item) => {
-					const { applications } = item;
-					return applications?.filter((item) => item.id === appId).length;
+			let tenantList = [];
+			data.forEach((item) => {
+				if (tenantId && tenantId === item.id) {
+					defaultTenantName = item.name;
+					setValue(item.name);
+				}
+				tenantList.push({
+					label: item.name,
+					value: item.id,
 				});
-			}
-			if (!tenants.length) {
-				handleException && handleException();
-				return;
-			}
-			const result = tenants.filter((item) => item.id === tenantId);
-			if (result.length) {
-				id = tenantId;
-				name = result[0].name;
-			} else {
-				id = tenants[0].id;
-				name = tenants[0].name;
-			}
-			// if (!isSharePlatform) {
-			// 	tenants = tenants.filter(
-			// 		(item) => !shareTenantIdList.includes(item.id)
-			// 	);
-			// } else {
-			// 	tenants = tenants.filter((item) => shareTenantIdList.includes(item.id));
-			// }
-			if (isSharePlatform) {
-				tenants = tenants.filter((item) => shareTenantIdList.includes(item.id));
-			}
-			setTenantList(tenants);
-			setCurrentTenantId(id);
-			tenantIdChangeCb && tenantIdChangeCb(id, name);
+			});
+			setOptions(tenantList);
 		}
+	};
+
+	useEffect(async () => {
+		searchTenant('', tenantId);
 	}, []);
 
 	return (
-		<Select
-			getPopupContainer={(triggerNode) => triggerNode.parentNode}
-			showSearch
-			optionFilterProp="children"
+		<AutoComplete
 			bordered={false}
-			value={currentTenantId}
+			placeholder={placeholder}
+			getPopupContainer={(triggerNode) => triggerNode.parentNode}
+			value={value}
 			style={{ width: '215px' }}
-			onChange={(value, option) => {
-				const { children } = option;
-				setCurrentTenantId(value);
-				tenantIdChangeCb && tenantIdChangeCb(value, children);
+			options={options}
+			onChange={(value) => {
+				searchTenant(value);
+			}}
+			onFocus={() => {
+				setValue('');
+				setPlaceholder(defaultTenantName);
+			}}
+			onBlur={() => {
+				// if (value.trim() === '') {
+				setValue(defaultTenantName);
+				// }
+			}}
+			onSelect={(value, option) => {
+				setValue(option.label);
+				tenantIdChangeCb && tenantIdChangeCb(value, option);
 			}}
-		>
-			{tenantList.map((item) => {
-				return (
-					<Option value={item.id} key={item.id}>
-						{item.name}
-					</Option>
-				);
-			})}
-		</Select>
+		/>
 	);
 };
 
@@ -89,8 +76,6 @@ TenantSelector.propTypes = {
 	appId: PropTypes.string,
 	tenantIdChangeCb: PropTypes.func,
 	handleException: PropTypes.func,
-	shareTenantIdList: PropTypes.array,
-	isSharePlatform: PropTypes.bool,
 };
 
 export default TenantSelector;

package/lib/components/TenantSelector/service.js

@@ -9,3 +9,14 @@ export async function fetchUserInfo() {
 		data: {},
 	});
 }
+
+export async function fetchTenantList(params) {
+	return request(`/findOidcUserTenantList`, {
+		prefix: `${API_IAM}/api/oidc/v1/oidcuser`,
+		method: 'post',
+		data: {
+			paging: false,
+			...params,
+		},
+	});
+}

package/lib/utils/request.js

@@ -43,12 +43,12 @@ rest && ls.set(REST_KEY, JSON.stringify(rest));
 /** 异常处理程序 */
 
 const backToIam = () => {
-	// const { origin, pathname } = window.location;
-	// if (origin.indexOf(HOST_HUASHAN_BPM) > -1) {
-	// 	window.location.href = HOST_HUASHAN_LOGIN;
-	// } else {
-	// 	window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
-	// }
+	const { origin, pathname } = window.location;
+	if (origin.indexOf(HOST_HUASHAN_BPM) > -1) {
+		window.location.href = HOST_HUASHAN_LOGIN;
+	} else {
+		window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
+	}
 };
 
 const errorHandler = (error) => {

package/package.json

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