@yeeyoon/library 2.9.5 → 2.9.9

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

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { Menu, Image, Modal } from 'antd';
 import PropTypes from 'prop-types';
 import PlatformModal from '../PlatformModal';
-import { getCollabRedirectUrl } from '../../env';
+import { getCollabRedirectUrl, getBpmRedirectUrl } from '../../env';
 import ls from 'local-storage';
 import styles from './index.less';
 import { fetchSystemToken } from '../../service';
@@ -15,6 +15,9 @@ const ProductListMenu = (props) => {
 	const [openKeys] = useState(['sub1', 'sub2']);
 	const [platModal, setPlatModal] = useState(false);
 	const [platforms, setPlatforms] = useState([]);
+	const [visibleApplet, setVisibleApplet] = useState(false);
+	const [appletSrc, setAppletSrc] = useState('');
+
 	const enterDetail = (item) => {
 		let _link = document.createElement('a');
 		let link = document.body.appendChild(_link);
@@ -27,13 +30,35 @@ const ProductListMenu = (props) => {
 				)}&tenantId=${tenantId}`
 			);
 			link.click();
-		} else if (item.platforms?.length > 1) {
+			return;
+		} else if (item.platforms.length > 1) {
 			setPlatModal(true);
 			setPlatforms(item.platforms);
-		} else if (item.platforms?.length == 1) {
-			getSystemToken(item.platforms[0]);
+		} else if (item.platforms.length == 1) {
+			if (item.code == 200000730 || item.code == 200000731) {
+				openModal(item.platforms[0].forwardDomainName);
+			} else {
+				if (item.code == 200000729 || item.code == 200000728) {
+					let url = '';
+					if (item.code == 200000729) url = getCollabRedirectUrl();
+					if (item.code == 200000728) url = getBpmRedirectUrl();
+					link.setAttribute(
+						'href',
+						`${url}?token=${ls.get('X-Auth-Token')}&tenantId=${tenantId}`
+					);
+					link.click();
+				} else {
+					getSystemToken(item.platforms[0]);
+				}
+			}
 		}
 	};
+	const openModal = (src) => {
+		setAppletSrc(src);
+		setTimeout(() => {
+			setVisibleApplet(true);
+		}, 300);
+	};
 	const getSystemToken = async (item) => {
 		const resp = await fetchSystemToken({ platformId: item.id });
 		const { success, data } = resp;
@@ -122,6 +147,17 @@ const ProductListMenu = (props) => {
 			>
 				<PlatformModal platforms={platforms} tenantId={tenantId} />
 			</Modal>
+			{/* 点击小程序弹框 */}
+			<Modal
+				visible={visibleApplet}
+				onCancel={() => setVisibleApplet(false)}
+				centered
+				footer={null}
+				maskClosable={false}
+				width="auto"
+			>
+				<Image preview={false} src={appletSrc} />
+			</Modal>
 		</div>
 	);
 };

package/lib/components/Header/env.js

@@ -112,3 +112,17 @@ export function getCollabRedirectUrl() {
 			return 'https://collab.yeeyoon.com';
 	}
 }
+
+export function getBpmRedirectUrl() {
+	switch (host) {
+		case 'localhost:8003':
+		case 'localhost:8000':
+		case 'testing-profile.yeeyoon.com':
+			return 'https://testing-bpm.yeeyoon.com';
+		case 'staging-profile.yeeyoon.com':
+			return 'https://staging-bpm.yeeyoon.com';
+		case 'profile.yeeyoon.com':
+		default:
+			return 'https://bpm.yeeyoon.com';
+	}
+}

package/lib/components/Header/index.jsx

@@ -163,11 +163,11 @@ const Header = (props) => {
 			setAvatarProps({ src: data.headUrl || DEFAULT_AVATAR_URL });
 			currentProduct = tenants[0].applications || [];
 			getProductList(id);
-		} else {
+		} /*else {
 			setTimeout(() => {
 				backToIam();
 			}, 4500);
-		}
+		}*/
 	};
 
 	const getProductList = async (userId) => {

package/lib/config/env.js

@@ -1,4 +1,4 @@
-// const REACT_APP_ENV = REACT_APP_ENV || 'testing';
+// const REACT_APP_ENV = REACT_APP_ENV || 'prod';
 
 const envApi = {
 	// IAM

package/lib/utils/request.js

@@ -4,6 +4,8 @@ import qs from 'qs';
 import ls from 'local-storage';
 import { notification } from 'antd';
 
+import { HOST_IAM } from '../config/env';
+
 const TOKEN_KEY = 'X-Auth-Token';
 const ID_KEY = 'X-Auth-Id';
 const REST_KEY = 'Login-Rest-Info';
@@ -40,6 +42,11 @@ rest && ls.set(REST_KEY, JSON.stringify(rest));
 // };
 /** 异常处理程序 */
 
+const backToIam = () => {
+	const { origin, pathname } = window.location;
+	window.location.href = `${HOST_IAM}?redirect=${origin}${pathname}`;
+};
+
 const errorHandler = (error) => {
 	const { response } = error;
 
@@ -78,7 +85,10 @@ request.interceptors.response.use(async (response) => {
 	if (code !== 200 && code !== 201 && !success) {
 		m !== '操作过于频繁' &&
 			m.indexOf('存在重复的物资') < 0 &&
-			notification.error({ message: m });
+			notification.error({
+				message: m,
+				maxCount: 1,
+			});
 		if (
 			code === 401 ||
 			code === 402 ||
@@ -86,6 +96,7 @@ request.interceptors.response.use(async (response) => {
 			m === 'token不一致'
 		) {
 			window.top.postMessage('tcTokenExpired', '*'); // 通知宿主窗口
+			backToIam();
 		}
 		return resp;
 	} else if (success && (!code || code === 200)) {

package/package.json

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