Merge branch 'devlop_org' into devlop-phyz

skyouc

2025-12-25 ca36e3b92acaa53f042fd8af1920930af782efc6

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

@@ -12,15 +12,17 @@
const DEFAULT_EXPAND_ALL = true;

const AssignPermissions = (props) => {
    const { role, originMenuIds, setDrawerVal, closeCallback } = props;
    const { role, originMenuIds, setDrawerVal, closeCallback, authType } = props;
    const translate = useTranslate();
    const notify = useNotify();

    console.log("authType"+authType)

    const [loading, setLoading] = useState(false);
    const [treeData, setTreeData] = useState([]);
    const [selectedItems, setSelectedItems] = useState([]);
    const [expandedItems, setExpandedItems] = useState([]);
    const [parmas, setParmas] = useState({ condition: '' });
    const [parmas, setParmas] = useState({ condition: '', authType: authType });
    const toggledItemRef = useRef({});
    const apiRef = useTreeViewApiRef();

@@ -177,11 +179,11 @@
            <Card sx={{
                ml: 1,
                mr: 1,
                height: '620px'
                height: 'calc(100vh - 140px)',
                overflowY: 'auto'
            }}>
                <CardContent sx={{
                    overflow: 'auto',
                    height: '100%',
                    display: 'flex',
                    flexDirection: 'column',
                    justifyContent: 'space-between'
@@ -218,7 +220,6 @@
                        </Box>

                        <Box sx={{
                            height: 480,
                            minWidth: 290,
                            overflow: 'auto',
                            marginTop: '10px',