#

vincentlu

2025-02-10 07ce1e9ee6f723882c9b49e23215745ee719633a

#

 rsf-admin/src/i18n/en.js

@@ -225,10 +225,16 @@
            title: 'Welcome',
            footer: 'Footer Goes Here',
            tenant: 'Company',
            username: 'Username',
            password: 'Password',
            confirmPwd: 'Confirm Password',
            tab: {
                login: 'SIGN IN',
                register: 'SIGN UP',
            },
            button: {
                login: 'LOG IN',
                register: 'REGISTER',
                login: 'SIGN IN',
                register: 'SIGN UP',
            },
        },
        settings: {

 rsf-admin/src/i18n/zh.js

@@ -222,10 +222,16 @@
    page: {
        welcome: '  欢迎使用RSF管理系统',
        login: {
            title: 'Welcome',
            title: '欢迎使用',
            footer: 'Footer Goes Here',
            tenant: '公司',
            username: '账号',
            password: '密码',
            confirmPwd: '确认密码',
            tab: {
                login: '登录',
                register: '注册',
            },
            button: {
                login: '登录',
                register: '注册',

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

@@ -123,7 +123,7 @@
                        render={({ field }) => (
                            <TextField
                                {...field}
                                label={translate('ra.auth.username')}
                                label={translate("page.login.username")}
                                variant="standard"
                                disabled={loading}
                                autoFocus
@@ -140,7 +140,7 @@
                        render={({ field }) => (
                            <TextField
                                {...field}
                                label={translate('ra.auth.password')}
                                label={translate("page.login.password")}
                                type={showPassword ? 'text' : 'password'}
                                variant="standard"
                                disabled={loading}

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

@@ -96,8 +96,8 @@
                    textColor="primary"
                    variant="fullWidth"
                >
                    <Tab label="Login" sx={{ fontSize: '.8em' }} />
                    <Tab label="Register" sx={{ fontSize: '.8em' }} />
                    <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} />}

 rsf-admin/src/page/role/AssignPermissions.jsx

@@ -3,7 +3,7 @@
    useTranslate,
    useNotify,
} from 'react-admin';
import { Box, Button, Card, Stack, CardContent } from '@mui/material';
import { Box, Button, Card, Stack, CardContent, Skeleton } from '@mui/material';
import { SimpleTreeView, TreeItem, RichTreeView, useTreeViewApiRef } from '@mui/x-tree-view';
import SaveIcon from '@mui/icons-material/Save';
import request from '@/utils/request'
@@ -15,10 +15,11 @@
    const translate = useTranslate();
    const notify = useNotify();

    const [treeData, setTreeData] = React.useState([]);
    const [selectedItems, setSelectedItems] = React.useState([]);
    const [expandedItems, setExpandedItems] = React.useState([]);
    const toggledItemRef = React.useRef({});
    const [loading, setLoading] = useState(false);
    const [treeData, setTreeData] = useState([]);
    const [selectedItems, setSelectedItems] = useState([]);
    const [expandedItems, setExpandedItems] = useState([]);
    const toggledItemRef = useRef({});
    const apiRef = useTreeViewApiRef();

    useEffect(() => {
@@ -46,8 +47,10 @@
                notify(res.data.msg, { type: 'error' });
            }
        }
        setLoading(true);
        setTimeout(() => {
            http();
            setLoading(false);
        }, 200);
    }, [role, originMenuIds])

@@ -197,22 +200,27 @@
                            boxShadow: '0 1px 2px rgba(0, 0, 0, 0.2)',
                            backgroundColor: 'background.paper',
                        }}>
                            <RichTreeView
                                multiSelect
                                checkboxSelection
                                apiRef={apiRef}
                                items={treeData}
                                selectedItems={selectedItems}
                                onSelectedItemsChange={handleSelectedItemsChange}
                                onItemSelectionToggle={(event, itemId, isSelected) => {
                                    toggledItemRef.current[itemId] = isSelected;
                                }}
                            {loading ? (
                                <SkeletonBox />
                            ) : (
                                <RichTreeView
                                    multiSelect
                                    checkboxSelection
                                    apiRef={apiRef}
                                    items={treeData}
                                    selectedItems={selectedItems}
                                    onSelectedItemsChange={handleSelectedItemsChange}
                                    onItemSelectionToggle={(event, itemId, isSelected) => {
                                        toggledItemRef.current[itemId] = isSelected;
                                    }}

                                expandedItems={expandedItems}
                                onExpandedItemsChange={(event, itemIds) => {
                                    setExpandedItems(itemIds);
                                }}
                            />
                                    expandedItems={expandedItems}
                                    onExpandedItemsChange={(event, itemIds) => {
                                        setExpandedItems(itemIds);
                                    }}
                                />
                            )}

                        </Box>
                    </Box>
                    <Box sx={{
@@ -326,4 +334,23 @@
    return childrenIds;
};

const SkeletonBox = () => {
    return (
        <Stack spacing={1}>
            <Skeleton variant="rounded" width={200} height={20} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
            <Skeleton variant="rounded" width={200} height={20} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
            <Skeleton variant="rounded" width={200} height={20} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
            <Skeleton variant="rounded" width={200} height={20} style={{ marginLeft: '50px' }} />
        </Stack>
    )
}

export default AssignPermissions;