From 07ff08d0316e1af314649b16742ac03f6dc3909b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 09 九月 2024 16:29:44 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/user/UserCreate.jsx | 37 +++++--------------------------------
zy-acs-flow/src/page/user/UserList.jsx | 1 -
zy-acs-flow/src/page/components/TreeSelectInput.jsx | 4 ++--
3 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/zy-acs-flow/src/page/components/TreeSelectInput.jsx b/zy-acs-flow/src/page/components/TreeSelectInput.jsx
index 1c0fc47..d53b767 100644
--- a/zy-acs-flow/src/page/components/TreeSelectInput.jsx
+++ b/zy-acs-flow/src/page/components/TreeSelectInput.jsx
@@ -5,7 +5,7 @@
import * as Common from '@/utils/common';
import { useFormContext } from 'react-hook-form';
-const TreeSelectInput = ({ value, onChange, label, isTranslate = false, resource, ...rest }) => {
+const TreeSelectInput = ({ resource, label, source = 'parentId', value, isTranslate = false, ...rest }) => {
const translate = useTranslate();
const { setValue } = useFormContext();
const [filter, setFilter] = React.useState("");
@@ -31,7 +31,7 @@
const handleChange = (event) => {
const val = event.target.value;
setProxyVal(val);
- setValue('parentId', val, {
+ setValue(source, val, {
shouldValidate: true,
shouldDirty: true,
});
diff --git a/zy-acs-flow/src/page/user/UserCreate.jsx b/zy-acs-flow/src/page/user/UserCreate.jsx
index 27ae515..04e888d 100644
--- a/zy-acs-flow/src/page/user/UserCreate.jsx
+++ b/zy-acs-flow/src/page/user/UserCreate.jsx
@@ -30,6 +30,7 @@
import DialogCloseButton from "../components/DialogCloseButton";
import StatusSelectInput from "../components/StatusSelectInput";
import MemoInput from "../components/MemoInput";
+import TreeSelectInput from "../components/TreeSelectInput";
const UserCreate = (props) => {
const { open, setOpen } = props;
@@ -93,13 +94,6 @@
validate={required()}
/>
</Grid>
- {/* <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.user.password"
- source="password"
- parse={v => v}
- />
- </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.user.nickname"
@@ -107,13 +101,6 @@
parse={v => v}
/>
</Grid>
- {/* <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.user.avatar"
- source="avatar"
- parse={v => v}
- />
- </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.user.code"
@@ -146,26 +133,12 @@
parse={v => v}
/>
</Grid>
- {/* <Grid item xs={6} display="flex" gap={1}>
- <SelectInput
- label="table.field.user.emailVerified"
- source="emailVerified"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- />
- </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
- <ReferenceInput
+ <TreeSelectInput
+ resource="dept"
+ label="table.field.user.deptId"
source="deptId"
- reference="dept"
- >
- <AutocompleteInput
- label="table.field.user.deptId"
- optionText="name"
- />
- </ReferenceInput>
+ />
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
diff --git a/zy-acs-flow/src/page/user/UserList.jsx b/zy-acs-flow/src/page/user/UserList.jsx
index d81b4d8..e7de371 100644
--- a/zy-acs-flow/src/page/user/UserList.jsx
+++ b/zy-acs-flow/src/page/user/UserList.jsx
@@ -44,7 +44,6 @@
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': {
--
Gitblit v1.9.1