diff --git a/admin/src/pages/course/subject/step/index.tsx b/admin/src/pages/course/subject/step/index.tsx index 08655ae..9ad6433 100644 --- a/admin/src/pages/course/subject/step/index.tsx +++ b/admin/src/pages/course/subject/step/index.tsx @@ -29,6 +29,7 @@ import { v4 as uuidv4 } from 'uuid'; import {DataItem} from "@antv/data-set/lib/transform/tag-cloud"; import {removeTrain} from "@/pages/training/option/service"; import {listMyLearningChapterCourse} from "../../../../../../web/src/pages/course/list/service"; +import course from "../../../../../../web/mock/course"; const { confirm } = Modal; @@ -42,8 +43,9 @@ const { confirm } = Modal; const handleAddChapter = async (fields: TableListItem) => { const hide = message.loading('正在添加'); try { - const {course_ids} = fields - const {code, msg} = await saveChapter({ ...fields, course_ids: course_ids.toString()}); + const {course_ids} = fields; + const {tag_ids} = fields; + const {code, msg} = await saveChapter({ ...fields, course_ids: course_ids.toString(),tag_ids: tag_ids.toString()}); if(code === 2000){ hide(); message.success('添加成功'); @@ -140,7 +142,7 @@ export default () => { { title: '标签', valueType: 'select', - dataIndex: 'tags', + dataIndex: 'tag_ids', sorter: false, hideInTable: true, hideInForm: false, @@ -148,10 +150,18 @@ export default () => { fieldProps: { mode: "multiple" }, + formItemProps: { + rules: [ + { + required: true, + message: '请填选择标签', + }, + ] + }, renderText: (val: string) => `${val}`, request: async () => { const { data: Items } = await queryTagList({}); - console.log('queryTagList...') + console.log('queryTagList..Items标签.',Items) const tags = [] for (let i = 0; i < Items.length; i++) { tags.push({ label: Items[i].tag_name, value: Items[i].tag_id }) @@ -180,12 +190,29 @@ export default () => { }, ] }, - renderText: (val: string) => `${val}`, - dependencies: ['tags'], - request: async (params) => { - const {tags} = params; - const { data: Items } = await queryCourseListByTag({tag_ids: tags?.toString()}); - console.log('queryCourseListByTag...') + render: (_dom: any, record: React.SetStateAction) => [ +
+ {console.log('record.course_names',record.course_names)} + { + record.course_names.length!==0?record.course_names.map((i,index)=>{ + if(index+1===record.course_names.length){ + return i + }else { + return i+',' + } + + }):'--' + } +
+ ], + + // renderText: (val: string) => `${val}`, + dependencies: ['tag_ids'], + request: async (arr) => { + console.log('arr',arr) + const {tags} = arr; + const { data: Items } = await queryCourseListByTag({tag_ids:arr?.tag_ids?.toString()}); + console.log('queryCourseListByTag...Items课程列表',Items) const courses = [] for (let i = 0; i < Items?.length; i++) { courses.push({ label: Items[i]?.course_name, value: Items[i]?.course_id }) @@ -236,7 +263,6 @@ export default () => { const params = useParams(); - console.log('params', params); const {data:subjectInfo} = useRequest(() => { return getSubjectInfo({subject_id: params?.id}); @@ -272,7 +298,6 @@ export default () => { } return true; } catch (error) { - // console.log('error', error) hide(); message.error('删除失败,请重试'); return false; @@ -280,8 +305,6 @@ export default () => { }; useEffect(() => { - console.log('getSubjectInfo', subjectInfo); - console.log('url', subjectInfo?.attachment_json?.url); // 编辑场景下需要使用formMapRef循环设置formData formMapRef.current.forEach((formInstanceRef) => { let fieldsValue; @@ -311,14 +334,11 @@ export default () => { /** 获取列数据初始值 */ const getInitialValues = (cols: any[], vals: any) => { - console.log('getInitialValues-columns', columns); - console.log('getInitialValues-values', vals); const initialValues: any[] = []; cols.forEach((column: { dataIndex: string }) => { const key: any = column?.dataIndex || ''; initialValues.push({ ...column, initialValue: key ? vals[key] : '' }); }); - console.log('initialValues::', initialValues); return initialValues || []; }; @@ -331,7 +351,6 @@ export default () => { formMapRef={formMapRef} formRef={formRef} onFinish={async (values) => { - console.log('values::', values) message.success('提交成功'); }} formProps={{ @@ -361,7 +380,6 @@ export default () => { }}*/ onFinish={async (value: any) => { - console.log(value, "vvvvv"); const url = value?.upload[0]?.url?.replace('/dsideal_yy/html/','') || value?.upload[0]?.response?.url; const { data } = await saveSubject({ @@ -406,7 +424,6 @@ export default () => { listType: 'picture-card', maxCount: 1, beforeUpload: (file) => { - console.log('file', file) // 获取文件名 SetUploadFileName(file?.name); // 获取最后一个.的位置 @@ -505,6 +522,15 @@ export default () => { page_number: value?.current || 1, page_size: value?.pageSize, }); + if(data.list.length!==0){ + data.list.forEach((i)=>{ + i.course_ids=parseInt(i.course_ids.split(',')) + i.course_names=i.course_names.split(',') + i.tag_ids=parseInt(i.tag_ids.split(',')) + i.tag_names=i.tag_names.split(',') + }) + console.log('data.list.',data.list) + } return { current: data?.page_number, data: data?.list, @@ -536,7 +562,12 @@ export default () => { onFinish={async (values: any) => { // 表单处理 console.log('columns:', columns); - console.log('values:', values); + console.log('values:新建', values); + // values['tag_ids']=values.tags; + values.tag_ids=values.tag_names.toString(); + values.course_ids=values.course_names.toString(); + delete values.course_names; + delete values.tag_names; const success = await handleAddChapter({ ...values, subject_id: params?.id || 0, @@ -571,7 +602,7 @@ export default () => { }} footer={null} > - {console.log('currentRow',currentRow)} + {/*{console.log('currentRow',currentRow)}*/} {currentRow?.chapter_id && ( layout="horizontal" @@ -579,7 +610,7 @@ export default () => { labelCol={{ span: 8 }} wrapperCol={{ span: 12 }} onFinish={async (values) => { - console.log('values', values) + console.log('values编辑', values) console.log('currentRow', currentRow) //const url = values?.upload[0]?.url?.replace('/dsideal_yy/html/','') || values?.upload[0]?.response?.url; //console.log('url', url) @@ -589,7 +620,7 @@ export default () => { // course_id: currentRow?.course_id, // attachment_json: `{"img":"", "name": "${values.attachment_json?.name}", "url": "${values.attachment_json?.url}", "size": "${values.attachment_json?.size}"}` // }); - handleUpdateModalVisible(false); // 隐藏编辑窗口 + // handleUpdateModalVisible(false); // 隐藏编辑窗口 actionRef.current?.reloadAndRest?.(); console.log(values); }}