@yeeyoon/library 2.8.1 → 2.8.5

package/lib/components/Common/CommonTable/index.jsx

@@ -8,11 +8,9 @@ const CommonTable = (props) => {
 		data,
 		dataTransform,
 		paginationKey = ['each_page', 'current_page'],
-		systemTags = [],
 	} = props;
 	const { rowKey, columns, reqFunc, reqParams, reqCbFn, ...rest } = data;
 	let sortData = {};
-	let filterData = {};
 	return (
 		<ProTable
 			rowKey={(record) => record[rowKey]}
@@ -34,9 +32,7 @@ const CommonTable = (props) => {
 					...rest,
 					...reqParams,
 					...sortData,
-					...filterData,
 				});
-				filterData = {};
 				const { total_data, data } = dataTransform ? dataTransform(resp) : resp;
 				if (reqCbFn) reqCbFn(params, { data, total: total_data });
 				return {
@@ -46,20 +42,6 @@ const CommonTable = (props) => {
 				};
 			}}
 			onChange={(pagination, filters, sorter) => {
-				if (filters) {
-					Object.keys(filters).forEach((key) => {
-						if (filters[key]) {
-							filterData[key] = filters[key];
-						}
-					});
-					filterData = {
-						filters: JSON.stringify({
-							system_tags: systemTags,
-							...filterData,
-						}),
-					};
-					rest.actionRef && rest.actionRef.current.reloadAndRest();
-				}
 				if (sorter.field) {
 					const { field, order, column } = sorter;
 					if (!column) sortData = {};
@@ -83,7 +65,6 @@ CommonTable.propTypes = {
 	data: PropTypes.object,
 	dataTransform: PropTypes.func,
 	paginationKey: PropTypes.array,
-	systemTags: PropTypes.array,
 };
 
 export default CommonTable;

package/lib/components/Header/index.jsx

@@ -6,6 +6,7 @@ import { Menu, Dropdown, Tooltip, Avatar, Drawer, Modal, Divider } from 'antd';
 import {
 	UserOutlined,
 	SettingOutlined,
+	UsergroupAddOutlined,
 	PoweroffOutlined,
 } from '@ant-design/icons';
 // import Notification from '../Notification/recent';
@@ -27,6 +28,7 @@ import {
 	HOST_PROFILE_DASH_BOARD,
 	HOST_PROFILE_USER,
 	HOST_PROFILE_PASSWORD,
+	HOST_PROFILE_GROUP,
 } from '../../config/env';
 
 import LogoProfile from './assets/profile.svg';
@@ -89,6 +91,14 @@ const Header = (props) => {
 			>
 				修改密码
 			</Menu.Item>
+			<Menu.Item
+				icon={<UsergroupAddOutlined />}
+				onClick={() => {
+					window.location.href = `${HOST_PROFILE_GROUP}?token=${token}`;
+				}}
+			>
+				群组管理
+			</Menu.Item>
 			<Menu.Item
 				icon={<PoweroffOutlined />}
 				onClick={() => {

package/lib/config/env.js

@@ -121,6 +121,7 @@ export const HOST_PROFILE_MESSAGE = getEnvHost(
 	'profile',
 	'/message-center/home/list'
 );
+export const HOST_PROFILE_GROUP = getEnvHost('profile', '/user-profile/group');
 export const HOST_ZHONGTAI_XLT = getEnvHost('zhongtai_cy');
 export const HOST_ZHONGTAI_CY = getEnvHost('zhongtai_xlt');
 

package/lib/utils/request.js

@@ -7,7 +7,14 @@ import { notification } from 'antd';
 const TOKEN_KEY = 'X-Auth-Token';
 const ID_KEY = 'X-Auth-Id';
 const REST_KEY = 'Login-Rest-Info';
-const qsData = qs.parse(window.location.search.slice(1));
+const { search, hash } = window.location;
+let searchQs = '';
+if (search !== '') {
+	searchQs = search.slice(1);
+} else if (hash !== '') {
+	searchQs = hash.split('?')[1] || '';
+}
+const qsData = qs.parse(searchQs);
 const { token, userId, ...rest } = qsData;
 
 token && ls.set(TOKEN_KEY, token);

package/package.json

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