对比范围

src/view/Manage/ModelCompare/task-manage.jsx

@@ -111,18 +111,26 @@ const FC = (props) => {
           <Tooltip title={
             <div>
               {
-                (record.jobCatalogItems??[]).map(item => (
-                  <Row key={generateUUID()}>
-                  {`【模型】${(item.modelCatalogNameList??[]).join('/')} -【元数据】${(item.metadataCatalogNameList??[]).join('/')}`}
+                record?.jobModelCatalogItems?.map((item, index) => <Row key={generateUUID()}>
+                    <Typography.Text>
+                      {`【模型】${(item.modelCatalogNameList??[]).join('/')}`}
+                    </Typography.Text>
                   </Row>
-                ))
+                )
+              }
+              {
+                record?.jobMetadataCatalogItems?.map((item, index) => <Row key={generateUUID()}>
+                    <Typography.Text>
+                      {`【元数据】${(item.metadataCatalogNameList??[]).join('/')}`}
+                    </Typography.Text>
+                  </Row>
+                )
               }
             </div>
           }>
             <Typography.Text ellipsis={true}>
-            {
-              (record.jobCatalogItems??[]).map(item => `【模型】${(item.modelCatalogNameList??[]).join('/')} -【元数据】${(item.metadataCatalogNameList??[]).join('/')}`).toString()
-            }
+            { record?.jobModelCatalogItems?.map((item, index) => `【模型】${(item.modelCatalogNameList??[]).join('/')}`).toString() }
+            { record?.jobMetadataCatalogItems?.map((item, index) => `【元数据】${(item.metadataCatalogNameList??[]).join('/')}`).toString() }
             </Typography.Text>
           </Tooltip>
         )

src/view/Manage/ModelCompare/update-task.jsx

 import React from 'react'
-import { Button, Modal, Spin, Space, Divider, Form, Row, Col, Input, Select, Checkbox, Radio, Switch, TimePicker, Tooltip, TreeSelect } from 'antd'
+import { Button, Modal, Spin, Space, Divider, Form, Row, Col, Input, Select, Checkbox, Radio, Switch, TimePicker, Tooltip, TreeSelect, Typography } from 'antd'
 import { useClickAway } from 'ahooks'
 import moment from 'moment'
 import produce from 'immer'
@@ -833,18 +833,34 @@ const Range = React.forwardRef(function ({ type, task }, ref) {
         </Form>
       }
       {
-        // (ranges??[]).map((item, index) => {
-        //   return (
-        //     <Row className={type==='detail'?'mb-2':'mb-1'} key={generateUUID()} align='middle' gutter={15}>
-        //       <Col span={type==='detail'?24:12}>
-        //       {`【模型】${(item.modelCatalogNameList??[]).join('/')} -【元数据】${(item.metadataCatalogNameList??[]).join('/')}`}
-        //       </Col>
-        //       {
-        //         type !== 'detail' && <Button type='link' onClick={() => onRangeDeleteClick(index)}>删除</Button>
-        //       }
-        //     </Row>
-        //   )
-        // })
+        ranges?.jobModelCatalogItems?.map((item, index) => <Row key={generateUUID()}>
+            <Typography.Text>
+              {`【模型】${(item.modelCatalogNameList??[]).join('/')}`}
+              {
+                type !== 'detail' && <Button type='link' onClick={() => {
+                  const newJobModelCatalogItems = [...ranges?.jobModelCatalogItems??[]]
+                  newJobModelCatalogItems.splice(index, 1)
+                  setRanges({...ranges, jobModelCatalogItems: newJobModelCatalogItems})
+                }}>删除</Button>
+              }
+            </Typography.Text>
+          </Row>
+        )
+      }
+      {
+        ranges?.jobMetadataCatalogItems?.map((item, index) => <Row key={generateUUID()}>
+            <Typography.Text>
+              {`【元数据】${(item.metadataCatalogNameList??[]).join('/')}`}
+              {
+                type !== 'detail' && <Button type='link' onClick={() => {
+                  const newJobMetadataCatalogItems = [...ranges?.jobMetadataCatalogItems??[]]
+                  newJobMetadataCatalogItems.splice(index, 1)
+                  setRanges({...ranges, jobMetadataCatalogItems: newJobMetadataCatalogItems})
+                }}>删除</Button>
+              }
+            </Typography.Text>
+          </Row>
+        )
       }
     </div>
   )