| @@ -1,6 +1,6 @@ | |||||
| import editExperimentIcon from '@/assets/img/edit-experiment.png'; | import editExperimentIcon from '@/assets/img/edit-experiment.png'; | ||||
| import KFModal from '@/components/KFModal'; | import KFModal from '@/components/KFModal'; | ||||
| import { type ResourceData } from '@/pages/Dataset/config'; | |||||
| import { ResourceVersionData, type ResourceData } from '@/pages/Dataset/config'; | |||||
| import { | import { | ||||
| addModelVersion, | addModelVersion, | ||||
| exportModelReq, | exportModelReq, | ||||
| @@ -41,7 +41,7 @@ interface ExportModelModalProps extends Omit<ModalProps, 'onOk'> { | |||||
| function ExportModelModal({ path, onOk, ...rest }: ExportModelModalProps) { | function ExportModelModal({ path, onOk, ...rest }: ExportModelModalProps) { | ||||
| const [form] = Form.useForm(); | const [form] = Form.useForm(); | ||||
| const [models, setModels] = useState<ResourceData[]>([]); | const [models, setModels] = useState<ResourceData[]>([]); | ||||
| const [versions, setVersions] = useState<string[]>([]); | |||||
| const [versions, setVersions] = useState<ResourceVersionData[]>([]); | |||||
| const [uuid] = useState(Date.now()); | const [uuid] = useState(Date.now()); | ||||
| const layout = { | const layout = { | ||||
| @@ -57,8 +57,9 @@ function ExportModelModal({ path, onOk, ...rest }: ExportModelModalProps) { | |||||
| const getTooltip = () => { | const getTooltip = () => { | ||||
| const id = form.getFieldValue('models_id'); | const id = form.getFieldValue('models_id'); | ||||
| const name = models.find((item) => item.id === id)?.name ?? ''; | const name = models.find((item) => item.id === id)?.name ?? ''; | ||||
| const versionNames = versions.map((item: ResourceVersionData) => item.name).join('、'); | |||||
| const tooltip = | const tooltip = | ||||
| versions.length > 0 ? `${name}有以下版本:\n${versions.join('、')}\n注意不能重复` : undefined; | |||||
| versions.length > 0 ? `${name}有以下版本:\n${versionNames}\n注意不能重复` : undefined; | |||||
| return tooltip; | return tooltip; | ||||
| }; | }; | ||||
| @@ -180,7 +181,7 @@ function ExportModelModal({ path, onOk, ...rest }: ExportModelModalProps) { | |||||
| { required: true, message: '请输入模型版本' }, | { required: true, message: '请输入模型版本' }, | ||||
| { | { | ||||
| validator: (_, value) => { | validator: (_, value) => { | ||||
| if (value && versions.includes(value)) { | |||||
| if (value && versions.map((item) => item.name).includes(value)) { | |||||
| return Promise.reject('模型版本已存在'); | return Promise.reject('模型版本已存在'); | ||||
| } else { | } else { | ||||
| return Promise.resolve(); | return Promise.resolve(); | ||||