From 08824ef346ed8af8eafd6a5480c42dbe0daaf1f2 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 27 二月 2025 10:25:44 +0800
Subject: [PATCH] #

---
 rsf-admin/src/page/components/EditTopToolBar.jsx      |    2 
 rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx |    6 -
 rsf-admin/src/page/dictData/DictDataList.jsx          |  151 +++++++++++++++++++++----------------
 rsf-admin/src/page/dictType/DictTypeList.jsx          |   18 ++-
 rsf-admin/src/page/dictData/DictDataEdit.jsx          |    3 
 rsf-admin/src/page/dictType/DictTypeEdit.jsx          |    3 
 6 files changed, 100 insertions(+), 83 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx
index 5246f3a..9f5617b 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrListAside.jsx
@@ -43,16 +43,10 @@
     useEffect(() => {
         request.post('/matnrGroup/tree')
             .then(res => {
-                console.log('Tree Data:', res);
                 if (res?.data?.code === 200) {
                     let data = res.data.data;
-                    // for (let k of data) {
-                    //     k.id = k.id.toString();
-
-                    // }
                     let items = haveChildren(data)
                     setTreeData(items)
-                    console.log('Tree Data:', items);
                 } else {
                     notify(res.data.msg);
                 }
diff --git a/rsf-admin/src/page/components/EditTopToolBar.jsx b/rsf-admin/src/page/components/EditTopToolBar.jsx
index c238797..fbbdb38 100644
--- a/rsf-admin/src/page/components/EditTopToolBar.jsx
+++ b/rsf-admin/src/page/components/EditTopToolBar.jsx
@@ -8,6 +8,8 @@
     const navigate = useNavigate();
     const resource = useResourceContext();
     const translate = useTranslate();
+
+    
     return (
         <TopToolbar sx={{
             marginTop: 1,
diff --git a/rsf-admin/src/page/dictData/DictDataEdit.jsx b/rsf-admin/src/page/dictData/DictDataEdit.jsx
index b267372..6eed851 100644
--- a/rsf-admin/src/page/dictData/DictDataEdit.jsx
+++ b/rsf-admin/src/page/dictData/DictDataEdit.jsx
@@ -43,11 +43,12 @@
 const DictDataEdit = () => {
     const translate = useTranslate();
 
+
     return (
         <Edit
             redirect="list"
             mutationMode={EDIT_MODE}
-            actions={<CustomerTopToolBar />}
+            actions={<CustomerTopToolBar backPrevious={true} />}
             aside={<EditBaseAside />}
         >
             <SimpleForm
diff --git a/rsf-admin/src/page/dictData/DictDataList.jsx b/rsf-admin/src/page/dictData/DictDataList.jsx
index d20971b..0770711 100644
--- a/rsf-admin/src/page/dictData/DictDataList.jsx
+++ b/rsf-admin/src/page/dictData/DictDataList.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect, useMemo, useCallback } from "react";
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router-dom';
 import {
     List,
     DatagridConfigurable,
@@ -43,6 +43,8 @@
 import MyField from "../components/MyField";
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
 import * as Common from '@/utils/common';
+import CustomerTopToolBar from "../components/EditTopToolBar";
+
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
     '& .css-1vooibu-MuiSvgIcon-root': {
@@ -87,75 +89,90 @@
 
     const [createDialog, setCreateDialog] = useState(false);
     const [drawerVal, setDrawerVal] = useState(false);
+    const [fit, setFilters] = useState(filters);
+    const location = useLocation();
+    const queryParams = new URLSearchParams(location.search);
+    const dictTypeId = queryParams.get('dictTypeId');
+    console.log(dictTypeId);
+    if (dictTypeId != null && dictTypeId != undefined) {
+        console.log(dictTypeId);
+        console.log(fit);
+    }
 
     return (
-        <Box display="flex">
-            <List
-                sx={{
-                    flexGrow: 1,
-                    transition: (theme) =>
-                        theme.transitions.create(['all'], {
-                            duration: theme.transitions.duration.enteringScreen,
-                        }),
-                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
-                }}
-                title={"menu.dictData"}
-                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
-                filters={filters}
-                sort={{ field: "create_time", order: "desc" }}
-                actions={(
-                    <TopToolbar>
-                        <FilterButton />
-                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
-                        <SelectColumnsButton preferenceKey='dictData' />
-                        <MyExportButton />
-                    </TopToolbar>
-                )}
-                perPage={DEFAULT_PAGE_SIZE}
-            >
-                <StyledDatagrid
-                    preferenceKey='dictData'
-                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
-                    rowClick={(id, resource, record) => false}
-                    expand={() => <DictDataPanel />}
-                    expandSingle={true}
-                    omit={['id', 'createTime', 'createBy', 'memo']}
-                >
-                    <NumberField source="id" />
-                    <TextField source="dictTypeId" label="table.field.dictData.dictTypeId" />
-                    <TextField source="dictTypeCode" label="table.field.dictData.dictTypeCode" />
-                    <TextField source="value" label="table.field.dictData.value" />
-                    <TextField source="label" label="table.field.dictData.label" />
-                    <NumberField source="sort" label="table.field.dictData.sort" />
-                    <TextField source="color" label="table.field.dictData.color" />
+        <>
+            {dictTypeId && <CustomerTopToolBar backPrevious={true} />}
+            <Box display="flex" >
 
-                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
-                        <TextField source="nickname" />
-                    </ReferenceField>
-                    <DateField source="updateTime" label="common.field.updateTime" showTime />
-                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
-                        <TextField source="nickname" />
-                    </ReferenceField>
-                    <DateField source="createTime" label="common.field.createTime" showTime />
-                    <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' }} />
-                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
-                    </WrapperField>
-                </StyledDatagrid>
-            </List>
-            <DictDataCreate
-                open={createDialog}
-                setOpen={setCreateDialog}
-            />
-            <PageDrawer
-                title='DictData Detail'
-                drawerVal={drawerVal}
-                setDrawerVal={setDrawerVal}
-            >
-            </PageDrawer>
-        </Box>
+                <List
+                    sx={{
+                        flexGrow: 1,
+                        transition: (theme) =>
+                            theme.transitions.create(['all'], {
+                                duration: theme.transitions.duration.enteringScreen,
+                            }),
+                        marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+                    }}
+                    title={"menu.dictData"}
+                    empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+                    filters={filters}
+                    filter={dictTypeId ? { dictTypeId } : undefined}
+                    sort={{ field: "create_time", order: "desc" }}
+                    actions={(
+                        <TopToolbar>
+                            <FilterButton />
+                            <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+                            <SelectColumnsButton preferenceKey='dictData' />
+                            <MyExportButton />
+                        </TopToolbar>
+                    )}
+                    perPage={DEFAULT_PAGE_SIZE}
+                >
+                    <StyledDatagrid
+                        preferenceKey='dictData'
+                        bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+                        rowClick={(id, resource, record) => false}
+                        expand={() => <DictDataPanel />}
+                        expandSingle={true}
+                        omit={['id', 'createTime', 'createBy', 'memo']}
+                    >
+                        <NumberField source="id" />
+                        <TextField source="dictTypeId" label="table.field.dictData.dictTypeId" />
+                        <TextField source="dictTypeCode" label="table.field.dictData.dictTypeCode" />
+                        <TextField source="value" label="table.field.dictData.value" />
+                        <TextField source="label" label="table.field.dictData.label" />
+                        <NumberField source="sort" label="table.field.dictData.sort" />
+                        <TextField source="color" label="table.field.dictData.color" />
+
+                        <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+                            <TextField source="nickname" />
+                        </ReferenceField>
+                        <DateField source="updateTime" label="common.field.updateTime" showTime />
+                        <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+                            <TextField source="nickname" />
+                        </ReferenceField>
+                        <DateField source="createTime" label="common.field.createTime" showTime />
+                        <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' }} />
+                            <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+                        </WrapperField>
+                    </StyledDatagrid>
+                </List>
+                <DictDataCreate
+                    open={createDialog}
+                    setOpen={setCreateDialog}
+                />
+                <PageDrawer
+                    title='DictData Detail'
+                    drawerVal={drawerVal}
+                    setDrawerVal={setDrawerVal}
+                >
+                </PageDrawer>
+            </Box>
+        </>
+
     )
 }
 
diff --git a/rsf-admin/src/page/dictType/DictTypeEdit.jsx b/rsf-admin/src/page/dictType/DictTypeEdit.jsx
index 58a64d0..96ace70 100644
--- a/rsf-admin/src/page/dictType/DictTypeEdit.jsx
+++ b/rsf-admin/src/page/dictType/DictTypeEdit.jsx
@@ -31,7 +31,6 @@
 
 const FormToolbar = () => {
     const { getValues } = useFormContext();
-
     return (
         <Toolbar sx={{ justifyContent: 'space-between' }}>
             <SaveButton />
@@ -42,7 +41,7 @@
 
 const DictTypeEdit = () => {
     const translate = useTranslate();
-
+    
     return (
         <Edit
             redirect="list"
diff --git a/rsf-admin/src/page/dictType/DictTypeList.jsx b/rsf-admin/src/page/dictType/DictTypeList.jsx
index 89405ed..dc30eae 100644
--- a/rsf-admin/src/page/dictType/DictTypeList.jsx
+++ b/rsf-admin/src/page/dictType/DictTypeList.jsx
@@ -85,6 +85,11 @@
     const [createDialog, setCreateDialog] = useState(false);
     const [drawerVal, setDrawerVal] = useState(false);
 
+    const navigate = useNavigate();
+    const assign = (record) => {
+        navigate(`/dictData?dictTypeId=${record.id}`);
+    }
+
     return (
         <Box display="flex">
             <List
@@ -119,7 +124,12 @@
                     omit={['id', 'createTime', 'createBy', 'memo']}
                 >
                     <NumberField source="id" />
-                    <TextField source="code" label="table.field.dictType.code" />
+                    <MyField source="code" label="table.field.dictType.code"
+                        onClick={(event, record, val) => {
+                            event.stopPropagation();
+                            assign(record);
+                        }}
+                    />
                     <TextField source="name" label="table.field.dictType.name" />
                     <TextField source="description" label="table.field.dictType.description" />
 
@@ -143,12 +153,6 @@
                 open={createDialog}
                 setOpen={setCreateDialog}
             />
-            <PageDrawer
-                title='DictType Detail'
-                drawerVal={drawerVal}
-                setDrawerVal={setDrawerVal}
-            >
-            </PageDrawer>
         </Box>
     )
 }

--
Gitblit v1.9.1