From 1310fab9c9ef2c2a5cb968d408b66f8bd05ce9fe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 13 九月 2024 16:49:13 +0800
Subject: [PATCH] #
---
zy-acs-framework/src/main/java/com/zy/acs/framework/generators/ReactGenerator.java | 2 +-
zy-acs-flow/src/config/setting.js | 2 ++
zy-acs-flow/src/page/codeGap/CodeGapEdit.jsx | 4 +++-
zy-acs-flow/src/page/sta/StaList.jsx | 8 ++++----
zy-acs-flow/src/page/codeGap/CodeGapList.jsx | 4 ++--
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/zy-acs-flow/src/config/setting.js b/zy-acs-flow/src/config/setting.js
index a509b35..6db058f 100644
--- a/zy-acs-flow/src/config/setting.js
+++ b/zy-acs-flow/src/config/setting.js
@@ -27,6 +27,8 @@
export const PAGE_DRAWER_WIDTH = 400;
+export const REFERENCE_INPUT_PAGESIZE = 1000;
+
export const OPERATE_MODE = 'undoable'; // pessimistic | optimistic(tip) | undoable
export const EDIT_MODE = 'pessimistic'; // pessimistic | undoable
\ No newline at end of file
diff --git a/zy-acs-flow/src/page/codeGap/CodeGapEdit.jsx b/zy-acs-flow/src/page/codeGap/CodeGapEdit.jsx
index 6233b53..659909f 100644
--- a/zy-acs-flow/src/page/codeGap/CodeGapEdit.jsx
+++ b/zy-acs-flow/src/page/codeGap/CodeGapEdit.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";
@@ -67,6 +67,7 @@
<ReferenceInput
source="code0"
reference="code"
+ perPage={REFERENCE_INPUT_PAGESIZE}
autoFocus
>
<AutocompleteInput
@@ -81,6 +82,7 @@
<ReferenceInput
source="code1"
reference="code"
+ perPage={REFERENCE_INPUT_PAGESIZE}
>
<AutocompleteInput
label="table.field.codeGap.code1"
diff --git a/zy-acs-flow/src/page/codeGap/CodeGapList.jsx b/zy-acs-flow/src/page/codeGap/CodeGapList.jsx
index 279bd2f..fa81fc7 100644
--- a/zy-acs-flow/src/page/codeGap/CodeGapList.jsx
+++ b/zy-acs-flow/src/page/codeGap/CodeGapList.jsx
@@ -63,10 +63,10 @@
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<ReferenceInput source="code0" label="table.field.codeGap.code0" reference="code" alwaysOn>
- <AutocompleteInput label="table.field.codeGap.code0" optionText="data" />
+ <AutocompleteInput label="table.field.codeGap.code0" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
<ReferenceInput source="code1" label="table.field.codeGap.code1" reference="code" alwaysOn>
- <AutocompleteInput label="table.field.codeGap.code1" optionText="data" />
+ <AutocompleteInput label="table.field.codeGap.code1" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
<NumberInput source="distance" label="table.field.codeGap.distance" />,
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index dba430b..cfa0dee 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -64,15 +64,15 @@
<TextInput source="uuid" label="table.field.sta.uuid" />,
<ReferenceInput source="zoneId" label="table.field.sta.zoneId" reference="zone">
- <AutocompleteInput label="table.field.sta.zoneId" optionText="name" />
+ <AutocompleteInput label="table.field.sta.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<TextInput source="staNo" label="table.field.sta.staNo" />,
<TextInput source="name" label="table.field.sta.name" />,
<ReferenceInput source="staType" label="table.field.sta.staType" reference="staType">
- <AutocompleteInput label="table.field.sta.staType" optionText="name" />
+ <AutocompleteInput label="table.field.sta.staType" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<ReferenceInput source="code" label="table.field.sta.code" reference="code">
- <AutocompleteInput label="table.field.sta.code" optionText="uuid" />
+ <AutocompleteInput label="table.field.sta.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
<NumberInput source="offset" label="table.field.sta.offset" />,
<TextInput source="autoing" label="table.field.sta.autoing" />,
@@ -81,7 +81,7 @@
<TextInput source="outEnable" label="table.field.sta.outEnable" />,
<TextInput source="zpallet" label="table.field.sta.zpallet" />,
<ReferenceInput source="staSts" label="table.field.sta.staSts" reference="staSts">
- <AutocompleteInput label="table.field.sta.staSts" optionText="name" />
+ <AutocompleteInput label="table.field.sta.staSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<TextInput label="common.field.memo" source="memo" />,
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 f99a2fd..6c19e01 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
@@ -897,7 +897,7 @@
case "Double":
if (!Cools.isEmpty(column.getForeignKeyMajor())) {
sb.append(" <ReferenceInput source=\"").append(column.getHumpName()).append("\" label=\"table.field.").append(simpleEntityName).append(".").append(column.getHumpName()).append("\" reference=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("\">\n");
- sb.append(" <AutocompleteInput label=\"table.field.").append(simpleEntityName).append(".").append(column.getHumpName()).append("\" optionText=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append("\" />\n");
+ sb.append(" <AutocompleteInput label=\"table.field.").append(simpleEntityName).append(".").append(column.getHumpName()).append("\" optionText=\"").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append("\" filterToQuery={(val) => ({ ").append(GeneratorUtils.firstCharConvert(column.getForeignKeyMajor())).append(": val })} />\n");
sb.append(" </ReferenceInput>,\n");
} else {
if (Cools.isEmpty(column.getEnums())) {
--
Gitblit v1.9.1