@yeeyoon/library 2.7.9 → 2.8.3

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

@@ -1,16 +1,33 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import ProTable from '@ant-design/pro-table';
 import { mergeTableColumnCommonConfig } from '../../../utils/utils';
 
+let paginationData = {
+	current: 1,
+	pageSize: 10,
+};
+let sortData = {};
+let filterData = {};
+
 const CommonTable = (props) => {
 	const {
 		data,
 		dataTransform,
 		paginationKey = ['each_page', 'current_page'],
+		systemTags = [],
 	} = props;
+	const [paginationCurrent, setPaginationCurrent] = useState(1);
 	const { rowKey, columns, reqFunc, reqParams, reqCbFn, ...rest } = data;
-	let sortData = {};
+	useEffect(() => {
+		paginationData = {
+			current: 1,
+			pageSize: 10,
+		};
+		sortData = {};
+		filterData = {};
+	}, [columns]);
+
 	return (
 		<ProTable
 			rowKey={(record) => record[rowKey]}
@@ -18,6 +35,7 @@ const CommonTable = (props) => {
 			pagination={{
 				position: ['bottomCenter'],
 				pageSize: 10,
+				current: paginationCurrent,
 			}}
 			options={false}
 			scroll={{
@@ -27,12 +45,14 @@ const CommonTable = (props) => {
 				if (typeof reqFunc !== 'function') return;
 				const { current, pageSize, ...rest } = params;
 				const resp = await reqFunc({
-					[paginationKey[0]]: pageSize,
-					[paginationKey[1]]: current,
+					[paginationKey[0]]: paginationData.pageSize || pageSize,
+					[paginationKey[1]]: paginationData.current || current,
 					...rest,
 					...reqParams,
 					...sortData,
+					...filterData,
 				});
+				filterData = {};
 				const { total_data, data } = dataTransform ? dataTransform(resp) : resp;
 				if (reqCbFn) reqCbFn(params, { data, total: total_data });
 				return {
@@ -42,13 +62,36 @@ const CommonTable = (props) => {
 				};
 			}}
 			onChange={(pagination, filters, sorter) => {
+				// console.log(pagination, filters, sorter, 'xxxxxxxx');
+				if (pagination) {
+					const { current, pageSize } = pagination;
+					setPaginationCurrent(current);
+					paginationData = { current, pageSize };
+				}
+				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.reload();
+				}
 				if (sorter.field) {
 					const { field, order, column } = sorter;
-					const { sortType } = column;
-					sortData = {
-						sort_direction: `${order === 'ascend' ? 'asc' : 'desc'}`,
-						sort_by: `${field}${sortType ? '.' + sortType : ''}`,
-					};
+					if (!column) sortData = {};
+					else {
+						const { sortType } = column;
+						sortData = {
+							sort_direction: `${order === 'ascend' ? 'asc' : 'desc'}`,
+							sort_by: `${field}${sortType ? '.' + sortType : ''}`,
+						};
+					}
 				} else {
 					sortData = {};
 				}
@@ -62,6 +105,7 @@ CommonTable.propTypes = {
 	data: PropTypes.object,
 	dataTransform: PropTypes.func,
 	paginationKey: PropTypes.array,
+	systemTags: PropTypes.array,
 };
 
 export default CommonTable;

package/lib/components/Header/index.jsx

@@ -57,6 +57,7 @@ const Header = (props) => {
 		productName = 'profile',
 		avatar,
 		userName,
+		slot = <></>,
 	} = props;
 	const [platforms, setPlatforms] = useState([]);
 	const [userInfo, setUserInfo] = useState(null);
@@ -234,6 +235,7 @@ const Header = (props) => {
 							</span>
 						)}
 					</span>
+					<div className={styles['comp-header__slot']}>{slot}</div>
 				</div>
 				<div className={styles['comp-header__right-content']}>
 					<span
@@ -325,6 +327,7 @@ Header.propTypes = {
 	productName: PropTypes.string,
 	avatar: PropTypes.string,
 	userName: PropTypes.string,
+	slot: PropTypes.node,
 };
 
 export default Header;

package/lib/components/Header/index.less

@@ -55,5 +55,8 @@
 				}
 			}
 		}
+		&__slot {
+			margin-left: 25px;
+		}
 	}
 }

package/lib/config/env.js

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

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.7.9",
+  "version": "2.8.3",
   "description": "宜云前端组件库和通用服务",
   "main": "index.js",
   "repository": {

package/src/pages/index.js

@@ -14,7 +14,7 @@ export default function () {
 	}, []);
 	return (
 		<>
-			<Header productName="profile" />
+			<Header productName="profile" slot={<div>nasa</div>} />
 			{/* <TenantSelector
 				tenantId="14bfb5d71d1011eca9820c42a1f6bf88"
 				tenantIdChangeCb={(id) => console.log(id)}