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/basicInfo/matnrGroup/MatnrGroupList.jsx | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
index 8436018..74b125e 100644
--- a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupList.jsx
@@ -39,15 +39,16 @@
const TITLE = 'menu.matnrGroup';
const columns = [
- {
- id: 'name',
- label: 'table.field.matnrGroup.name',
- minWidth: 200,
- },
+
{
id: 'code',
label: 'table.field.matnrGroup.code',
minWidth: 80,
+ },
+ {
+ id: 'name',
+ label: 'table.field.matnrGroup.name',
+ Width: 100,
},
{
id: 'parentId',
@@ -160,7 +161,7 @@
const [createDialog, setCreateDialog] = React.useState(false);
const [editRecord, setEditRecord] = React.useState(null);
const [openNodes, setOpenNodes] = React.useState({});
- const [expandAll, setExpandAll] = React.useState(false);
+ const [expandAll, setExpandAll] = React.useState(true);
const http = async () => {
const res = await request.post(RESOURCE + '/tree', {
@@ -227,6 +228,23 @@
});
};
+ // 鍒濆鍖� openNodes 浠ュ睍寮�鎵�鏈夎妭鐐�
+ React.useEffect(() => {
+ if (treeData) {
+ const newOpenNodes = {};
+ const updateOpenNodes = (nodes) => {
+ nodes.forEach(node => {
+ newOpenNodes[node.id] = true;
+ if (node.children) {
+ updateOpenNodes(node.children);
+ }
+ });
+ };
+ updateOpenNodes(treeData);
+ setOpenNodes(newOpenNodes);
+ }
+ }, [treeData]);
+
return (
<div>
<MatnrGroupEdit
@@ -250,8 +268,8 @@
>
{expandAll ? translate('common.action.collapseAll') : translate('common.action.expandAll')}
</Button>
- {/* <TextField
- label="Search"
+ <TextField
+ label="鎼滅储鍚嶇О"
value={filter}
onChange={({ target }) => {
setFilter(target.value)
@@ -260,7 +278,7 @@
size="small"
margin="dense"
fullWidth
- /> */}
+ />
</Box>
<Box>
<Button
@@ -336,4 +354,4 @@
);
}
-export default MatnrGroupList;
+export default MatnrGroupList;
\ No newline at end of file
--
Gitblit v1.9.1