From 912b4dab5f847ab1108b18df1b5e06e85c71881e Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 03 二月 2026 17:32:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/taskPathTemplateMerge/TaskPathTemplateMergeEdit.jsx | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/taskPathTemplateMerge/TaskPathTemplateMergeEdit.jsx b/rsf-admin/src/page/taskPathTemplateMerge/TaskPathTemplateMergeEdit.jsx
index 4a3d443..e197cb1 100644
--- a/rsf-admin/src/page/taskPathTemplateMerge/TaskPathTemplateMergeEdit.jsx
+++ b/rsf-admin/src/page/taskPathTemplateMerge/TaskPathTemplateMergeEdit.jsx
@@ -19,6 +19,7 @@
required,
useRecordContext,
DeleteButton,
+ SelectArrayInput,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
import { Stack, Grid, Box, Typography } from '@mui/material';
@@ -97,12 +98,20 @@
/>
</Stack>
<Stack direction='row' gap={2}>
- <TextInput
- label="table.field.taskPathTemplateMerge.conditionExpression"
- source="conditionExpression"
- parse={v => v}
- validate={required()}
- />
+ <ReferenceArrayInput source="conditionExpression" reference="taskPathTemplate">
+ <SelectArrayInput
+ label="table.field.taskPathTemplateMerge.conditionExpression"
+ optionText="templateName"
+ optionValue="id"
+ fullWidth
+ validate={(value) => {
+ if (value && value.length > 1) {
+ return '鍙兘閫夋嫨涓�涓ā鏉�';
+ }
+ return undefined;
+ }}
+ />
+ </ReferenceArrayInput>
</Stack>
<Stack direction='row' gap={2}>
<TextInput
--
Gitblit v1.9.1