diff --git a/src/components/copy-button/index.tsx b/src/components/copy-button/index.tsx index 94a5f8ce..42672d55 100644 --- a/src/components/copy-button/index.tsx +++ b/src/components/copy-button/index.tsx @@ -2,7 +2,7 @@ import { CheckCircleFilled, CopyOutlined } from '@ant-design/icons'; import { useIntl } from '@umijs/max'; import { Button, Tooltip, message } from 'antd'; import ClipboardJS from 'clipboard'; -import { useEffect, useRef, useState } from 'react'; +import React, { useEffect, useRef, useState } from 'react'; type CopyButtonProps = { text: string; @@ -20,6 +20,7 @@ type CopyButtonProps = { | 'topRight' | 'bottomLeft' | 'bottomRight'; + btnStyle?: React.CSSProperties; style?: React.CSSProperties; }; @@ -30,6 +31,7 @@ const CopyButton: React.FC = ({ shape = 'default', fontSize = '14px', style, + btnStyle, placement, size = 'middle' }) => { @@ -77,6 +79,7 @@ const CopyButton: React.FC = ({ size={size} disabled={!!disabled} data-clipboard-text={text} + style={{ ...btnStyle }} icon={ copied ? ( = (props) => { deploymentType === 'modelList' && ( {intl.formatMessage({ id: 'models.form.configurations' })} - )} = ({ ); await updateModel({ data: { - ...result.values, - ..._.omit(data, result.omits) + ...result.values }, id: currentData.current?.id as number }); @@ -296,8 +295,7 @@ const Models: React.FC = ({ const modelData = await createModel({ data: { - ...result.values, - ..._.omit(data, result.omits) + ...result.values } }); setOpenDeployModal({ diff --git a/src/pages/llmodels/components/title-wrapper.tsx b/src/pages/llmodels/components/title-wrapper.tsx index 0e9698a3..0f2b984e 100644 --- a/src/pages/llmodels/components/title-wrapper.tsx +++ b/src/pages/llmodels/components/title-wrapper.tsx @@ -2,7 +2,11 @@ import React from 'react'; import '../style/title-wrapper.less'; const TitleWrapper: React.FC = ({ children }) => { - return

{children}

; + return ( +

+ {children} +

+ ); }; export default TitleWrapper; diff --git a/src/pages/llmodels/config/index.ts b/src/pages/llmodels/config/index.ts index 42a2d8d1..d96fdcbd 100644 --- a/src/pages/llmodels/config/index.ts +++ b/src/pages/llmodels/config/index.ts @@ -1,5 +1,6 @@ import { StatusMaps } from '@/config'; import { EditOutlined } from '@ant-design/icons'; +import _ from 'lodash'; export const ollamaModelOptions = [ { @@ -345,8 +346,7 @@ export const getSourceRepoConfigValue = ( source: string, data: any ): { - values: Record; - omits: string[]; + values: typeof data; } => { const config: Record = sourceRepoConfig[source] || {}; const result: Record = {}; @@ -359,8 +359,7 @@ export const getSourceRepoConfigValue = ( }); return { - values: result, - omits: omits + values: { ...result, ..._.omit(data, omits) } }; }; @@ -369,7 +368,6 @@ export const setSourceRepoConfigValue = ( data: any ): { values: Record; - omits: string[]; } => { const config: Record = sourceRepoConfig[source] || {}; const result: Record = {}; @@ -382,8 +380,7 @@ export const setSourceRepoConfigValue = ( }); return { - values: result, - omits: omits + values: { ...result, ..._.omit(data, omits) } }; }; diff --git a/src/pages/llmodels/hooks/index.ts b/src/pages/llmodels/hooks/index.ts index 0f0bf194..65047d97 100644 --- a/src/pages/llmodels/hooks/index.ts +++ b/src/pages/llmodels/hooks/index.ts @@ -78,7 +78,6 @@ export const useGenerateFormEditInitialValues = () => { const formData = { ...result.values, - ..._.omit(data, result.omits), categories: data?.categories?.length ? data.categories[0] : null, scheduleType: data?.gpu_selector ? 'manual' : 'auto', gpu_selector: data?.gpu_selector?.gpu_ids?.length diff --git a/src/pages/resources/components/model-files.tsx b/src/pages/resources/components/model-files.tsx index 21a23896..25bb6f6c 100644 --- a/src/pages/resources/components/model-files.tsx +++ b/src/pages/resources/components/model-files.tsx @@ -221,10 +221,18 @@ const ModelFiles = () => { ).pop() ); + const targetWorker = _.find(workersList, { value: record.worker_id }) + ?.labels?.['worker-name']; + const result = setSourceRepoConfigValue(record.source, record); return { ...result.values, + worker_selector: targetWorker + ? { + 'worker-name': targetWorker + } + : {}, source: record.source, local_path: record.local_path, name: extractFileName(name), @@ -280,7 +288,6 @@ const ModelFiles = () => { ]); const dataList = generateModelFileOptions(modelFileList, workersList); const initialValues = generateInitialValues(record); - console.log('initialValues:', initialValues); setOpenDeployModal({ ...openDeployModal, source: record.source, @@ -359,8 +366,7 @@ const ModelFiles = () => { const modelData = await createModel({ data: { - ...result.values, - ..._.omit(data, result.omits) + ...result.values } }); setOpenDeployModal({ @@ -433,6 +439,7 @@ const ModelFiles = () => { {renderParts(record)}