From a11e93f691f128763fa3c441f0936abec7a9655e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 16:38:47 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx b/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
index c039b96..5d6655a 100644
--- a/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
@@ -105,7 +105,7 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.dictData"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
filter={{ dictTypeId: dictId }}
sort={{ field: "create_time", order: "desc" }}
@@ -121,7 +121,7 @@
>
<StyledDatagrid
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource ,record)=> {
+ rowClick={(id, resource, record) => {
setSelect(record)
setEditDialog(true)
}}
@@ -140,19 +140,18 @@
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
- {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} type="button" redirect={"/dictType/" + dictId} onClick={()=> {
- setEditDialog(true)
- }} /> */}
- <Button onClick={()=>{setEditDialog(true)}}>缂栬緫</Button>
+ <Button onClick={() => { setEditDialog(true) }}>缂栬緫</Button>
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode='pessimistic' redirect={"/dictType/" + dictId} />
</WrapperField>
</StyledDatagrid>
</List>
- <DictDataEdit
- open={editDialog}
- record={select}
- setOpen={setEditDialog}
- />
+ if (!select == null) {
+ <DictDataEdit
+ open={editDialog}
+ record={select}
+ setOpen={setEditDialog}
+ />
+ }
<DictDataCreate
open={createDialog}
record={dicts}
--
Gitblit v1.9.1