diff --git a/src/components/EnhancedProTable/index.tsx b/src/components/EnhancedProTable/index.tsx index 680dc28..138ad01 100644 --- a/src/components/EnhancedProTable/index.tsx +++ b/src/components/EnhancedProTable/index.tsx @@ -35,7 +35,6 @@ function EnhancedProTable( type={action.type} danger={action.danger} disabled={action.disabled} - // icon={action.icon ?? } onClick={() => action.onClick()} > {action.label} @@ -55,7 +54,6 @@ function EnhancedProTable( toolBarRender={toolBarRender} manualRequest={false} showSorterTooltip - // scroll={{ x: "max-content" }} scroll={scroll ? scroll : { x: 1200 }} components={components} search={ @@ -84,6 +82,7 @@ function EnhancedProTable( showSizeChanger: true, showQuickJumper: true, // pageSize: 10, + defaultPageSize: 10, showTotal: formatPaginationTotal, } : false diff --git a/src/components/Upload/UploadCard/index.module.less b/src/components/Upload/UploadCard/index.module.less index 295e693..a35d9a6 100644 --- a/src/components/Upload/UploadCard/index.module.less +++ b/src/components/Upload/UploadCard/index.module.less @@ -1,5 +1,6 @@ .uploader-card { background-color: #fff; + padding: 10px; :global { .ant-upload-drag { background-color: #fff; diff --git a/src/pages/ai/model/config.tsx b/src/pages/ai/model/config.tsx index d23d32e..f4074e8 100644 --- a/src/pages/ai/model/config.tsx +++ b/src/pages/ai/model/config.tsx @@ -5,7 +5,11 @@ import type { } from '@ant-design/pro-components'; import { Modal, message, Switch } from 'antd'; import dayjs from 'dayjs'; -import { type AiModelRespVO, updateModelStatus } from '@/services/ai/model'; +import { + type AiModelRespVO, + updateModel, + updateModelStatus, +} from '@/services/ai/model'; export const baseDeptColumns: ProColumns[] = [ { @@ -47,9 +51,9 @@ export const baseDeptColumns: ProColumns[] = [ }"类目吗?`, onOk: async () => { console.log(checked); - await updateModelStatus({ + await updateModel({ + ...record, status: checked ? 1 : 0, - id: record.id, }); message.success('修改成功'); action?.reload(); diff --git a/src/pages/ai/sample-tag/detail.tsx b/src/pages/ai/sample-tag/detail.tsx index 4bf5dca..d63a059 100644 --- a/src/pages/ai/sample-tag/detail.tsx +++ b/src/pages/ai/sample-tag/detail.tsx @@ -175,166 +175,180 @@ const SampleTagDetail = >( }; return ( <> - - {type === 'radio' && ( - - {data?.[0].sampleFilePath && ( - + {data!.length > 0 ? ( + <> + + {type === 'radio' && ( + + {data?.[0].sampleFilePath && ( + + )} + )} - - )} - - {type === 'radio' && ( - { - if (e.target.value) { - const newData = - data?.map((sample) => { - return { - id: sample.id, - sampleName: e.target.value, - }; - }) || []; - await updateSamples(newData); - props?.onRefresh?.(); - message.success('更新样本名称成功'); - } - }, - }} - rules={[{ required: true, message: '样本名称不能为空' }]} - /> - )} - { - if (e.target.value) { - const newData = - data?.map((sample) => { - return { - id: sample.id, - remark: e.target.value, - }; - }) || []; - await updateSamples(newData); - props?.onRefresh?.(); - message.success('更新注释成功'); - } + + {type === 'radio' && ( + { + if (e.target.value) { + const newData = + data?.map((sample) => { + return { + id: sample.id, + sampleName: e.target.value, + }; + }) || []; + await updateSamples(newData); + props?.onRefresh?.(); + message.success('更新样本名称成功'); + } + }, + }} + rules={[{ required: true, message: '样本名称不能为空' }]} + /> + )} + { + if (e.target.value) { + const newData = + data?.map((sample) => { + return { + id: sample.id, + remark: e.target.value, + }; + }) || []; + await updateSamples(newData); + props?.onRefresh?.(); + message.success('更新注释成功'); + } + }, + }} + name="remark" + placeholder="请输入注释" + /> + + + + {/* */} + {forMap(value.tags || [])} + + + + + 添加日期: + + {dayjs(value.createTime).format('YYYY-MM-DD HH:mm:ss')} + + + + 修改日期 + + {dayjs(value.updateTime).format('YYYY-MM-DD HH:mm:ss')} + + + + 文件大小: + {value.sampleSize} + + + 格式: + {value.sampleMineType} + + + {type === 'checkbox' && ( + <> + + + + + + )} + + setModalVisible(false)} + onChange={onListAddTag} + editable={false} + value={value?.tags} + request={{ + groupsApi: { + get: getSampleTagGroup, + create: createSampleTagGroup, + delete: deleteSampleTagGroup, + update: updateSampleTagGroup, + }, + tagsApi: { + get: getSampleTagPage, + create: createSampleTag, + delete: deleteSampleTag, + update: updateSampleTag, }, }} - name="remark" - placeholder="请输入注释" + title="管理技术标签" + width={800} + height={500} /> - - - - {/* */} - {forMap(value.tags || [])} - - - - - 添加日期: - {dayjs(value.createTime).format('YYYY-MM-DD HH:mm:ss')} - - - 修改日期 - {dayjs(value.updateTime).format('YYYY-MM-DD HH:mm:ss')} - - - 文件大小: - {value.sampleSize} - - - 格式: - {value.sampleMineType} - - - {type === 'checkbox' && ( - <> - - - - - - )} - - setModalVisible(false)} - onChange={onListAddTag} - editable={false} - value={value?.tags} - request={{ - groupsApi: { - get: getSampleTagGroup, - create: createSampleTagGroup, - delete: deleteSampleTagGroup, - update: updateSampleTagGroup, - }, - tagsApi: { - get: getSampleTagPage, - create: createSampleTag, - delete: deleteSampleTag, - update: updateSampleTag, - }, - }} - title="管理技术标签" - width={800} - height={500} - /> - setTagManagerVisible(false)} - > - - - - + + + + )} + + ) : ( + '暂无数据-请选择样本' + )} ); }; diff --git a/src/pages/ai/sample-tag/index.module.less b/src/pages/ai/sample-tag/index.module.less index 1ad3a44..645d561 100644 --- a/src/pages/ai/sample-tag/index.module.less +++ b/src/pages/ai/sample-tag/index.module.less @@ -1,18 +1,28 @@ .tag-content { - display: flex; background: #fff; width: 100%; overflow: auto; :global { - .ant-pro-table { - flex: 1 auto; + .left { + padding-right: 385px; } + .uploader-card { + padding-right: 400px; + } + .detail { display: flex; flex-direction: column; border-left: 1px solid #e8e8e8; + border-top: 1px solid #e8e8e8; width: 400px; padding: 16px; + top: 74px; + height: calc(100vh - 80px); + overflow: auto; + background: #fff; + position: fixed; + right: 0; form { flex: 1; } diff --git a/src/pages/ai/sample-tag/index.tsx b/src/pages/ai/sample-tag/index.tsx index 38809ae..ce63699 100644 --- a/src/pages/ai/sample-tag/index.tsx +++ b/src/pages/ai/sample-tag/index.tsx @@ -77,35 +77,37 @@ const SampleTag: React.FC = () => { }; return ( <> -
- - ref={tableRef} - columns={baseTenantColumns} - request={onFetch} - toolbarActions={toolbarActions} - headerTitle="样本列表" - showIndex={false} - enableRowClick={true} - scroll={{ x: 400 }} - rowSelection={{ - type: selectTableType, - selectedRowKeys: selectedRows.map((item) => item.id) as React.Key[], - onChange: (_, selectedRows) => { - setSelectedRows(selectedRows); - }, - }} - /> +
+ + + ref={tableRef} + columns={baseTenantColumns} + request={onFetch} + toolbarActions={toolbarActions} + headerTitle="样本列表" + showIndex={false} + enableRowClick={true} + scroll={{ x: 400 }} + rowSelection={{ + type: selectTableType, + selectedRowKeys: selectedRows.map( + (item) => item.id, + ) as React.Key[], + onChange: (_, selectedRows) => { + setSelectedRows(selectedRows); + }, + }} + /> +
- {selectedRows.length > 0 && ( -
- - type={selectTableType} - data={selectedRows} - onRefresh={onRefresh} - /> -
- )} +
+ + type={selectTableType} + data={selectedRows} + onRefresh={onRefresh} + /> +