From 735c1b82a64d48ef7fc9e274b971732ab0693345 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 13:41:04 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java | 4 ++++
rsf-admin/src/page/matnr/MatnrListAside.jsx | 31 +++++++++++++++++++++++++++++--
3 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/matnr/MatnrListAside.jsx b/rsf-admin/src/page/matnr/MatnrListAside.jsx
index 7daf80b..8168b58 100644
--- a/rsf-admin/src/page/matnr/MatnrListAside.jsx
+++ b/rsf-admin/src/page/matnr/MatnrListAside.jsx
@@ -3,6 +3,7 @@
import {
SavedQueriesList,
FilterLiveSearch,
+ useNotify,
FilterList,
FilterListItem,
useStore,
@@ -22,9 +23,32 @@
const MatListAside = () => {
const theme = useTheme();
+ const notify = useNotify();
const { setFilters } = useListContext(); // 鑾峰彇鍒楄〃涓婁笅鏂�
const [selectedOption, setSelectedOption] = useState(null);
- const treeData = [
+ const [treeData, setTreeData] = useState([]);
+
+ useEffect(() => {
+ request.get('/matnrGroup/tree')
+ .then(res => {
+ console.log('Tree Data:', res);
+ if (res?.data?.code === 200) {
+ setTreeData(res.data.data);
+ } else {
+ notify(res.data);
+ }
+ })
+ .catch(error => {
+ notify('Error fetching tree data');
+ });
+
+
+
+ },[]);
+
+
+
+ const treeData1 = [
{
id: '19',
label: '鍗婃垚鍝� ',
@@ -63,6 +87,9 @@
setFilters({ groupId: nodeId });
// 鍦ㄨ繖閲屽彲浠ユ牴鎹� nodeId 鏇存柊涓诲唴瀹瑰尯鍩�
};
+ const handleSearch = () => {
+ console.log('Search Input:', selectedOption);
+ };
const CustomCheckbox = React.forwardRef(function CustomCheckbox(props, ref) {
@@ -96,7 +123,7 @@
>
<CardContent>
<SavedQueriesList icon={<BookmarkIcon />} />
- <FilterLiveSearch source='condition' hiddenLabel />
+ <FilterLiveSearch source="condition" />
<RichTreeView
defaultExpandedItems={['grid', 'pickers']}
expansionTrigger="iconContainer"
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
index a1ba42a..4d0887a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatnrGroupController.java
@@ -106,8 +106,8 @@
}
@PreAuthorize("hasAuthority('manager:matnrGroup:list')")
- @GetMapping("/matnrGroup/tree")
- public R tree() {
+ @PostMapping("/matnrGroup/tree")
+ public R tree(@RequestBody Map<String, Object> map) {
List<MatnrGroup> matnrs = matnrGroupService.list(new LambdaQueryWrapper<>());
List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
return R.ok().add(treeData);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
index acb2845..30f8dad 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
@@ -196,4 +196,8 @@
}
}
+ public String getLabel(){
+ return this.name;
+ }
+
}
--
Gitblit v1.9.1