From 73de15331cb383949ae5adc230b208a04d987b37 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 26 十二月 2025 14:23:43 +0800
Subject: [PATCH] Merge branch 'devlop-phyz' of http://47.97.1.152:5880/r/wms-master into devlop-phyz
---
rsf-admin/src/page/system/role/AssignPermissions.jsx | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/system/role/AssignPermissions.jsx b/rsf-admin/src/page/system/role/AssignPermissions.jsx
index d9fd08b..d65fddf 100644
--- a/rsf-admin/src/page/system/role/AssignPermissions.jsx
+++ b/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',
--
Gitblit v1.9.1