@yeeyoon/library 3.2.6 → 3.2.7

package/lib/utils/utils.js

@@ -1,3 +1,6 @@
+import React from 'react';
+import UserAvatar from '../components/AvatarPackaged/';
+
 export function mergeTableColumnCommonConfig(config) {
 	return config.map((item, index) => {
 		let commonConfig = [{ align: 'left' }, { ellipsis: true }];
@@ -68,6 +71,27 @@ export function mergeTableColumnCommonConfig(config) {
 					...[{ width: 300 }, { ellipsis: false }],
 				];
 				break;
+			case 'user':
+				commonConfig = [
+					...commonConfig,
+					...[
+						{ width: 150 },
+						{
+							// eslint-disable-next-line react/display-name
+							render: (_, record) => {
+								const key = item.dataIndex;
+								let data;
+								if (key === 'creator') {
+									data = record.creator;
+								} else if (key === 'updater') {
+									data = record.updater;
+								}
+								return <UserAvatar data={data} showName={true} />;
+							},
+						},
+					],
+				];
+				break;
 		}
 		commonConfig.forEach((value) => {
 			item = { ...item, ...value };

package/package.json

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

package/src/global.css

@@ -4,7 +4,7 @@ html, body, #root {
 
 body {
   margin: 0;
-	background-color: #000 !important;
+	/* background-color: #000 !important; */
 }
 
 body * {

package/src/pages/index.js

@@ -1,14 +1,17 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 import Header from '../../lib/components/Header/';
+import TenantSelector from '../../lib/components/TenantSelector';
 
 // eslint-disable-next-line react/display-name
 export default function () {
-	const [tenantId, setTenantId] = useState('');
-	useEffect(() => {
-		setTimeout(() => {
-			setTenantId('053a033a063711ecb0c00c42a1ff8370');
-			// setTenantId('f12a71b6063611ecb0c00c42a1ff8370');
-		}, 3000);
-	}, []);
-	return <Header productName="bpm" tenantId={tenantId} />;
+	return (
+		<>
+			<Header productName="bpm" slot={<div>nasa</div>} />
+			<TenantSelector
+				tenantId="b7b0e19414927b878814094f33b43543"
+				appId="bbe5c8f0063711ecb0c00c42a1ff8370"
+				tenantIdChangeCb={() => {}}
+			/>
+		</>
+	);
 }