From e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 七月 2025 17:10:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/deviceBind/DeviceBindList.jsx | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/deviceBind/DeviceBindList.jsx b/rsf-admin/src/page/deviceBind/DeviceBindList.jsx
index 795fb55..d845a49 100644
--- a/rsf-admin/src/page/deviceBind/DeviceBindList.jsx
+++ b/rsf-admin/src/page/deviceBind/DeviceBindList.jsx
@@ -120,10 +120,9 @@
<StyledDatagrid
preferenceKey='deviceBind'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <DeviceBindPanel />}
+ rowClick={(id, resource, record) => false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','updateBy','emptySimilar']}
>
<NumberField source="id" />
<NumberField source="currentRow" label="table.field.deviceBind.currentRow" />
@@ -146,8 +145,7 @@
<ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
- <DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <DateField source="createTime" label="common.field.createTime" showTime />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
--
Gitblit v1.9.1