|
@@ -6,76 +6,8 @@ import { connect } from 'dva';
|
|
|
|
|
|
function DepartmentField(props) {
|
|
|
const { value = [], onChange, defaultValue, depTrees } = props;
|
|
|
- // const [treeData, setTreeData] = useState([]);
|
|
|
|
|
|
- // const genTreeNode = dep => {
|
|
|
- // return {
|
|
|
- // id: dep.dept_id,
|
|
|
- // pId: dep.parent_id,
|
|
|
- // value: dep.dept_id,
|
|
|
- // title: dep.name,
|
|
|
- // isLeaf: false,
|
|
|
- // };
|
|
|
- // };
|
|
|
-
|
|
|
- // const onLoadData = async ({ id }) => {
|
|
|
- // let depList = await queryDDdepList({ dept_id: id });
|
|
|
-
|
|
|
- // console.log(depList);
|
|
|
- // if (depList.length > 0) {
|
|
|
- // let nodes = depList.map(genTreeNode);
|
|
|
- // setTreeData([...treeData, ...nodes]);
|
|
|
- // }
|
|
|
- // };
|
|
|
-
|
|
|
- const findDepName = (list, ID) => {
|
|
|
- let result = '';
|
|
|
- const dep = list.find(item => item.ID === ID);
|
|
|
- if (dep) {
|
|
|
- result = dep.Name;
|
|
|
- return result;
|
|
|
- }
|
|
|
- for (let index = 0; index < list.length; index++) {
|
|
|
- const element = list[index];
|
|
|
- if (element?.children && element?.children.length) {
|
|
|
- result = findDepName(element.children, ID);
|
|
|
- if (result) {
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- return result;
|
|
|
- };
|
|
|
-
|
|
|
- const findDepID = (list, Name) => {
|
|
|
- let result = '';
|
|
|
- const dep = list.find(item => item.Name === Name);
|
|
|
- if (dep) {
|
|
|
- result = dep.ID;
|
|
|
- } else {
|
|
|
- for (let index = 0; index < list.length; index++) {
|
|
|
- const element = list[index];
|
|
|
- if (element?.children && element?.children.length) {
|
|
|
- result = findDepID(element.children, Name);
|
|
|
- if (result) {
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- return result;
|
|
|
- };
|
|
|
-
|
|
|
- const defaultID = useMemo(() => {
|
|
|
- if (defaultValue !== undefined) {
|
|
|
- return findDepID(depTrees, defaultValue[0]);
|
|
|
- } else {
|
|
|
- return null;
|
|
|
- }
|
|
|
- }, [defaultValue]);
|
|
|
-
|
|
|
- const onChangeValue = (newValue, label) => {
|
|
|
- // const depName = findDepName(depTrees, newValue);
|
|
|
+ const onChangeValue = newValue => {
|
|
|
onChange(String(newValue));
|
|
|
};
|
|
|
|
|
@@ -84,7 +16,7 @@ function DepartmentField(props) {
|
|
|
showSearch
|
|
|
// // multiple
|
|
|
allowClear
|
|
|
- defaultValue={defaultID}
|
|
|
+ defaultValue={defaultValue ? Number(defaultValue) : null}
|
|
|
dropdownStyle={{
|
|
|
maxHeight: 400,
|
|
|
overflow: 'auto',
|