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/waveRule/WaveRuleList.jsx | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/waveRule/WaveRuleList.jsx b/rsf-admin/src/page/waveRule/WaveRuleList.jsx
index f370efe..dbc6feb 100644
--- a/rsf-admin/src/page/waveRule/WaveRuleList.jsx
+++ b/rsf-admin/src/page/waveRule/WaveRuleList.jsx
@@ -97,7 +97,7 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.waveRule"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -113,16 +113,14 @@
<StyledDatagrid
preferenceKey='waveRule'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expand={() => <WaveRulePanel />}
+ rowClick={(id, resource, record) => false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool','updateBy']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.waveRule.code" />
- <NumberField source="type" label="table.field.waveRule.type" />
+ <TextField source="type$" label="table.field.waveRule.type" />
<TextField source="name" label="table.field.waveRule.name" />
-
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
--
Gitblit v1.9.1