From d692259553b83ed00ada0ba2792ae91704a4def2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 13:52:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/system/userLogin/UserLoginList.jsx | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/system/userLogin/UserLoginList.jsx b/rsf-admin/src/page/system/userLogin/UserLoginList.jsx
index b8758f8..4f66a88 100644
--- a/rsf-admin/src/page/system/userLogin/UserLoginList.jsx
+++ b/rsf-admin/src/page/system/userLogin/UserLoginList.jsx
@@ -100,7 +100,7 @@
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.userLogin"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -120,8 +120,6 @@
preferenceKey='userLogin'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <UserLoginPanel />}
- expandSingle={true}
omit={['id', 'memo', 'type', 'system', 'updateTime']}
>
<NumberField source="id" />
--
Gitblit v1.9.1