From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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..f735912 100644
--- a/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
@@ -43,7 +43,7 @@
import MyCreateButton from "../../../components/MyCreateButton";
import MyExportButton from '../../../components/MyExportButton';
import PageDrawer from "../../../components/PageDrawer";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import DictDataEdit from "./DictDataEdit";
import { use } from "react";
@@ -105,10 +105,10 @@
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" }}
+ sort={{ field: "sort", order: "asc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -117,11 +117,11 @@
<MyExportButton />
</TopToolbar>
)}
- perPage={DEFAULT_PAGE_SIZE}
+ perPage={DEFAULT_ITEM_PAGE_SIZE}
>
<StyledDatagrid
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource ,record)=> {
+ rowClick={(id, resource, record) => {
setSelect(record)
setEditDialog(true)
}}
@@ -140,10 +140,7 @@
<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) }} label="ra.action.edit"></Button>
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode='pessimistic' redirect={"/dictType/" + dictId} />
</WrapperField>
</StyledDatagrid>
--
Gitblit v1.9.1