提交 98625969 编写于 作者: wanhai_wu's avatar wanhai_wu

build

上级 54a0c005
......@@ -8,7 +8,7 @@ export default {
'pages.login.username.required': '用户名是必填项!',
'pages.login.password.placeholder': '密码: ant.design',
'pages.login.password.required': '密码是必填项!',
'pages.login.phoneLogin.tab': '手机号登录',
'pages.login.phoneLogin.tab': '飞书登录',
'pages.login.phoneLogin.errorMessage': '验证码错误',
'pages.login.phoneNumber.placeholder': '请输入手机号!',
'pages.login.phoneNumber.required': '手机号是必填项!',
......
import React, {useEffect, useState} from 'react';
import { Transfer } from 'antd';
import type { TransferDirection } from 'antd/es/transfer';
import {getMemberPage, getRoleMember} from "@/services/role";
import {getAbleMember, getMemberPage, getRoleMember} from "@/services/role";
interface RecordType {
key: string;
......@@ -43,7 +43,7 @@ const MemberPage: React.FC = (props, context) => {
let recordData = props?.editInfo
let {items, total} = await getMemberPage(params)
let {items, total} = await getAbleMember()
setDataSource(items)
setTotal(total)
......@@ -84,12 +84,12 @@ const MemberPage: React.FC = (props, context) => {
dataSource={dataSource}
titles={['成员', '目标成员']}
targetKeys={targetKeys}
rowKey={(record) => record.member.unionId}
rowKey={(record) => record?.unionId}
selectedKeys={selectedKeys}
onChange={onChange}
onSelectChange={onSelectChange}
onScroll={onScroll}
render={(item) => item.member.name}
render={(item) => item?.name}
/>
);
};
......
#login_container {
position: fixed;
top: 50vh;
left: 0;
right: 0;
margin: 0 auto;
/*position: fixed;*/
/*top: 50vh;*/
/*left: 0;*/
/*right: 0;*/
/*margin: 0 auto;*/
display: flex;
justify-content: center;
align-content: center;
width: 380px;
height: 260px;
}
......@@ -205,13 +205,13 @@ const Login: React.FC = () => {
defaultMessage: '账户密码登录',
}),
},
// {
// key: 'mobile',
// label: intl.formatMessage({
// id: 'pages.login.phoneLogin.tab',
// defaultMessage: '手机号登录',
// }),
// },
{
key: 'mobile',
label: intl.formatMessage({
id: 'pages.login.phoneLogin.tab',
defaultMessage: '飞书登录',
}),
},
]}
/>
......@@ -275,83 +275,84 @@ const Login: React.FC = () => {
{status === 'error' && loginType === 'mobile' && <LoginMessage content="验证码错误" />}
{type === 'mobile' && (
<>
<ProFormText
fieldProps={{
size: 'large',
prefix: <MobileOutlined />,
}}
name="mobile"
placeholder={intl.formatMessage({
id: 'pages.login.phoneNumber.placeholder',
defaultMessage: '手机号',
})}
rules={[
{
required: true,
message: (
<FormattedMessage
id="pages.login.phoneNumber.required"
defaultMessage="请输入手机号!"
/>
),
},
{
pattern: /^1\d{10}$/,
message: (
<FormattedMessage
id="pages.login.phoneNumber.invalid"
defaultMessage="手机号格式错误!"
/>
),
},
]}
/>
<ProFormCaptcha
fieldProps={{
size: 'large',
prefix: <LockOutlined />,
}}
captchaProps={{
size: 'large',
}}
placeholder={intl.formatMessage({
id: 'pages.login.captcha.placeholder',
defaultMessage: '请输入验证码',
})}
captchaTextRender={(timing, count) => {
if (timing) {
return `${count} ${intl.formatMessage({
id: 'pages.getCaptchaSecondText',
defaultMessage: '获取验证码',
})}`;
}
return intl.formatMessage({
id: 'pages.login.phoneLogin.getVerificationCode',
defaultMessage: '获取验证码',
});
}}
name="captcha"
rules={[
{
required: true,
message: (
<FormattedMessage
id="pages.login.captcha.required"
defaultMessage="请输入验证码!"
/>
),
},
]}
onGetCaptcha={async (phone) => {
const result = await getFakeCaptcha({
phone,
});
if (!result) {
return;
}
message.success('获取验证码成功!验证码为:1234');
}}
/>
<FsQr />
{/*<ProFormText*/}
{/* fieldProps={{*/}
{/* size: 'large',*/}
{/* prefix: <MobileOutlined />,*/}
{/* }}*/}
{/* name="mobile"*/}
{/* placeholder={intl.formatMessage({*/}
{/* id: 'pages.login.phoneNumber.placeholder',*/}
{/* defaultMessage: '手机号',*/}
{/* })}*/}
{/* rules={[*/}
{/* {*/}
{/* required: true,*/}
{/* message: (*/}
{/* <FormattedMessage*/}
{/* id="pages.login.phoneNumber.required"*/}
{/* defaultMessage="请输入手机号!"*/}
{/* />*/}
{/* ),*/}
{/* },*/}
{/* {*/}
{/* pattern: /^1\d{10}$/,*/}
{/* message: (*/}
{/* <FormattedMessage*/}
{/* id="pages.login.phoneNumber.invalid"*/}
{/* defaultMessage="手机号格式错误!"*/}
{/* />*/}
{/* ),*/}
{/* },*/}
{/* ]}*/}
{/*/>*/}
{/*<ProFormCaptcha*/}
{/* fieldProps={{*/}
{/* size: 'large',*/}
{/* prefix: <LockOutlined />,*/}
{/* }}*/}
{/* captchaProps={{*/}
{/* size: 'large',*/}
{/* }}*/}
{/* placeholder={intl.formatMessage({*/}
{/* id: 'pages.login.captcha.placeholder',*/}
{/* defaultMessage: '请输入验证码',*/}
{/* })}*/}
{/* captchaTextRender={(timing, count) => {*/}
{/* if (timing) {*/}
{/* return `${count} ${intl.formatMessage({*/}
{/* id: 'pages.getCaptchaSecondText',*/}
{/* defaultMessage: '获取验证码',*/}
{/* })}`;*/}
{/* }*/}
{/* return intl.formatMessage({*/}
{/* id: 'pages.login.phoneLogin.getVerificationCode',*/}
{/* defaultMessage: '获取验证码',*/}
{/* });*/}
{/* }}*/}
{/* name="captcha"*/}
{/* rules={[*/}
{/* {*/}
{/* required: true,*/}
{/* message: (*/}
{/* <FormattedMessage*/}
{/* id="pages.login.captcha.required"*/}
{/* defaultMessage="请输入验证码!"*/}
{/* />*/}
{/* ),*/}
{/* },*/}
{/* ]}*/}
{/* onGetCaptcha={async (phone) => {*/}
{/* const result = await getFakeCaptcha({*/}
{/* phone,*/}
{/* });*/}
{/* if (!result) {*/}
{/* return;*/}
{/* }*/}
{/* message.success('获取验证码成功!验证码为:1234');*/}
{/* }}*/}
{/*/>*/}
</>
)}
<div
......@@ -367,11 +368,10 @@ const Login: React.FC = () => {
{/* float: 'right',*/}
{/* }}*/}
{/*>*/}
{/* /!*<FormattedMessage id="pages.login.forgotPassword" defaultMessage="忘记密码" />*!/*/}
{/* <FormattedMessage id="pages.login.forgotPassword" defaultMessage="忘记密码" />*/}
{/*</a>*/}
</div>
</LoginForm>
<FsQr />
</div>
{/*<Footer />*/}
</div>
......
......@@ -23,6 +23,15 @@ export async function getRuleList (body:ROLE_API.RuleParmes ) {
})
}
export async function getAbleMember (body:ROLE_API.RuleParmes ) {
return request<ROLE_API.RuleResult>('/api/member/getAbleMember', {
method: 'GET',
params: body
})
}
// 获取菜单列表
export async function getMenuPage (body:ROLE_API.RuleParmes ) {
return request<ROLE_API.RuleResult>('/api/permission/getMenuPage', {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册