From f84faa8d9ffe57b674caa204a1db799e970c79b5 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 13 九月 2024 16:59:11 +0800 Subject: [PATCH] # --- zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java | 1 + zy-acs-flow/src/page/sta/StaEdit.jsx | 6 +++++- zy-acs-flow/src/page/user/UserList.jsx | 2 +- zy-acs-framework/src/main/resources/templates/react-admin/ReactEdit.txt | 2 +- zy-acs-flow/src/page/operationRecord/OperationRecordList.jsx | 2 +- zy-acs-flow/src/page/operationRecord/OperationRecordEdit.jsx | 4 +++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/zy-acs-flow/src/page/operationRecord/OperationRecordEdit.jsx b/zy-acs-flow/src/page/operationRecord/OperationRecordEdit.jsx index dbba102..456c184 100644 --- a/zy-acs-flow/src/page/operationRecord/OperationRecordEdit.jsx +++ b/zy-acs-flow/src/page/operationRecord/OperationRecordEdit.jsx @@ -23,7 +23,7 @@ import { useWatch, useFormContext } from "react-hook-form"; import { Stack, Grid, Box, Typography } from '@mui/material'; import * as Common from '@/utils/common'; -import { EDIT_MODE } from '@/config/setting'; +import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting'; import EditBaseAside from "../components/EditBaseAside"; import CustomerTopToolBar from "../components/EditTopToolBar"; import MemoInput from "../components/MemoInput"; @@ -140,10 +140,12 @@ <ReferenceInput source="userId" reference="user" + perPage={REFERENCE_INPUT_PAGESIZE} > <AutocompleteInput label="table.field.operationRecord.userId" optionText="nickname" + filterToQuery={(val) => ({ nickname: val })} /> </ReferenceInput> </Stack> diff --git a/zy-acs-flow/src/page/operationRecord/OperationRecordList.jsx b/zy-acs-flow/src/page/operationRecord/OperationRecordList.jsx index 56b0283..fd9fb80 100644 --- a/zy-acs-flow/src/page/operationRecord/OperationRecordList.jsx +++ b/zy-acs-flow/src/page/operationRecord/OperationRecordList.jsx @@ -95,7 +95,7 @@ ]} />, <ReferenceInput source="userId" reference="user"> - <AutocompleteInput label="table.field.operationRecord.userId" optionText="nickname" /> + <AutocompleteInput label="table.field.operationRecord.userId" optionText="nickname" filterToQuery={(val) => ({ nickname: val })} /> </ReferenceInput>, <TextInput label="common.field.memo" source="memo" />, diff --git a/zy-acs-flow/src/page/sta/StaEdit.jsx b/zy-acs-flow/src/page/sta/StaEdit.jsx index e5efe67..42ecc8b 100644 --- a/zy-acs-flow/src/page/sta/StaEdit.jsx +++ b/zy-acs-flow/src/page/sta/StaEdit.jsx @@ -23,7 +23,7 @@ import { useWatch, useFormContext } from "react-hook-form"; import { Stack, Grid, Box, Typography } from '@mui/material'; import * as Common from '@/utils/common'; -import { EDIT_MODE } from '@/config/setting'; +import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting'; import EditBaseAside from "../components/EditBaseAside"; import CustomerTopToolBar from "../components/EditTopToolBar"; import MemoInput from "../components/MemoInput"; @@ -75,6 +75,7 @@ <ReferenceInput source="zoneId" reference="zone" + perPage={REFERENCE_INPUT_PAGESIZE} > <AutocompleteInput label="table.field.sta.zoneId" @@ -101,6 +102,7 @@ <ReferenceInput source="staType" reference="staType" + perPage={REFERENCE_INPUT_PAGESIZE} > <AutocompleteInput label="table.field.sta.staType" @@ -114,6 +116,7 @@ <ReferenceInput source="code" reference="code" + perPage={REFERENCE_INPUT_PAGESIZE} > <AutocompleteInput label="table.field.sta.code" @@ -167,6 +170,7 @@ <ReferenceInput source="staSts" reference="staSts" + perPage={REFERENCE_INPUT_PAGESIZE} > <AutocompleteInput label="table.field.sta.staSts" diff --git a/zy-acs-flow/src/page/user/UserList.jsx b/zy-acs-flow/src/page/user/UserList.jsx index 5a55c8b..5ffa59e 100644 --- a/zy-acs-flow/src/page/user/UserList.jsx +++ b/zy-acs-flow/src/page/user/UserList.jsx @@ -96,7 +96,7 @@ <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" /> + // <AutocompleteInput label="table.field.user.deptId" optionText="name" filterToQuery={(val) => ({ name: val })} /> // </ReferenceInput>, <TextInput source="realName" label="table.field.user.realName" />, <TextInput source="idCard" label="table.field.user.idCard" />, diff --git a/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java b/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java index 6c19e01..d3a3b5a 100644 --- a/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java +++ b/zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java @@ -736,6 +736,7 @@ sb.append(" <ReferenceInput\n"); sb.append(" source=\"").append(column.getHumpName()).append("\"\n"); sb.append(" reference=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("\"\n"); + sb.append(" perPage={REFERENCE_INPUT_PAGESIZE}\n"); if (count == 0) { sb.append(" autoFocus\n"); } diff --git a/zy-acs-framework/src/main/resources/templates/react-admin/ReactEdit.txt b/zy-acs-framework/src/main/resources/templates/react-admin/ReactEdit.txt index ddf59cd..a09a9d9 100644 --- a/zy-acs-framework/src/main/resources/templates/react-admin/ReactEdit.txt +++ b/zy-acs-framework/src/main/resources/templates/react-admin/ReactEdit.txt @@ -23,7 +23,7 @@ import { useWatch, useFormContext } from "react-hook-form"; import { Stack, Grid, Box, Typography } from '@mui/material'; import * as Common from '@/utils/common'; -import { EDIT_MODE } from '@/config/setting'; +import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting'; import EditBaseAside from "../components/EditBaseAside"; import CustomerTopToolBar from "../components/EditTopToolBar"; import MemoInput from "../components/MemoInput"; -- Gitblit v1.9.1