From fdca988cb219c42a686a457b2d4f2b2c589a5c39 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 09 九月 2024 16:23:16 +0800 Subject: [PATCH] # --- zy-acs-flow/src/page/dept/DeptEdit.jsx | 4 +++- zy-acs-flow/src/page/menu/MenuEdit.jsx | 4 +++- zy-acs-flow/src/page/user/UserList.jsx | 7 ++++--- zy-acs-flow/src/page/components/TreeSelectInput.jsx | 3 +-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/zy-acs-flow/src/page/components/TreeSelectInput.jsx b/zy-acs-flow/src/page/components/TreeSelectInput.jsx index 8799c53..1c0fc47 100644 --- a/zy-acs-flow/src/page/components/TreeSelectInput.jsx +++ b/zy-acs-flow/src/page/components/TreeSelectInput.jsx @@ -5,9 +5,8 @@ import * as Common from '@/utils/common'; import { useFormContext } from 'react-hook-form'; -const TreeSelectInput = ({ value, onChange, label, isTranslate = false, ...rest }) => { +const TreeSelectInput = ({ value, onChange, label, isTranslate = false, resource, ...rest }) => { const translate = useTranslate(); - const { resource } = useCreateContext(); const { setValue } = useFormContext(); const [filter, setFilter] = React.useState(""); const [treeData, setTreeData] = React.useState([]); diff --git a/zy-acs-flow/src/page/dept/DeptEdit.jsx b/zy-acs-flow/src/page/dept/DeptEdit.jsx index 2cd7cf0..7e8adfe 100644 --- a/zy-acs-flow/src/page/dept/DeptEdit.jsx +++ b/zy-acs-flow/src/page/dept/DeptEdit.jsx @@ -17,6 +17,7 @@ Form, useUpdate, useCreate, + useCreateContext, } from 'react-admin'; import { Dialog, @@ -33,13 +34,14 @@ import TreeSelectInput from "../components/TreeSelectInput"; const EditContent = ({ editRecord }) => { + const { resource } = useCreateContext(); return ( <Grid container rowSpacing={2} columnSpacing={2}> <Grid item xs={6} display="flex" gap={1}> <TreeSelectInput label="table.field.dept.parentName" value={editRecord?.parentId} - autoFocus + resource={resource} /> </Grid> <Grid item xs={6} display="flex" gap={1}> diff --git a/zy-acs-flow/src/page/menu/MenuEdit.jsx b/zy-acs-flow/src/page/menu/MenuEdit.jsx index bd1358e..213ee2a 100644 --- a/zy-acs-flow/src/page/menu/MenuEdit.jsx +++ b/zy-acs-flow/src/page/menu/MenuEdit.jsx @@ -17,6 +17,7 @@ Form, useUpdate, useCreate, + useCreateContext, } from 'react-admin'; import { Dialog, @@ -33,6 +34,7 @@ import TreeSelectInput from "../components/TreeSelectInput"; const EditContent = ({ editRecord }) => { + const { resource } = useCreateContext(); return ( <Grid container rowSpacing={2} columnSpacing={2}> <Grid item xs={6} display="flex" gap={1}> @@ -40,7 +42,7 @@ label="table.field.menu.parentName" value={editRecord?.parentId} isTranslate - autoFocus + resource={resource} /> </Grid> <Grid item xs={6} display="flex" gap={1}> diff --git a/zy-acs-flow/src/page/user/UserList.jsx b/zy-acs-flow/src/page/user/UserList.jsx index 74a3bdb..d81b4d8 100644 --- a/zy-acs-flow/src/page/user/UserList.jsx +++ b/zy-acs-flow/src/page/user/UserList.jsx @@ -44,6 +44,7 @@ import * as Common from '@/utils/common'; import UserListAside from "./UserListAside"; import RolesField from './RolesField'; +import TreeSelectInput from "../components/TreeSelectInput"; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -82,9 +83,9 @@ />, <TextInput source="phone" label="table.field.user.phone" />, <TextInput source="email" label="table.field.user.email" />, - <ReferenceInput source="deptId" label="table.field.user.deptId" reference="dept"> - <AutocompleteInput label="table.field.user.deptId" optionText="name" /> - </ReferenceInput>, + // <ReferenceInput source="deptId" label="table.field.user.deptId" reference="dept"> + // <AutocompleteInput label="table.field.user.deptId" optionText="name" /> + // </ReferenceInput>, <TextInput source="realName" label="table.field.user.realName" />, <TextInput source="idCard" label="table.field.user.idCard" />, -- Gitblit v1.9.1