diff --git a/admin/src/pages/course/subject/index.tsx b/admin/src/pages/course/subject/index.tsx index b241e89..5e1df6e 100644 --- a/admin/src/pages/course/subject/index.tsx +++ b/admin/src/pages/course/subject/index.tsx @@ -13,7 +13,7 @@ import UpdateForm from './components/UpdateForm'; import { copySubject, addSubject, updateSubject, removeSubject, querySubjectList, queryListChapterBySubject } from './service'; import type { TableListItem, TableListPagination } from './data'; import { queryCourseListByTag } from '../option/service'; - +const { confirm } = Modal; /** 章节列表项定义 */ const chapterColumns: ProColumns[] = [ { @@ -64,7 +64,7 @@ const chapterColumns: ProColumns[] = [ console.log(courses, 'courses:::'); return courses; }, - + }, { title: '学时', @@ -155,7 +155,7 @@ const TableList: React.FC = () => { const actionRef = useRef(); const actionChapterRef = useRef(); - + const [currentRow, setCurrentRow] = useState(); const [selectedRowsState, setSelectedRows] = useState([]); @@ -215,7 +215,7 @@ const TableList: React.FC = () => { }, { title: '信息', - dataIndex: 'total_course_minutes', + dataIndex: 'total_course_minutes', sorter: false, hideInSearch: true, width: 200, @@ -288,15 +288,27 @@ const TableList: React.FC = () => { { - handleRemove([{ key: record?.subject_id }]); // 调用批量删除函数(如果接口不支持批量需要在service中处理) - setSelectedRows([]); - actionRef.current?.reloadAndRest?.(); + showConfirm(record) + }}> 删除 , ], }, ]; + const showConfirm=async (record)=>{ + confirm({ + title: '确认删除主题吗?', + centered:true, + onOk() { + handleRemove([{ key: record?.subject_id }]); // 调用批量删除函数(如果接口不支持批量需要在service中处理) + setSelectedRows([]); + actionRef.current?.reloadAndRest?.(); + }, + onCancel() { + }, + }); + }; return ( diff --git a/admin/src/pages/course/subject/step/index.tsx b/admin/src/pages/course/subject/step/index.tsx index 8963745..c515282 100644 --- a/admin/src/pages/course/subject/step/index.tsx +++ b/admin/src/pages/course/subject/step/index.tsx @@ -387,7 +387,6 @@ export default () => { /* request={async () => { const data = await getSubjectInfo(5); - console.log('getSubjectInfo', data); // return { data: bean } @@ -396,14 +395,20 @@ export default () => { onFinish={async (value: any) => { const url = value?.upload[0]?.url?.replace('/dsideal_yy/html/','') || value?.upload[0]?.response?.url; - const { data } = await saveSubject({ + const info = await saveSubject({ ...value, subject_id: params?.id, attachment_json: `{ "url": "${url}"}` }); - setSubjectIntro({subject_id:data?.subject_id, subject_name: value?.subject_name, subject_describe:value?.subject_describe}); - return true; + if(info.code!==2000){ + message.warning(info.msg); + return false; + }else { + setSubjectIntro({subject_id:info?.data.subject_id, subject_name: value?.subject_name, subject_describe:value?.subject_describe}); + return true; + } + }} > @@ -498,7 +503,7 @@ export default () => { title="主题信息" /* request={async () => { - console.log('step2 主题信息') + // console.log('step2 主题信息') return Promise.resolve({ success: true, data: { id: '这是一段文本', object: '', date: '2020-07-30 08:00', duration: '', grade: 100, through: '>60', learn: '>20 min', times: 2 }, @@ -519,6 +524,7 @@ export default () => { rowKey="chapter_id" options={false} search={false} + params={subjectIntro} toolBarRender={() => [ , ]} request={async (value) => { + const { data } = await queryListChapterBySubject({ - subject_id: params?.id || 0, + subject_id: subjectIntro.subject_id, page_number: value?.current || 1, page_size: value?.pageSize, });