Merge remote-tracking branch 'origin/dev' into dev

whycq

2025-02-17 128dfa5e1407751bc208c1999930b14c3eb864d8

 rsf-admin/src/page/settings/BaseSettings.jsx

@@ -17,15 +17,31 @@
    MenuItem,
    FormHelperText,
    CircularProgress,
    LinearProgress,
} from '@mui/material';
import { updateUserInfo } from '@/api/auth';
import avatar from '/avatar.jpg'

const BaseSettings = (props) => {
    const translate = useTranslate();
    const notify = useNotify();
    const { children, value, userInfo } = props;
    const { children, userInfo } = props;

    const { control, handleSubmit, watch, setValue, getValues, formState: { isDirty } } = useForm();
    const {
        control,
        handleSubmit,
        watch,
        setValue,
        getValues,
        reset,
        formState: {
            errors,
            isDirty,
        },
        setError,
        clearErrors,
    } = useForm();

    const [loading, setLoading] = useState(false);

    useEffect(() => {
@@ -48,6 +64,17 @@
            const { code, msg, data } = res;
            if (code === 200) {
                notify(msg, { type: 'success', messageArgs: { _: msg } });
                const userToPersist = {
                    avatar: avatar,
                    fullName: data.nickname,
                    id: data.id,
                    username: data.username
                }
                localStorage.setItem("user", JSON.stringify(userToPersist));
            } else if (code === 10005 || code === 10006) {
                setError('email', {
                    message: msg
                })
            } else {
                notify(msg, { type: 'error', messageArgs: { _: msg } });
            }
@@ -59,15 +86,23 @@
    }

    return (
        <Box
            hidden={value !== 0}
            sx={{
                p: 3,
                flex: 1,
                overflow: 'auto',
            }}
        >
            {/* https://github.com/themeselection/materio-mui-nextjs-admin-template-free/blob/main/javascript-version/src/views/account-settings/account/AccountDetails.jsx */}
        <Box sx={{
            position: 'relative',
            p: 3,
            flex: 1,
            overflow: 'auto',
        }}>
            {!userInfo && (
                <LinearProgress
                    sx={{
                        height: "2px",
                        position: 'absolute',
                        top: 0,
                        left: 0,
                        right: 0,
                    }}
                />
            )}
            <form onSubmit={handleSubmit(onSubmit)} noValidate>
                <Stack
                    direction='column'