Merge branch 'front' into devlop

skyouc

2025-03-19 3bd07e5f90d5d832b8502252e1daebdd014320f8

 rsf-admin/src/page/login/index.jsx

@@ -17,7 +17,7 @@
    useNotify,
} from 'react-admin';
import { LOGIN_BACKGROUND } from '@/config/setting';
import { tenants } from '@/api/auth';
import { getSystemInfo, tenants } from '@/api/auth';
import Login from "./Login";
import Register from "./Register";

@@ -27,11 +27,15 @@
    const isSmallScreen = useMediaQuery(theme.breakpoints.down('md'));

    const [tab, setTab] = useState(0)
    const [systemInfo, setSystemInfo] = useState({});
    const [tenantList, setTenantList] = useState([]);

    const formPosition = isSmallScreen ? 'middle' : 'right'

    useEffect(() => {
        getSystemInfo().then(data => {
            setSystemInfo(data);
        })
        tenants().then(data => {
            setTenantList(data);
        })
@@ -87,21 +91,27 @@
                    </AppBar>
                </div>

                <Tabs
                    value={tab}
                    onChange={(event, value) => {
                        setTab(value);
                    }}
                    indicatorColor="primary"
                    textColor="primary"
                    variant="fullWidth"
                >
                    <Tab label={translate('page.login.tab.login')} sx={{ fontSize: '.8em' }} />
                    <Tab label={translate('page.login.tab.register')} sx={{ fontSize: '.8em' }} />
                </Tabs>
                {systemInfo.mode === 'ONLINE' ? (
                    <>
                        <Tabs
                            value={tab}
                            onChange={(event, value) => {
                                setTab(value);
                            }}
                            indicatorColor="primary"
                            textColor="primary"
                            variant="fullWidth"
                        >
                            <Tab label={translate('page.login.tab.login')} sx={{ fontSize: '.8em' }} />
                            <Tab label={translate('page.login.tab.register')} sx={{ fontSize: '.8em' }} />
                        </Tabs>

                {tab === 0 && <Login tenantList={tenantList} />}
                {tab === 1 && <Register tenantList={tenantList} />}
                        {tab === 0 && <Login systemInfo={systemInfo} tenantList={tenantList} />}
                        {tab === 1 && <Register systemInfo={systemInfo} tenantList={tenantList} />}
                    </>
                ) : (
                    <Login systemInfo={systemInfo} tenantList={tenantList} />
                )}

                <Box mb={1} sx={{ textAlign: 'center' }}>
                    <Typography variant="caption" align="center">{translate("page.login.footer")}</Typography>