@yeeyoon/library 2.6.4 → 2.6.8

package/lib/components/Header/index.jsx

@@ -63,9 +63,8 @@ const Header = (props) => {
 	const [systemUserInfo, setSystemUserInfo] = useState(null);
 	const [tenants, setTenants] = useState([]);
 	const [userId, setUserId] = useState([]);
-	const [productListMenuDrawerShow, setProductListMenuDrawerShow] = useState(
-		false
-	);
+	const [productListMenuDrawerShow, setProductListMenuDrawerShow] =
+		useState(false);
 	const [platformsModalShow, setPlatformsModalShow] = useState(false);
 	const [avatarProps, setAvatarProps] = useState({});
 	const [redirectUrl, setRedirectUrl] = useState('');

package/lib/components/Header/index.less

@@ -9,7 +9,8 @@
 		line-height: 56px;
 		background-color: #fff;
 		border-radius: 6px;
-		box-shadow: @shadow-base;
+		// box-shadow: @shadow-base;
+		box-shadow: 0px 4px 24px rgba(0, 0, 0, 0.06);
 		&__logo {
 			margin-left: 10px;
 			cursor: pointer;

package/lib/components/ModifyPassword/Captcha.jsx

@@ -1,16 +1,19 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { notification } from 'antd';
 import { ProFormText, ProFormCaptcha } from '@ant-design/pro-form';
 
 import { mobileRule } from './rule.config';
 import { sendResetCaptcha } from './service';
 
-const Captcha = () => {
+const Captcha = (props) => {
+	const { cellphone } = props;
 	return (
 		<>
 			<ProFormText
 				fieldProps={{
 					size: 'large',
+					disabled: cellphone ? true : false,
 				}}
 				name="mobile"
 				placeholder="请输入手机号"
@@ -51,4 +54,8 @@ const Captcha = () => {
 	);
 };
 
+Captcha.propTypes = {
+	cellphone: PropTypes.string,
+};
+
 export default Captcha;

package/lib/components/ModifyPassword/index.jsx

@@ -10,7 +10,7 @@ import Captcha from './Captcha';
 import styles from './universal.less';
 
 const Forget = (props) => {
-	const { reqCb, hideTitle = false } = props;
+	const { reqCb, hideTitle = false, cellphone } = props;
 	const [step, setStep] = useState('captcha');
 	const [mobile, setMobile] = useState('');
 
@@ -23,6 +23,9 @@ const Forget = (props) => {
 				<Card bordered={false} className={styles['universal-login__card']}>
 					<ProForm
 						submitter={false}
+						initialValues={{
+							mobile: cellphone ? cellphone : '',
+						}}
 						onFinish={async (values) => {
 							let response;
 							if (step === 'captcha') {
@@ -50,7 +53,7 @@ const Forget = (props) => {
 							}
 						}}
 					>
-						{step === 'captcha' && <Captcha />}
+						{step === 'captcha' && <Captcha cellphone={cellphone} />}
 
 						{step === 'password' && (
 							<>
@@ -106,6 +109,7 @@ const Forget = (props) => {
 Forget.propTypes = {
 	reqCb: PropTypes.func.required,
 	hideTitle: PropTypes.bool,
+	cellphone: PropTypes.string,
 };
 
 export default Forget;

package/lib/components/Notification/index.less

@@ -46,9 +46,9 @@
 	// .ant-pro-basicLayout-content {
 	// 	margin: 0 !important;
 	// }
-	.ant-pro-table-list-toolbar-container {
-		padding: 0 !important;
-	}
+	// .ant-pro-table-list-toolbar-container {
+	// 	padding: 0 !important;
+	// }
 	.ant-list-empty-text {
 		background-color: #fff !important;
 	}

package/package.json

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

package/src/pages/index.js

@@ -3,6 +3,7 @@ import Header from '../../lib/components/Header/';
 import TenantSelector from '../../lib/components/TenantSelector/';
 import CustomDefaultFooter from '../../lib/components/DefaultFooter/';
 import PageLoading from '../../lib/components/PageLoading/';
+// import ModifyPassword from '../../lib/components/ModifyPassword/';
 
 // eslint-disable-next-line react/display-name
 export default function () {
@@ -15,6 +16,7 @@ export default function () {
 			/> */}
 			{/* <CustomDefaultFooter /> */}
 			{/* <PageLoading /> */}
+			{/* {<ModifyPassword />} */}
 		</>
 	);
 }