diff --git a/src/compenents/left-menu/index.tsx b/src/compenents/left-menu/index.tsx index ccfe912..90be2ef 100644 --- a/src/compenents/left-menu/index.tsx +++ b/src/compenents/left-menu/index.tsx @@ -104,6 +104,7 @@ export const LeftMenu: React.FC = () => { } newOpenKeys.push(openKeys[i]); } + return newOpenKeys; }; diff --git a/src/compenents/select-resource/index.tsx b/src/compenents/select-resource/index.tsx index b0f74f7..e7f9525 100644 --- a/src/compenents/select-resource/index.tsx +++ b/src/compenents/select-resource/index.tsx @@ -62,7 +62,11 @@ export const SelectResource = (props: PropsInterface) => { open={props.open} width={800} maskClosable={false} - onOk={() => props.onSelected(selectKeys, selectVideos)} + onOk={() => { + props.onSelected(selectKeys, selectVideos); + setSelectKeys([]); + setSelectVideos([]); + }} > diff --git a/src/compenents/upload-video-sub/index.tsx b/src/compenents/upload-video-sub/index.tsx index d7819fb..ce9179f 100644 --- a/src/compenents/upload-video-sub/index.tsx +++ b/src/compenents/upload-video-sub/index.tsx @@ -218,7 +218,7 @@ export const UploadVideoSub = (props: PropsInterface) => { paddingLeft: 10, }} > - {videoList.length > 0 && ( + {videoList.length > 0 && total > 10 && ( = ({ }; const selectData = (arr: any, videos: any) => { + if (arr.length === 0) { + message.error("请选择视频"); + return; + } let keys = [...hours]; let data = [...treeData]; keys = keys.concat(arr); @@ -251,6 +255,10 @@ export const CourseCreate: React.FC = ({ }; const selectChapterData = (arr: any, videos: any) => { + if (arr.length === 0) { + message.error("请选择视频"); + return; + } const data = [...chapters]; const keys = [...chapterHours]; keys[addvideoCurrent] = keys[addvideoCurrent].concat(arr); diff --git a/src/pages/course/compenents/hour-update.tsx b/src/pages/course/compenents/hour-update.tsx index 5d25b7d..cf7529f 100644 --- a/src/pages/course/compenents/hour-update.tsx +++ b/src/pages/course/compenents/hour-update.tsx @@ -117,6 +117,10 @@ export const CourseHourUpdate: React.FC = ({ }); } } + if (hours.length === 0) { + message.error("请选择视频"); + return; + } courseHour .storeCourseHourMulti(id, hours) .then((res: any) => { @@ -148,6 +152,10 @@ export const CourseHourUpdate: React.FC = ({ }); } } + if (hours.length === 0) { + message.error("请选择视频"); + return; + } courseHour .storeCourseHourMulti(id, hours) .then((res: any) => { diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index d07a251..d3dfed7 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -263,7 +263,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[0].user_id - ].name + ]?.name } )} @@ -288,7 +288,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[1].user_id - ].name + ]?.name } )} @@ -313,7 +313,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[2].user_id - ].name + ]?.name } )} @@ -334,7 +334,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[3].user_id - ].name + ]?.name } )} @@ -355,7 +355,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[4].user_id - ].name + ]?.name } )} @@ -380,7 +380,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[5].user_id - ].name + ]?.name } )} @@ -401,7 +401,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[6].user_id - ].name + ]?.name } )} @@ -422,7 +422,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[7].user_id - ].name + ]?.name } )} @@ -443,7 +443,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[8].user_id - ].name + ]?.name } )} @@ -464,7 +464,7 @@ const DashboardPage = () => { { basicData.user_learn_top10_users[ basicData.user_learn_top10[9].user_id - ].name + ]?.name } )} diff --git a/src/pages/resource/images/index.tsx b/src/pages/resource/images/index.tsx index 4ca1430..a6113b1 100644 --- a/src/pages/resource/images/index.tsx +++ b/src/pages/resource/images/index.tsx @@ -98,6 +98,7 @@ const ResourceImagesPage = () => { const resetImageList = () => { setPage(1); setImageList([]); + setSelectKey([]); setRefresh(!refresh); }; diff --git a/src/pages/system/config/index.tsx b/src/pages/system/config/index.tsx index 625934b..d8bc858 100644 --- a/src/pages/system/config/index.tsx +++ b/src/pages/system/config/index.tsx @@ -65,6 +65,14 @@ const SystemConfigPage = () => { form.setFieldsValue({ "player.poster": configData[i].key_value, }); + } else if (configData[i].key_name === "player.disabled_drag") { + let value = 0; + if (configData[i].key_value === "1") { + value = 1; + } + form.setFieldsValue({ + "player.disabled_drag": value, + }); } else if ( configData[i].key_name === "player.is_enabled_bullet_secret" ) { @@ -109,6 +117,26 @@ const SystemConfigPage = () => { form.setFieldsValue({ "member.default_avatar": configData[i].key_value, }); + } else if (configData[i].key_name === "minio.access_key") { + form.setFieldsValue({ + "minio.access_key": configData[i].key_value, + }); + } else if (configData[i].key_name === "minio.secret_key") { + form.setFieldsValue({ + "minio.secret_key": configData[i].key_value, + }); + } else if (configData[i].key_name === "minio.bucket") { + form.setFieldsValue({ + "minio.bucket": configData[i].key_value, + }); + } else if (configData[i].key_name === "minio.endpoint") { + form.setFieldsValue({ + "minio.endpoint": configData[i].key_value, + }); + } else if (configData[i].key_name === "minio.domain") { + form.setFieldsValue({ + "minio.domain": configData[i].key_value, + }); } } }); @@ -122,6 +150,14 @@ const SystemConfigPage = () => { } }; + const onDragChange = (checked: boolean) => { + if (checked) { + form.setFieldsValue({ "player.disabled_drag": 1 }); + } else { + form.setFieldsValue({ "player.disabled_drag": 0 }); + } + }; + const addName = (e: CheckboxChangeEvent) => { var value = form.getFieldValue("player.bullet_secret_text"); if (e.target.checked) { @@ -307,6 +343,16 @@ const SystemConfigPage = () => { onFinishFailed={onFinishFailed} autoComplete="off" > + + + + + +
+ (打开后禁止学员在首次学习中拖动进度条,以防刷课) +
+
+
{
{ }} >
- (推荐尺寸:19200x1080px,视频播放未开始时展示) + (推荐尺寸:1920x1080px,视频播放未开始时展示)
@@ -412,7 +457,7 @@ const SystemConfigPage = () => { }} >
- (推荐尺寸:19200x1080px,视频播放未开始时展示) + (推荐尺寸:1920x1080px,视频播放未开始时展示)
@@ -502,6 +547,86 @@ const SystemConfigPage = () => { ), }, + { + key: "4", + label: `MinIO存储`, + children: ( +
+ + + + + + + + + + + + + + + + + + +
+ ), + }, ]; const onChange = (key: string) => {