Commit 788754b9 by zhaochengxiang

bug fix

parent 46277376
...@@ -770,8 +770,14 @@ export const Range = React.forwardRef(function ({ type, task }, ref) { ...@@ -770,8 +770,14 @@ export const Range = React.forwardRef(function ({ type, task }, ref) {
try { try {
const rows = await form.validateFields() const rows = await form.validateFields()
setRanges({ setRanges({
...ranges, jobMetadataCatalogItems: [
...rows, ...ranges?.jobMetadataCatalogItems??[],
...rows?.jobMetadataCatalogItems??[]
],
jobModelCatalogItems: [
...ranges?.jobModelCatalogItems??[],
...rows?.jobModelCatalogItems??[]
]
}) })
setAdding(false) setAdding(false)
} catch(e) { } catch(e) {
...@@ -810,7 +816,15 @@ export const Range = React.forwardRef(function ({ type, task }, ref) { ...@@ -810,7 +816,15 @@ export const Range = React.forwardRef(function ({ type, task }, ref) {
<Form.Item <Form.Item
label="数据模型范围" label="数据模型范围"
name="jobModelCatalogItems" name="jobModelCatalogItems"
rules={[{ required: true, message: '请选择模型范围!' }]} rules={[{
validator: (_, value) => {
if ((form.getFieldValue('jobModelCatalogItems')??[]).length===0 && (ranges?.jobModelCatalogItems??[]).length===0) {
return Promise.reject(new Error('请选择模型范围!'))
}
return Promise.resolve();
}
}]}
> >
<ModelRangeItem /> <ModelRangeItem />
</Form.Item> </Form.Item>
...@@ -819,7 +833,15 @@ export const Range = React.forwardRef(function ({ type, task }, ref) { ...@@ -819,7 +833,15 @@ export const Range = React.forwardRef(function ({ type, task }, ref) {
<Form.Item <Form.Item
label="元数据范围" label="元数据范围"
name="jobMetadataCatalogItems" name="jobMetadataCatalogItems"
rules={[{ required: true, message: '请选择元数据范围!' }]} rules={[{
validator: (_, value) => {
if ((form.getFieldValue('jobMetadataCatalogItems')??[]).length===0 && (ranges?.jobMetadataCatalogItems??[]).length===0) {
return Promise.reject(new Error('请选择元数据范围!'))
}
return Promise.resolve();
}
}]}
> >
<MetadataRangeItem /> <MetadataRangeItem />
</Form.Item> </Form.Item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment