@yeeyoon/library 2.7.7 → 2.8.1

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

@@ -8,9 +8,11 @@ const CommonTable = (props) => {
 		data,
 		dataTransform,
 		paginationKey = ['each_page', 'current_page'],
+		systemTags = [],
 	} = props;
 	const { rowKey, columns, reqFunc, reqParams, reqCbFn, ...rest } = data;
-	let orderKey = {};
+	let sortData = {};
+	let filterData = {};
 	return (
 		<ProTable
 			rowKey={(record) => record[rowKey]}
@@ -31,8 +33,10 @@ const CommonTable = (props) => {
 					[paginationKey[1]]: current,
 					...rest,
 					...reqParams,
-					...orderKey,
+					...sortData,
+					...filterData,
 				});
+				filterData = {};
 				const { total_data, data } = dataTransform ? dataTransform(resp) : resp;
 				if (reqCbFn) reqCbFn(params, { data, total: total_data });
 				return {
@@ -42,13 +46,32 @@ const CommonTable = (props) => {
 				};
 			}}
 			onChange={(pagination, filters, sorter) => {
-				if (sorter.field) {
-					const { field, order } = sorter;
-					orderKey = {
-						order: `${field}-${order === 'ascend' ? 'asc' : 'desc'}`,
+				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 = {};
+					else {
+						const { sortType } = column;
+						sortData = {
+							sort_direction: `${order === 'ascend' ? 'asc' : 'desc'}`,
+							sort_by: `${field}${sortType ? '.' + sortType : ''}`,
+						};
+					}
 				} else {
-					orderKey = {};
+					sortData = {};
 				}
 			}}
 			{...rest}
@@ -60,6 +83,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeeyoon/library",
-  "version": "2.7.7",
+  "version": "2.8.1",
   "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)}