From e5031e91cd41236c131ad5fc80d2a6371d4a1596 Mon Sep 17 00:00:00 2001 From: autosubmit Date: Fri, 22 Sep 2023 18:12:45 +0800 Subject: [PATCH] Auto Submit --- 10240.chunk.css | 1 + 35574.async.js | 4 + 44838.async.js | 3 + 50081.async.js | 4 +- 51821.async.js | 26 ++ 92716.async.js | 3 +- layouts__ShixunDetail__index.async.js | 26 +- ...ssrooms__Lists__Attachment__index.async.js | 4 +- ...ts__CommonHomework__Detail__index.async.js | 51 ++- ...ms__Lists__CommonHomework__index.chunk.css | 2 +- ...ooms__Lists__Exercise__Add__index.async.js | 29 +- ...s__Lists__Exercise__Detail__index.async.js | 2 +- ...s__Lists__Exercise__Review__index.async.js | 37 +- ...oms__Lists__GroupHomework__index.chunk.css | 2 +- ...__ProgramHomework__Comment__index.async.js | 61 ++- ...mHomework__Detail__Ranking__index.async.js | 9 +- ...s__ProgramHomework__Detail__index.async.js | 9 +- ...ms__Lists__ProgramHomework__index.async.js | 2 +- p__Classrooms__Lists__Video__index.chunk.css | 7 + p__Competitions__Edit__index.async.js | 61 +-- p__Competitions__Update__index.async.js | 2 +- ...ering__Lists__CurseSetting__index.async.js | 17 +- p__MoopCases__FormPanel__index.async.js | 5 +- p__MoopCases__FormPanel__index.chunk.css | 3 +- p__MyProblem__RecordDetail__index.chunk.css | 2 +- p__MyProblem__index.async.js | 19 + p__MyProblem__index.chunk.css | 2 +- p__Paperlibrary__Add__index.async.js | 31 +- p__Paths__Detail__id.async.js | 25 +- p__Paths__New__index.async.js | 6 + p__Problems__OjForm__NewEdit__index.async.js | 30 +- p__Problems__OjForm__index.async.js | 30 +- p__Problems__OjForm__index.chunk.css | 2 +- p__Problemset__NewItem__index.async.js | 34 +- p__Problemset__index.async.js | 84 ++--- p__Problemset__index.chunk.css | 9 +- p__Question__AddOrEdit__index.async.js | 31 +- ...__OjProblem__RecordDetail__index.chunk.css | 2 +- p__Question__OjProblem__index.chunk.css | 9 +- ...uns__Edit__body__Warehouse__index.async.js | 30 +- p__Shixuns__Edit__index.async.js | 350 ++++++++++++++---- p__Shixuns__Edit__index.chunk.css | 32 ++ p__Shixuns__New__CreateImg__index.chunk.css | 1 + ...hixuns__New__ImagePreview__index.chunk.css | 1 + p__Terminal__index.chunk.css | 1 + p__User__Detail__Certificate__index.chunk.css | 1 + p__User__Detail__Competitions__index.async.js | 5 +- ...etail__ExperImentImg__Add__index.chunk.css | 1 + ...ser__Detail__LearningPath__index.chunk.css | 1 + ...er__Detail__OtherResources__index.async.js | 9 + ...ser__Detail__UserPortrait__index.chunk.css | 1 + p__User__Detail__Videos__index.chunk.css | 7 + p__Video__Detail__id.chunk.css | 7 + p__index.chunk.css | 7 + p__tasks__Jupyter__index.async.js | 2 +- p__tasks__index.chunk.css | 1 + umi.js | 2 +- 57 files changed, 894 insertions(+), 251 deletions(-) diff --git a/10240.chunk.css b/10240.chunk.css index 85fab54a57..7f6d7c01ad 100644 --- a/10240.chunk.css +++ b/10240.chunk.css @@ -41,6 +41,7 @@ .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ diff --git a/35574.async.js b/35574.async.js index 92947b0aa8..c776331ae5 100644 --- a/35574.async.js +++ b/35574.async.js @@ -874,6 +874,10 @@ var dealList = function dealList(item) { } } var items = data.map(function (e) { + e.forEach(function (info) { + var arr = info.name.split('.'); + info.name = "".concat(arr[0], ".").concat(arr[1].toLowerCase()); + }); if (e[0].name.includes('.in')) { if (e.length === 2) { return e; diff --git a/44838.async.js b/44838.async.js index 83f6df1414..7d10783ad8 100644 --- a/44838.async.js +++ b/44838.async.js @@ -1281,6 +1281,9 @@ var Edit = function Edit(_ref) { rules: [{ required: true, message: '请先选择学校/单位' + }, { + whitespace: true, + message: '请先选择学校/单位' }], children: /*#__PURE__*/(0,jsx_runtime.jsx)(auto_complete/* default */.Z, { size: "large", diff --git a/50081.async.js b/50081.async.js index 9aff0e97a1..f123bbacf9 100644 --- a/50081.async.js +++ b/50081.async.js @@ -737,10 +737,10 @@ var WorkList = function WorkList(_ref) { }, children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(antd__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .ZP, { value: true, - disabled: !(workSetting !== null && workSetting !== void 0 && workSetting.manage_all_group), + disabled: disabled || !(workSetting !== null && workSetting !== void 0 && workSetting.manage_all_group), children: "\u7EDF\u4E00\u53D1\u5E03" }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_14__.jsx)(antd__WEBPACK_IMPORTED_MODULE_22__/* ["default"] */ .ZP, { - disabled: (workSetting === null || workSetting === void 0 ? void 0 : (_workSetting$group_se5 = workSetting.group_settings) === null || _workSetting$group_se5 === void 0 ? void 0 : _workSetting$group_se5.length) === 0, + disabled: disabled || !(workSetting !== null && workSetting !== void 0 && (_workSetting$group_se5 = workSetting.group_settings) !== null && _workSetting$group_se5 !== void 0 && _workSetting$group_se5.length), value: false, children: "\u5206\u73ED\u53D1\u5E03" })] diff --git a/51821.async.js b/51821.async.js index be196547ea..be4b3bf153 100644 --- a/51821.async.js +++ b/51821.async.js @@ -739,6 +739,7 @@ var jsx_runtime = __webpack_require__(85893); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! antd */ 15746); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! antd */ 31795); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! antd */ 79035); +/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! antd */ 78045); /* harmony import */ var _MdEditorInForm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./MdEditorInForm */ 95293); /* harmony import */ var umi__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! umi */ 89214); /* harmony import */ var _index_less_modules__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./index.less?modules */ 52654); @@ -1113,6 +1114,31 @@ var BProgramEditor = function BProgramEditor(_ref2) { className: "ml10 font14", children: "\u79D2" })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_13__/* ["default"].Item */ .Z.Item, { + label: "\u586B\u7A7A\u9879\u7B54\u6848\u7684\u7A7A\u683C\u5904\u7406\u65B9\u5F0F", + style: { + marginTop: 30 + }, + name: ['hack', 'submit_rule'], + labelCol: { + span: 24 + }, + rules: [{ + required: true, + message: '请选择编程语言' + }], + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"].Group */ .ZP.Group, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 0, + children: "\u4E0D\u5FFD\u7565\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 1, + children: "\u5FFD\u7565\u9996\u5C3E\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 2, + children: "\u5FFD\u7565\u6240\u6709\u7A7A\u683C" + })] + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z, { align: "middle", style: { diff --git a/92716.async.js b/92716.async.js index 09c881994d..1140a270f1 100644 --- a/92716.async.js +++ b/92716.async.js @@ -5757,7 +5757,8 @@ var SendToClassModal = function SendToClassModal(_ref) { display: 'inline-flex', alignItems: "center", justifyContent: 'center', - fontSize: '12px' + fontSize: '12px', + flexShrink: 0 }, children: "JupyterLab" }), nodeData.item_type === 'Shixun' && nodeData.is_jupyter && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { diff --git a/layouts__ShixunDetail__index.async.js b/layouts__ShixunDetail__index.async.js index aa4e0f220f..eccf9ae71b 100644 --- a/layouts__ShixunDetail__index.async.js +++ b/layouts__ShixunDetail__index.async.js @@ -3151,6 +3151,13 @@ var ShixunsListPage = function ShixunsListPage(_ref) { if (location.pathname.indexOf(item.category_url) > -1 || specialActive(item)) { if (!secondOpen.includes(key)) secondOpen.push(key); setSecondOpen(toConsumableArray_default()(secondOpen)); + var arr = location.pathname.split('').filter(function (info) { + return info == '/'; + }); + if (arr.length == 3) { + // 显示所有3级目录 + show3List(item); + } } }); }; @@ -3558,6 +3565,15 @@ var ShixunsListPage = function ShixunsListPage(_ref) { var scrollToBody = function scrollToBody() { // window.scrollTo(0, 336) }; + + // 默认展开3级目录 + var show3List = function show3List(list) { + var _list$second_category; + (_list$second_category = list.second_category) === null || _list$second_category === void 0 ? void 0 : _list$second_category.map(function (val, key) { + if (!thirdOpen.includes(val === null || val === void 0 ? void 0 : val.category_id)) thirdOpen.push(val === null || val === void 0 ? void 0 : val.category_id); + setThirdOpen(toConsumableArray_default()(thirdOpen)); + }); + }; return /*#__PURE__*/(0,jsx_runtime.jsx)(Sider, { width: 264, style: { @@ -3747,14 +3763,14 @@ var ShixunsListPage = function ShixunsListPage(_ref) { // } else { // setThirdOpen(-1) // } - if (thirdOpen.includes(key)) { - thirdOpen.splice(thirdOpen.indexOf(key), 1); + if (thirdOpen.includes(val === null || val === void 0 ? void 0 : val.category_id)) { + thirdOpen.splice(thirdOpen.indexOf(val === null || val === void 0 ? void 0 : val.category_id), 1); } else { - thirdOpen.push(key); + thirdOpen.push(val === null || val === void 0 ? void 0 : val.category_id); } setThirdOpen(toConsumableArray_default()(thirdOpen)); } else { - if (!thirdOpen.includes(key)) thirdOpen.push(key); + if (!thirdOpen.includes(val === null || val === void 0 ? void 0 : val.category_id)) thirdOpen.push(val === null || val === void 0 ? void 0 : val.category_id); setThirdOpen(toConsumableArray_default()(thirdOpen)); if (['shixun_homework', 'hack', 'common_homework', 'group_homework'].includes(val.category_type)) { // history.replace(val.second_category_url+'?tabs=0') @@ -3802,7 +3818,7 @@ var ShixunsListPage = function ShixunsListPage(_ref) { ref: provided.innerRef }, provided.droppableProps), {}, { onScroll: function onScroll() {}, - className: thirdOpen.includes(key) ? ShixunDetailmodules.open : '', + className: thirdOpen.includes(val === null || val === void 0 ? void 0 : val.category_id) ? ShixunDetailmodules.open : '', children: (_val$third_category = val.third_category) === null || _val$third_category === void 0 ? void 0 : _val$third_category.map(function (value, index) { var _value$category_id; return /*#__PURE__*/(0,jsx_runtime.jsx)(react_beautiful_dnd_esm/* Draggable */._l, { diff --git a/p__Classrooms__Lists__Attachment__index.async.js b/p__Classrooms__Lists__Attachment__index.async.js index 7ca71510b4..ce0667b40d 100644 --- a/p__Classrooms__Lists__Attachment__index.async.js +++ b/p__Classrooms__Lists__Attachment__index.async.js @@ -2385,6 +2385,7 @@ var Config_SetPublic = function SetPublic(_ref) { children: "\u5EF6\u671F\u53D1\u5E03" }), /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker/* default */.Z, { disabledDate: disabledDate, + allowClear: false, format: "YYYY-MM-DD HH:mm", disabled: !formValue.delay_publish, value: formValue.publish_time ? dayjs_min_default()(formValue.publish_time) : undefined, @@ -2842,7 +2843,7 @@ var OutLinkConfig_SetPublic = function SetPublic(_ref) { is_public: (_value$is_public = value.is_public) === null || _value$is_public === void 0 ? void 0 : _value$is_public[0], delay_publish: value.delay_publish, description: value.description, - publish_time: value.publish_time, + publish_time: formValue.publish_time, link: value.link, name: value.title }); @@ -2940,6 +2941,7 @@ var OutLinkConfig_SetPublic = function SetPublic(_ref) { children: "\u5EF6\u671F\u53D1\u5E03" }), /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker/* default */.Z, { disabledDate: disabledDate, + allowClear: false, format: "YYYY-MM-DD HH:mm", disabled: !formValue.delay_publish, value: dayjs_min_default()(formValue.publish_time), diff --git a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js index ab5b01d0cf..6d645e5cee 100644 --- a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js @@ -4877,7 +4877,6 @@ var AsyncButton = __webpack_require__(48559); - var classRef = /*#__PURE__*/(0,react.createRef)(); @@ -5628,32 +5627,30 @@ var WorkList = function WorkList(_ref) { to: "/classrooms/".concat(params === null || params === void 0 ? void 0 : params.coursesId, "/common_homework/").concat(params.categoryId, "/").concat(workList === null || workList === void 0 ? void 0 : (_workList$student_wor2 = workList.student_works) === null || _workList$student_wor2 === void 0 ? void 0 : (_workList$student_wor3 = _workList$student_wor2[0]) === null || _workList$student_wor3 === void 0 ? void 0 : _workList$student_wor3.id, "/comment"), children: "\u5B9E\u8BAD\u62A5\u544A" }) - }, "2"), !(workList !== null && workList !== void 0 && workList.is_jupyter || workList !== null && workList !== void 0 && workList.is_jupyter_lab) && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { - children: [/*#__PURE__*/(0,jsx_runtime.jsx)(menu/* default.Item */.Z.Item, { - children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { - loading: btnLoading, - style: { - paddingLeft: 0, - background: 'transparent' - }, - type: "text", - onClick: function onClick() { - return getExportData(); - }, - children: "\u5BFC\u51FA\u4F5C\u54C1\u9644\u4EF6" - }) - }, "3"), /*#__PURE__*/(0,jsx_runtime.jsx)(menu/* default.Item */.Z.Item, { - children: /*#__PURE__*/(0,jsx_runtime.jsx)(AsyncButton/* AsyncButton */.Z, { - style: { - paddingLeft: 0, - background: 'transparent' - }, - type: "text", - onClick: getAnnotationExportData, - children: "\u5BFC\u51FA\u4F5C\u54C1\u6279\u6CE8" - }) - }, "4")] - }), /*#__PURE__*/(0,jsx_runtime.jsx)(menu/* default.Item */.Z.Item, { + }, "2"), (!(workList !== null && workList !== void 0 && workList.is_jupyter || workList !== null && workList !== void 0 && workList.is_jupyter_lab) || (workList === null || workList === void 0 ? void 0 : workList.has_files_data)) && /*#__PURE__*/(0,jsx_runtime.jsx)(menu/* default.Item */.Z.Item, { + children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + loading: btnLoading, + style: { + paddingLeft: 0, + background: 'transparent' + }, + type: "text", + onClick: function onClick() { + return getExportData(); + }, + children: "\u5BFC\u51FA\u4F5C\u54C1\u9644\u4EF6" + }) + }, "3"), !(workList !== null && workList !== void 0 && workList.is_jupyter || workList !== null && workList !== void 0 && workList.is_jupyter_lab) && /*#__PURE__*/(0,jsx_runtime.jsx)(menu/* default.Item */.Z.Item, { + children: /*#__PURE__*/(0,jsx_runtime.jsx)(AsyncButton/* AsyncButton */.Z, { + style: { + paddingLeft: 0, + background: 'transparent' + }, + type: "text", + onClick: getAnnotationExportData, + children: "\u5BFC\u51FA\u4F5C\u54C1\u6279\u6CE8" + }) + }, "4"), /*#__PURE__*/(0,jsx_runtime.jsx)(menu/* default.Item */.Z.Item, { children: /*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { to: "/classrooms/".concat(params.coursesId, "/exportlist/normal_work_list"), children: "\u5386\u53F2\u5BFC\u51FA" diff --git a/p__Classrooms__Lists__CommonHomework__index.chunk.css b/p__Classrooms__Lists__CommonHomework__index.chunk.css index 1b467d22c1..dda2a554b8 100644 --- a/p__Classrooms__Lists__CommonHomework__index.chunk.css +++ b/p__Classrooms__Lists__CommonHomework__index.chunk.css @@ -1793,7 +1793,7 @@ button[class~='ant-btn-default']:disabled.btn___In02G { } .bottomControlContainer___t5WWD .buttonWrap___HfupJ { position: relative; - z-index: 1003; + z-index: 999; } .bottomControlContainer___t5WWD .buttonWrap___HfupJ { min-height: 30px; diff --git a/p__Classrooms__Lists__Exercise__Add__index.async.js b/p__Classrooms__Lists__Exercise__Add__index.async.js index d533bed8ab..62d1bdb820 100644 --- a/p__Classrooms__Lists__Exercise__Add__index.async.js +++ b/p__Classrooms__Lists__Exercise__Add__index.async.js @@ -463,6 +463,7 @@ var jsx_runtime = __webpack_require__(85893); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! antd */ 15746); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! antd */ 31795); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! antd */ 79035); +/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! antd */ 78045); /* harmony import */ var _MdEditorInForm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./MdEditorInForm */ 95293); /* harmony import */ var umi__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! umi */ 89214); /* harmony import */ var _index_less_modules__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./index.less?modules */ 52654); @@ -837,6 +838,31 @@ var BProgramEditor = function BProgramEditor(_ref2) { className: "ml10 font14", children: "\u79D2" })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_13__/* ["default"].Item */ .Z.Item, { + label: "\u586B\u7A7A\u9879\u7B54\u6848\u7684\u7A7A\u683C\u5904\u7406\u65B9\u5F0F", + style: { + marginTop: 30 + }, + name: ['hack', 'submit_rule'], + labelCol: { + span: 24 + }, + rules: [{ + required: true, + message: '请选择编程语言' + }], + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"].Group */ .ZP.Group, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 0, + children: "\u4E0D\u5FFD\u7565\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 1, + children: "\u5FFD\u7565\u9996\u5C3E\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 2, + children: "\u5FFD\u7565\u6240\u6709\u7A7A\u683C" + })] + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z, { align: "middle", style: { @@ -11303,7 +11329,8 @@ var AddNewPaper = function AddNewPaper(_ref) { use_keywords: false, keywords: [], use_blank_score: true, - allow_student_debug: false + allow_student_debug: false, + submit_rule: 1 }); } }, diff --git a/p__Classrooms__Lists__Exercise__Detail__index.async.js b/p__Classrooms__Lists__Exercise__Detail__index.async.js index 8d2d02441d..dc5bc1de07 100644 --- a/p__Classrooms__Lists__Exercise__Detail__index.async.js +++ b/p__Classrooms__Lists__Exercise__Detail__index.async.js @@ -15069,8 +15069,8 @@ var PropertySettings_PublishSettings = function PublishSettings(_ref) { children: "\u5141\u8BB8\u67E5\u770B\u8BD5\u5377" }) }), data.answered_open && /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, { + className: "".concat(ConfigWorksmodules.contentInterval, " ").concat(ConfigWorksmodules.mb40), children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_radio/* default.Group */.ZP.Group, { - className: "".concat(ConfigWorksmodules.contentInterval, " ").concat(ConfigWorksmodules.mb40), value: data.answer_open, disabled: disabled, onChange: function onChange(e) { diff --git a/p__Classrooms__Lists__Exercise__Review__index.async.js b/p__Classrooms__Lists__Exercise__Review__index.async.js index b552bd6944..c968234a3d 100644 --- a/p__Classrooms__Lists__Exercise__Review__index.async.js +++ b/p__Classrooms__Lists__Exercise__Review__index.async.js @@ -7531,7 +7531,7 @@ var ExeriseReview = function ExeriseReview(_ref) { return handleCheckInitModal(res); case 6: delete changeScoreData[item.q_position]; - getData(); + getData(true); setChangeScoreData(objectSpread2_default()({}, changeScoreData)); return _context3.abrupt("return", res); case 10: @@ -7640,12 +7640,23 @@ var ExeriseReview = function ExeriseReview(_ref) { // console.log(item, 'item') return id; }; + + // isScore:为是不是从调分接口调用的 var getData = /*#__PURE__*/function () { var _ref5 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5() { - var payload, data, res, sendData, result, anchorName, _res$review_progress; + var isScore, + payload, + data, + res, + sendData, + result, + anchorName, + _res$review_progress, + _args5 = arguments; return regeneratorRuntime_default()().wrap(function _callee5$(_context5) { while (1) switch (_context5.prev = _context5.next) { case 0: + isScore = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : false; payload = { exerciseId: params.exerciseId, login: params.userId @@ -7655,12 +7666,12 @@ var ExeriseReview = function ExeriseReview(_ref) { payload.user_ids = data.user_ids; saveData.current = data.user_ids || []; } - _context5.next = 4; + _context5.next = 5; return dispatch({ type: effectsType, payload: payload }); - case 4: + case 5: res = _context5.sent; sendData = { limit: 100, @@ -7672,17 +7683,22 @@ var ExeriseReview = function ExeriseReview(_ref) { if (!isCentralizeReview) { sendData["user_ids"] = saveData.current; } - _context5.next = 9; + if (isScore) { + _context5.next = 13; + break; + } + _context5.next = 11; return (0,fetch/* default */.ZP)("/api/exercises/".concat(params.exerciseId, "/user_review_list.json"), { method: 'post', body: sendData }); - case 9: + case 11: result = _context5.sent; setUserReviewList(result); - _context5.next = 13; - return handleCheckInitModal(res); case 13: + _context5.next = 15; + return handleCheckInitModal(res); + case 15: if (needToLocate.current) { anchorName = scrollQuestionsId(res === null || res === void 0 ? void 0 : res.exercise_question_types); setTimeout(function () { @@ -7699,7 +7715,7 @@ var ExeriseReview = function ExeriseReview(_ref) { } else { setReviewType(1); } - case 16: + case 18: case "end": return _context5.stop(); } @@ -8350,11 +8366,10 @@ var ExeriseReview = function ExeriseReview(_ref) { return regeneratorRuntime_default()().wrap(function _callee8$(_context8) { while (1) switch (_context8.prev = _context8.next) { case 0: - console.log(params); str = isCentralizeReview ? 'centralizeReview' : 'review'; Login = type == "next" ? userReviewList === null || userReviewList === void 0 ? void 0 : userReviewList.next_login : userReviewList === null || userReviewList === void 0 ? void 0 : userReviewList.prev_login; if (Login) _umi_production_exports.history.replace("/classrooms/".concat(params.coursesId, "/exercise/").concat(params.exerciseId, "/").concat(str, "/").concat(Login));else getData(); - case 4: + case 3: case "end": return _context8.stop(); } diff --git a/p__Classrooms__Lists__GroupHomework__index.chunk.css b/p__Classrooms__Lists__GroupHomework__index.chunk.css index a1b2ac4d58..34dd116d6e 100644 --- a/p__Classrooms__Lists__GroupHomework__index.chunk.css +++ b/p__Classrooms__Lists__GroupHomework__index.chunk.css @@ -562,7 +562,7 @@ div[class~="ant-modal-confirm-content"] { } .bottomControlContainer___yUX9N .buttonWrap___A3uZF { position: relative; - z-index: 1003; + z-index: 999; } .bottomControlContainer___yUX9N .buttonWrap___A3uZF { min-height: 30px; diff --git a/p__Classrooms__Lists__ProgramHomework__Comment__index.async.js b/p__Classrooms__Lists__ProgramHomework__Comment__index.async.js index f5eefd10f7..a93b91471a 100644 --- a/p__Classrooms__Lists__ProgramHomework__Comment__index.async.js +++ b/p__Classrooms__Lists__ProgramHomework__Comment__index.async.js @@ -1023,8 +1023,13 @@ var ShixunsStaticItem = function ShixunsStaticItem(_ref) { return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("h2", { children: [" ", /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { - children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: [v.is_finish ? /*#__PURE__*/(0,jsx_runtime.jsx)("span", { children: "\u6700\u540E\u901A\u5173\u7684\u4EE3\u7801" + }) : /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + children: ["\u6700\u65B0\u4EE3\u7801", /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: "ml5 font12 c-grey-999", + children: "\u672A\u901A\u8FC7\u672C\u9898\uFF0C\u5C55\u793A\u6700\u540E\u63D0\u4EA4\u8BC4\u6D4B\u7684\u4EE3\u7801\u8BE6\u60C5" + })] }), (languages === null || languages === void 0 ? void 0 : languages.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default.Group */.ZP.Group, { defaultValue: language, style: { @@ -1033,7 +1038,7 @@ var ShixunsStaticItem = function ShixunsStaticItem(_ref) { onChange: function onChange(e) { var _languages$filter2; // console.log(languages,languages?.filter((item:any)=>item.language===e.target.value)?.[0]); - + v.language = e.target.value; setitem(languages === null || languages === void 0 ? void 0 : (_languages$filter2 = languages.filter(function (item) { return item.language === e.target.value; })) === null || _languages$filter2 === void 0 ? void 0 : _languages$filter2[0]); @@ -1338,6 +1343,7 @@ var jsx_runtime = __webpack_require__(85893); + var ShixunsListPage = function ShixunsListPage(_ref) { var shixunHomeworks = _ref.shixunHomeworks, autoHeight = _ref.autoHeight, @@ -1349,6 +1355,10 @@ var ShixunsListPage = function ShixunsListPage(_ref) { work_id = shixunWorkReport.work_id; var params = (0,_umi_production_exports.useParams)(); var hasPower = (0,authority/* isAdmin */.GJ)(); + var _useState = (0,react.useState)(), + _useState2 = slicedToArray_default()(_useState, 2), + codetype = _useState2[0], + setcodetype = _useState2[1]; var columns = [{ title: '评测次数', dataIndex: 'query_index', @@ -1360,7 +1370,15 @@ var ShixunsListPage = function ShixunsListPage(_ref) { return base64.Base64.decode(text) || '- -'; } }]; - + var getType = function getType(language) { + if (language === 'c++') { + return 1; + } + if (language === 'C++') { + return 2; + } + return language; + }; // async function onChangeScore(index: number, value: any) { // const { challenge_id } = stage_list[index] // const res = await dispatch({ @@ -1410,22 +1428,31 @@ var ShixunsListPage = function ShixunsListPage(_ref) { }, className: "c-black", children: ["\u7B2C", key * 5 + k + 1, "\u9898 ", v.name] - }), v.is_finish && /*#__PURE__*/(0,jsx_runtime.jsxs)(_umi_production_exports.Link, { + }), v.is_finish && /*#__PURE__*/(0,jsx_runtime.jsxs)("a", { style: { marginLeft: 20 }, onClick: function onClick(e) { e.preventDefault(); - window.open(v === null || v === void 0 ? void 0 : v.url); + window.open("".concat(v === null || v === void 0 ? void 0 : v.url, "&language=").concat(getType(v.language))); + localStorage.setItem('program_homework', [params.coursesId, params.categoryId]); + }, + children: ["\u67E5\u770B\u7B54\u9898\u8BE6\u60C5", '>>'] + }), !v.is_finish && v.final_submit_languages.length > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("a", { + style: { + marginLeft: 20 + }, + onClick: function onClick(e) { + e.preventDefault(); + window.open("".concat(v === null || v === void 0 ? void 0 : v.url, "&language=").concat(getType(v.final_submit_languages[0].language))); localStorage.setItem('program_homework', [params.coursesId, params.categoryId]); }, - to: "".concat(v === null || v === void 0 ? void 0 : v.url), children: ["\u67E5\u770B\u7B54\u9898\u8BE6\u60C5", '>>'] })] }) - }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "font16 mt10", - children: [v.is_finish === false && "本关暂未通过，无通关代码", v.is_finish && /*#__PURE__*/(0,jsx_runtime.jsx)("aside", { + children: v.is_finish ? /*#__PURE__*/(0,jsx_runtime.jsx)("aside", { className: Commentmodules.shixunWrp, children: /*#__PURE__*/(0,jsx_runtime.jsx)(ShixunStaticItem/* default */.Z, { classroomList: classroomList, @@ -1441,7 +1468,23 @@ var ShixunsListPage = function ShixunsListPage(_ref) { diff_code_count: v.diff_code_count, onPathChange: onPathChange }) - })] + }) : v.final_submit_languages.length > 0 && /*#__PURE__*/(0,jsx_runtime.jsx)("aside", { + className: Commentmodules.shixunWrp, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(ShixunStaticItem/* default */.Z, { + classroomList: classroomList, + user: user, + v: v, + shixunWorkReport: shixunWorkReport, + dispatch: dispatch, + autoHeight: autoHeight, + languages: v.final_submit_languages, + language: v.final_submit_languages[0].language, + game_id: v.id, + data: base64.Base64.decode(v.final_submit_languages[0].code), + diff_code_count: v.diff_code_count, + onPathChange: onPathChange + }) + }) }), /*#__PURE__*/(0,jsx_runtime.jsx)("aside", { className: "mt10 font16", children: (_v$history = v.history) !== null && _v$history !== void 0 && _v$history.length ? /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, { diff --git a/p__Classrooms__Lists__ProgramHomework__Detail__Ranking__index.async.js b/p__Classrooms__Lists__ProgramHomework__Detail__Ranking__index.async.js index bd7fee16e8..77ab03f01e 100644 --- a/p__Classrooms__Lists__ProgramHomework__Detail__Ranking__index.async.js +++ b/p__Classrooms__Lists__ProgramHomework__Detail__Ranking__index.async.js @@ -255,8 +255,13 @@ var ShixunsStaticItem = function ShixunsStaticItem(_ref) { return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("h2", { children: [" ", /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { - children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: [v.is_finish ? /*#__PURE__*/(0,jsx_runtime.jsx)("span", { children: "\u6700\u540E\u901A\u5173\u7684\u4EE3\u7801" + }) : /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + children: ["\u6700\u65B0\u4EE3\u7801", /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: "ml5 font12 c-grey-999", + children: "\u672A\u901A\u8FC7\u672C\u9898\uFF0C\u5C55\u793A\u6700\u540E\u63D0\u4EA4\u8BC4\u6D4B\u7684\u4EE3\u7801\u8BE6\u60C5" + })] }), (languages === null || languages === void 0 ? void 0 : languages.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default.Group */.ZP.Group, { defaultValue: language, style: { @@ -265,7 +270,7 @@ var ShixunsStaticItem = function ShixunsStaticItem(_ref) { onChange: function onChange(e) { var _languages$filter2; // console.log(languages,languages?.filter((item:any)=>item.language===e.target.value)?.[0]); - + v.language = e.target.value; setitem(languages === null || languages === void 0 ? void 0 : (_languages$filter2 = languages.filter(function (item) { return item.language === e.target.value; })) === null || _languages$filter2 === void 0 ? void 0 : _languages$filter2[0]); diff --git a/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js b/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js index 2141978af9..0fd120a573 100644 --- a/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js @@ -2684,8 +2684,13 @@ var ShixunsStaticItem = function ShixunsStaticItem(_ref) { return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("h2", { children: [" ", /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { - children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: [v.is_finish ? /*#__PURE__*/(0,jsx_runtime.jsx)("span", { children: "\u6700\u540E\u901A\u5173\u7684\u4EE3\u7801" + }) : /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + children: ["\u6700\u65B0\u4EE3\u7801", /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: "ml5 font12 c-grey-999", + children: "\u672A\u901A\u8FC7\u672C\u9898\uFF0C\u5C55\u793A\u6700\u540E\u63D0\u4EA4\u8BC4\u6D4B\u7684\u4EE3\u7801\u8BE6\u60C5" + })] }), (languages === null || languages === void 0 ? void 0 : languages.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default.Group */.ZP.Group, { defaultValue: language, style: { @@ -2694,7 +2699,7 @@ var ShixunsStaticItem = function ShixunsStaticItem(_ref) { onChange: function onChange(e) { var _languages$filter2; // console.log(languages,languages?.filter((item:any)=>item.language===e.target.value)?.[0]); - + v.language = e.target.value; setitem(languages === null || languages === void 0 ? void 0 : (_languages$filter2 = languages.filter(function (item) { return item.language === e.target.value; })) === null || _languages$filter2 === void 0 ? void 0 : _languages$filter2[0]); diff --git a/p__Classrooms__Lists__ProgramHomework__index.async.js b/p__Classrooms__Lists__ProgramHomework__index.async.js index e66ff3384c..cdf0bbe16c 100644 --- a/p__Classrooms__Lists__ProgramHomework__index.async.js +++ b/p__Classrooms__Lists__ProgramHomework__index.async.js @@ -2240,7 +2240,7 @@ var BottomControl = function BottomControl(_ref) { className: BottomControlmodules.buttonWrap, style: { position: "relative", - zIndex: 1003 + zIndex: 999 }, icon: /*#__PURE__*/(0,jsx_runtime.jsx)("i", { className: "iconfont icon-yidongmulu" diff --git a/p__Classrooms__Lists__Video__index.chunk.css b/p__Classrooms__Lists__Video__index.chunk.css index 39f4b1a973..46f53611f3 100644 --- a/p__Classrooms__Lists__Video__index.chunk.css +++ b/p__Classrooms__Lists__Video__index.chunk.css @@ -566,6 +566,13 @@ progress::-moz-progress-bar { .fullscreen-button___ur0es { margin-right: 0; } +.fullscreen-button___ur0es::before { + right: 0px; + left: inherit!important; + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; +} .fullscreen-button1___rfaXm { margin-top: -10px; } diff --git a/p__Competitions__Edit__index.async.js b/p__Competitions__Edit__index.async.js index e142700d43..64bfdee28f 100644 --- a/p__Competitions__Edit__index.async.js +++ b/p__Competitions__Edit__index.async.js @@ -9309,6 +9309,10 @@ var toConsumableArray_default = /*#__PURE__*/__webpack_require__.n(toConsumableA var space = __webpack_require__(42075); // EXTERNAL MODULE: ./node_modules/antd/es/input-number/index.js + 21 modules var input_number = __webpack_require__(31795); +// EXTERNAL MODULE: ./node_modules/antd/es/row/index.js +var row = __webpack_require__(71230); +// EXTERNAL MODULE: ./node_modules/antd/es/col/index.js +var col = __webpack_require__(15746); ;// CONCATENATED MODULE: ./src/assets/images/icons/question_setting.png var question_setting_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAAAXNSR0IArs4c6QAAA0JJREFUSEullk2ITlEYx3/PufdlxAYrTKyUhcgkG2LQzMbGhkJMyUca32mMyVdoMrOgoSkTZXxEmY2NDU1RWChEdlaEsfBZihozj+597533vOeee+ctb93e+3HO83/O//k/HwKgF6hH6CagEWEGAWByruibQO6agJ+E9MgqTkS23Z/EYH95RcC0DMh4xiOnbOfS+8ghw15p4mIWsJtbBGyIvU5PlW60DbiGfeuj/enpA4YpsUpW8tgGFT3LJ0xCYxFVrjMu5f4wfGYSDbKcoRRUtBP1xsQ1UE3vo2TPiqow+EPwlOk0ymKGI1DR02gchwoVlXv7xPZ9idWxx4bBjLO2rYrNXmlmdxnwFDrmZR6l1fF7IttYFqv7Go8JWFqTokNapInroicsQFd1dtxSZ0KaZTsPYsAbNDHK/QytvvgKvymxVPRYAphS4YqjAvQdYVBaWWerTvsZwLAaw9QYOFWvTwOGQdGOJIa2V2Xw55ToQXjLRN7Kbr76Ejl9p9eYTsDc+DLsBxqqtFG2PyLa7gEsUxvFdqe0c7kIyP2mN9mOoQ+D+NQv2uZQWq1YJWSPtNFbC6j204rhYgzli7+JVHqoBtEYDsoRzhdSeoUDwLmCGhtXMtEDOZRmy9wcaee9D1T7mI3ybixmrh4sQYrucxLfXVxW3h/mMUXWM+IFvEPAF35hqMvUYydFRPcUxDBdHPJSjtNQSGkvL4BFXkotXYi2OjH0JX/IDTnJljjZu1jCCJ2EQEiHHORZ0lOvY9icW3USu6K7LMDqflbudVEihxymxD1GOYNhrVN772I4SsAahK5M8js1WnSHIxq7nlaqxWsC5sditxmoVJVRAt4gLBj7nlOXRbdZMRxvrPB1+Fp7aOKc6FaH0qKOkdeucpLcV9RFWxxKff0sW2eLhih/P01siG7JqPQ0M+mUk/yppZzlrdGr1PGDDoRjdqqIbnIAJ1Ivl/j4P2BjHeQcs4APtqpFN/LJmUUHEHqYkJywlGxP/6PHWt4FcdXZB6yzlD0kuj4ZE/Maryui8WbVvNGybP92RGl5EDbOIFyL4bzunqZPdU5/o8TC6BUx6AjdCI3xjFqkyqIT+1IqYAjhIZNpk718+AfZ8LVXyCfCsQAAAABJRU5ErkJggg=="; ;// CONCATENATED MODULE: ./src/assets/images/icons/add_img.png @@ -9319,10 +9323,6 @@ var html_img_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB var drawer = __webpack_require__(35479); // EXTERNAL MODULE: ./node_modules/antd/es/spin/index.js + 1 modules var spin = __webpack_require__(57953); -// EXTERNAL MODULE: ./node_modules/antd/es/row/index.js -var row = __webpack_require__(71230); -// EXTERNAL MODULE: ./node_modules/antd/es/col/index.js -var col = __webpack_require__(15746); // EXTERNAL MODULE: ./node_modules/antd/es/divider/index.js + 1 modules var divider = __webpack_require__(96074); // EXTERNAL MODULE: ./node_modules/antd/es/pagination/index.js + 11 modules @@ -11088,31 +11088,50 @@ var questionsPage = function questionsPage(_ref) { children: classroomsList === null || classroomsList === void 0 ? void 0 : classroomsList.map(function (item) { return /*#__PURE__*/(0,jsx_runtime.jsx)(es_select/* default.Option */.Z.Option, { value: item === null || item === void 0 ? void 0 : item.id, - children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + children: /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + align: "middle", style: { - display: 'flex', padding: '0px 12px' }, - children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + align: "middle", style: { flex: 1 }, - children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { + children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { + children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + className: "mr20 font12", + style: { + lineHeight: "12px", + padding: "4px 10px", + borderRadius: 13, + color: item.is_end ? '#E53333' : '#3061D0', + border: "1px solid ".concat(item.is_end ? '#FFC4C4' : '#C4D2F1') + }, + children: item.is_end ? '已结束' : "进行中" + }) + }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { style: { - width: 56, - fontSize: 12, - height: 20, - display: 'inline-flex', - borderRadius: 13, - marginRight: 20, - alignItems: 'center', - justifyContent: 'center', - color: item.is_end ? '#E53333' : '#3061D0', - border: "1px solid ".concat(item.is_end ? '#FFC4C4' : '#C4D2F1') + flex: 1 }, - children: item.is_end ? '已结束' : "进行中" - }), item === null || item === void 0 ? void 0 : item.name] - }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + children: /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + placement: "topLeft", + title: item === null || item === void 0 ? void 0 : item.name, + overlayStyle: { + maxWidth: 430, + zIndex: 10000 + }, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { + style: { + textOverflow: "ellipsis", + overflow: "hidden", + maxWidth: 430 + }, + children: item === null || item === void 0 ? void 0 : item.name + }) + }) + })] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { style: { color: '#9096A3' }, diff --git a/p__Competitions__Update__index.async.js b/p__Competitions__Update__index.async.js index f8c84c0487..6732cc6050 100644 --- a/p__Competitions__Update__index.async.js +++ b/p__Competitions__Update__index.async.js @@ -345,7 +345,7 @@ var competitionDetails = function competitionDetails(_ref) { placeholder: "请输入队名", value: personname, maxLength: 60, - addonAfter: String(personname && personname.length) + "/60", + addonAfter: !!(personname !== null && personname !== void 0 && personname.length) ? String(personname && personname.length) + "/60" : "0/60", onChange: function onChange(e) { return setpersonname(e.target.value); } diff --git a/p__Engineering__Lists__CurseSetting__index.async.js b/p__Engineering__Lists__CurseSetting__index.async.js index f7a42f908f..f344e52cb9 100644 --- a/p__Engineering__Lists__CurseSetting__index.async.js +++ b/p__Engineering__Lists__CurseSetting__index.async.js @@ -2376,7 +2376,7 @@ var NoData = __webpack_require__(82982); function SettingModal_Addmodal(_ref) { - var _khdatas$ec_course_ta, _khdatas$evaluations, _khdatas$evaluations2; + var _tableInitRef$current, _tableInitRef$current2, _tableInitRef$current3, _khdatas$ec_course_ta, _khdatas$evaluations, _khdatas$evaluations2; var isshow = _ref.isshow, setishow = _ref.setishow, modalparams = _ref.modalparams, @@ -2473,8 +2473,8 @@ function SettingModal_Addmodal(_ref) { res = _context3.sent; setdatas(res); setwidth((res === null || res === void 0 ? void 0 : (_res$ec_course_target = res.ec_course_targets) === null || _res$ec_course_target === void 0 ? void 0 : _res$ec_course_target.length) * 75 + 227 + 240 + 32); - datas = res.ec_course_targets; - datas.unshift({ + datas = res === null || res === void 0 ? void 0 : res.ec_course_targets; + datas === null || datas === void 0 ? void 0 : datas.unshift({ content: '11' }); tableInitRef.current = datas; @@ -2662,7 +2662,8 @@ function SettingModal_Addmodal(_ref) { })] }, Math.random()), dataIndex: 'content', - width: ei === cloneData.length - 1 ? 120 : '', + // width:ei===cloneData.length-1?120:'', + width: 120, fixed: ei === cloneData.length - 1 ? "right" : '', render: function render(k, g) { return _render(k, g, e.id, ei); @@ -2694,7 +2695,7 @@ function SettingModal_Addmodal(_ref) { tab: "\u8BBE\u7F6E\u8003\u6838\u65B9\u5F0F\u5360\u6BD4", children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { - marginTop: '30px', + marginTop: '10px', color: '#464F66', fontSize: '14px' }, @@ -2707,7 +2708,7 @@ function SettingModal_Addmodal(_ref) { columns: column, bordered: true, scroll: { - x: 2000 + x: ((_tableInitRef$current = tableInitRef.current) === null || _tableInitRef$current === void 0 ? void 0 : _tableInitRef$current.length) * 120 + 180 > width || ((_tableInitRef$current2 = tableInitRef.current) === null || _tableInitRef$current2 === void 0 ? void 0 : _tableInitRef$current2.length) * 120 + 180 > 1060 ? ((_tableInitRef$current3 = tableInitRef.current) === null || _tableInitRef$current3 === void 0 ? void 0 : _tableInitRef$current3.length) * 120 + 180 : 'max-content' }, dataSource: datas === null || datas === void 0 ? void 0 : datas.evaluations, pagination: false @@ -2716,7 +2717,7 @@ function SettingModal_Addmodal(_ref) { tab: "\u8BBE\u7F6E\u8003\u6838\u5185\u5BB9\u5360\u6BD4", children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { - marginTop: '30px', + marginTop: '10px', color: '#464F66', fontSize: '14px' }, @@ -5797,7 +5798,7 @@ var Page = function Page(_ref) { })), children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { style: { - padding: '16px 40px' + padding: '16px 0' }, children: /*#__PURE__*/(0,jsx_runtime.jsxs)(tabs/* default */.Z, { activeKey: currt, diff --git a/p__MoopCases__FormPanel__index.async.js b/p__MoopCases__FormPanel__index.async.js index 0f08c85091..e38fd6927a 100644 --- a/p__MoopCases__FormPanel__index.async.js +++ b/p__MoopCases__FormPanel__index.async.js @@ -167,11 +167,14 @@ function getBase64(img, callback) { form: form, initialValues: initialValues, className: "moop-panel", + style: { + marginBottom: 20 + }, onFinish: onSubmit, children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { label: "\u6807\u9898", name: "title", - extra: /*#__PURE__*/(0,jsx_runtime.jsx)("p", { + extra: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "tip", children: "\u7B80\u660E\u627C\u8981\u4ECB\u7ECD\u6587\u6863/\u89C6\u9891\u6240\u5305\u542B\u7684\u4E3B\u8981\u7684\u5185\u5BB9" }), diff --git a/p__MoopCases__FormPanel__index.chunk.css b/p__MoopCases__FormPanel__index.chunk.css index b58f9e0274..659e7d97f6 100644 --- a/p__MoopCases__FormPanel__index.chunk.css +++ b/p__MoopCases__FormPanel__index.chunk.css @@ -108,7 +108,7 @@ width: 1200px; margin: 0 auto; background: #fff; - padding: 30px; + padding: 30px 30px 10px !important; } .moop-panel .tip { margin-top: 10px; @@ -120,6 +120,7 @@ display: flex; flex-flow: column nowrap; justify-content: center; + align-items: center; border: 1px dashed #ccc; font-size: 24px; margin-bottom: 10px; diff --git a/p__MyProblem__RecordDetail__index.chunk.css b/p__MyProblem__RecordDetail__index.chunk.css index a4f1e40449..5a78a4657f 100644 --- a/p__MyProblem__RecordDetail__index.chunk.css +++ b/p__MyProblem__RecordDetail__index.chunk.css @@ -108,7 +108,7 @@ position: relative; } .upBtn___RGH6X button { - position: absolute; + position: absolute !important; z-index: 10; top: -47px; right: 4px; diff --git a/p__MyProblem__index.async.js b/p__MyProblem__index.async.js index e20acbda1e..be53f20087 100644 --- a/p__MyProblem__index.async.js +++ b/p__MyProblem__index.async.js @@ -6827,6 +6827,24 @@ function ActionBar(_ref8) { onOk: onResetCode }); }; + var _useSearchParams3 = (0,_umi_production_exports.useSearchParams)(), + _useSearchParams4 = slicedToArray_default()(_useSearchParams3, 1), + searchParams = _useSearchParams4[0]; + var type = searchParams.get('language'); + var getLanguage = function getLanguage(type) { + if (type === '1') { + return 'c++'; + } + if (type === '2') { + return 'C++'; + } + return type; + }; + (0,react.useEffect)(function () { + if (type) { + onChangeLanguage(getLanguage(type)); + } + }, []); console.log(hack, 'hack'); return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: "action-bar", @@ -6836,6 +6854,7 @@ function ActionBar(_ref8) { children: [(hack === null || hack === void 0 ? void 0 : hack.is_program) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_select/* default */.Z, { className: "oj-select", value: hack === null || hack === void 0 ? void 0 : hack.language, + defaultValue: getLanguage(type), style: { width: 100 }, diff --git a/p__MyProblem__index.chunk.css b/p__MyProblem__index.chunk.css index 0881d3f10e..a082e67de1 100644 --- a/p__MyProblem__index.chunk.css +++ b/p__MyProblem__index.chunk.css @@ -304,7 +304,7 @@ position: relative; } .upBtn___RGH6X button { - position: absolute; + position: absolute !important; z-index: 10; top: -47px; right: 4px; diff --git a/p__Paperlibrary__Add__index.async.js b/p__Paperlibrary__Add__index.async.js index 93cc0ad507..e793f9e482 100644 --- a/p__Paperlibrary__Add__index.async.js +++ b/p__Paperlibrary__Add__index.async.js @@ -537,6 +537,7 @@ var jsx_runtime = __webpack_require__(85893); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! antd */ 15746); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! antd */ 31795); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! antd */ 79035); +/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! antd */ 78045); /* harmony import */ var _MdEditorInForm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./MdEditorInForm */ 95293); /* harmony import */ var umi__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! umi */ 89214); /* harmony import */ var _index_less_modules__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./index.less?modules */ 52654); @@ -911,6 +912,31 @@ var BProgramEditor = function BProgramEditor(_ref2) { className: "ml10 font14", children: "\u79D2" })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_13__/* ["default"].Item */ .Z.Item, { + label: "\u586B\u7A7A\u9879\u7B54\u6848\u7684\u7A7A\u683C\u5904\u7406\u65B9\u5F0F", + style: { + marginTop: 30 + }, + name: ['hack', 'submit_rule'], + labelCol: { + span: 24 + }, + rules: [{ + required: true, + message: '请选择编程语言' + }], + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"].Group */ .ZP.Group, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 0, + children: "\u4E0D\u5FFD\u7565\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 1, + children: "\u5FFD\u7565\u9996\u5C3E\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 2, + children: "\u5FFD\u7565\u6240\u6709\u7A7A\u683C" + })] + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z, { align: "middle", style: { @@ -7640,7 +7666,7 @@ var BProgramEditor_DragQuestions = function DragQuestions(_ref) { var _qitem$hack, _qitem$program_attr, _qitem$program_attr2, _qitem$hack_sets; form.setFieldsValue(objectSpread2_default()(objectSpread2_default()({}, qitem), {}, { standard_answers: qitem.standard_answer, - difficulty: qitem.difficult, + difficulty: qitem.difficulty, item_banks_group_id: qitem.item_banks_group_id, hack: objectSpread2_default()(objectSpread2_default()({}, qitem), {}, { time_limit: (qitem === null || qitem === void 0 ? void 0 : (_qitem$hack = qitem.hack) === null || _qitem$hack === void 0 ? void 0 : _qitem$hack.time_limit) || 3 @@ -10905,7 +10931,8 @@ var AddNewPaper = function AddNewPaper(_ref) { use_keywords: false, use_blank_score: true, keywords: [], - allow_student_debug: false + allow_student_debug: false, + submit_rule: 1 }); } }, diff --git a/p__Paths__Detail__id.async.js b/p__Paths__Detail__id.async.js index 9495531903..589fcfcbd2 100644 --- a/p__Paths__Detail__id.async.js +++ b/p__Paths__Detail__id.async.js @@ -12102,7 +12102,7 @@ var Stage = function Stage(_ref) { if (val.item_type == "StageCatalog" && val.children.length > 0) { var children = val.children.filter(function (item) { var reg = new RegExp(props === null || props === void 0 ? void 0 : props.keywords, "ig"); - return reg.test(item.name) && (item.item_type == visibleType || visibleType == 'All'); + return reg.test(item.name) && (item.item_type == visibleType || visibleType == 'All' || item.item_type == "SubjectHomework" && (visibleType == 'group_count' || visibleType == 'normal_count')) && item.item_type != "StageCatalog"; }); if (children.length > 0) return objectSpread2_default()(objectSpread2_default()({}, val), {}, { children: children @@ -12131,8 +12131,7 @@ var Stage = function Stage(_ref) { if (props !== null && props !== void 0 && props.keywords) { kdata = val.items.map(function (item) { var reg = new RegExp(props === null || props === void 0 ? void 0 : props.keywords, "ig"); - if (item.item_type == "StageCatalog") return addtoKdata(item); - if (reg.test(item.name) && (item.item_type == visibleType || visibleType == 'All')) return item; + if (item.item_type == "StageCatalog") return addtoKdata(item);else if (reg.test(item.name) && (item.item_type == visibleType || visibleType == 'All' || item.item_type == "SubjectHomework" && (visibleType == 'group_count' || visibleType == 'normal_count')) && item.item_type != "StageCatalog") return item; }); kdata = kdata.filter(function (item) { return item != undefined && item != null; @@ -12733,12 +12732,17 @@ var Stage = function Stage(_ref) { name: "name", rules: [{ required: true, + message: "请输入名称" + }, { + max: 60, + message: "输入超限，请缩减字符数" + }, { + whitespace: true, message: '请输入名称' }], children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, { - suffix: /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { - children: [addValue.name.length, "/60"] - }) + showCount: true, + maxLength: 60 }) })] }) @@ -14052,7 +14056,7 @@ var ContinuousForceDirectedLayout = /*#__PURE__*/function (_go$ForceDirectedLayo var colors = ['#3CDAA3', '#9C41DE', '#F84F90', '#30A7F1', '#6656FF']; var textcolor = ['根节点', '课件知识单元', '实训知识单元', '文本知识单元', '知识点']; var knowledge_Atlas = function Atlas(_ref) { - var _pathsDetail$detail3, _pathsDetail$detail4, _pathsDetail$detail5, _pathsDetail$detail6, _pathsDetail$detail7, _pathsDetail$detail8, _items$relations, _items$descriptions; + var _pathsDetail$detail3, _pathsDetail$detail4, _pathsDetail$detail5, _pathsDetail$detail6, _pathsDetail$detail7, _pathsDetail$detail8, _items, _items$relations, _items$descriptions; var user = _ref.user, pathsDetail = _ref.pathsDetail; var params = (0,_umi_production_exports.useParams)(); @@ -15314,7 +15318,7 @@ var knowledge_Atlas = function Atlas(_ref) { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { className: knowledgemodules.line }), "\u5173\u7CFB"] - }), items === null || items === void 0 ? void 0 : (_items$relations = items.relations) === null || _items$relations === void 0 ? void 0 : _items$relations.map(function (item, index) { + }), (_items = items) === null || _items === void 0 ? void 0 : (_items$relations = _items.relations) === null || _items$relations === void 0 ? void 0 : _items$relations.map(function (item, index) { return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { display: 'flex', @@ -15346,13 +15350,14 @@ var knowledge_Atlas = function Atlas(_ref) { content: '请确认是否将节点之间的关系解绑', onOk: function () { var _onOk4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee9() { + var _items2; var res, _items$relations2; return regeneratorRuntime_default()().wrap(function _callee9$(_context9) { while (1) switch (_context9.prev = _context9.next) { case 0: setsploading(true); _context9.next = 3; - return (0,fetch/* default */.ZP)("/api/knowledge_graphs/".concat(items === null || items === void 0 ? void 0 : items.id, "/delete_relation.json"), { + return (0,fetch/* default */.ZP)("/api/knowledge_graphs/".concat((_items2 = items) === null || _items2 === void 0 ? void 0 : _items2.id, "/delete_relation.json"), { method: 'POST', body: { relation_id: item.relation_id @@ -15940,6 +15945,8 @@ var knowledge_Atlas = function Atlas(_ref) { }); } setFileList([]); + items = {}; + setitems({}); if ((res === null || res === void 0 ? void 0 : res.success) > 0) { message/* default.info */.ZP.info('添加成功'); } diff --git a/p__Paths__New__index.async.js b/p__Paths__New__index.async.js index 31ec85b378..2617c669e4 100644 --- a/p__Paths__New__index.async.js +++ b/p__Paths__New__index.async.js @@ -950,6 +950,9 @@ var NewCoursePage = function NewCoursePage(_ref) { rules: [{ required: true, message: '请输入实践课程的简介' + }, { + whitespace: true, + message: '请输入实践课程的简介' }, { max: 65000, message: '实践课程的简介最大限制65000个字符' @@ -998,6 +1001,9 @@ var NewCoursePage = function NewCoursePage(_ref) { rules: [{ required: true, message: '请输入实践课程的课程须知' + }, { + whitespace: true, + message: '请输入实践课程的课程须知' }, { max: 65000, message: '实践课程的课程须知最大限制65000个字符' diff --git a/p__Problems__OjForm__NewEdit__index.async.js b/p__Problems__OjForm__NewEdit__index.async.js index 1bfc26c17b..23b10df87c 100644 --- a/p__Problems__OjForm__NewEdit__index.async.js +++ b/p__Problems__OjForm__NewEdit__index.async.js @@ -4039,6 +4039,27 @@ function BaseInfo(_ref) { className: "ml10", children: "%" })] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { + label: "\u8BC4\u6D4B\u65F6\u7A7A\u683C\u5904\u7406", + name: ['hack', 'submit_rule'] + // labelCol={{ span: 24 }} + , + rules: [{ + required: true, + message: '请选择编程语言' + }], + children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_radio/* default.Group */.ZP.Group, { + children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, { + value: 0, + children: "\u4E0D\u5FFD\u7565\u7A7A\u683C" + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, { + value: 1, + children: "\u5FFD\u7565\u9996\u5C3E\u7A7A\u683C" + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, { + value: 2, + children: "\u5FFD\u7565\u6240\u6709\u7A7A\u683C" + })] + }) }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { className: NewEditmodules.radioBtnWrapper, name: ['hack', 'is_file'], @@ -4432,6 +4453,7 @@ function reducer(state, action) { is_my, codes, answer_text, + submit_rule, _getDisciplineIds, _getDisciplineIds2, ids, @@ -4489,7 +4511,7 @@ function reducer(state, action) { } } else { // console.log(res.hack_sets, 'response1') - category = res.category, _user = res.user, code = res.code, language = res.language, _hack_sets = res.hack_sets, description = res.description, difficult = res.difficult, name = res.name, open_or_not = res.open_or_not, sub_discipline_id = res.sub_discipline_id, tag_discipline_id = res.tag_discipline_id, analysis = res.analysis, time_limit = res.time_limit, _test_set_average = res.test_set_average, test_set_score = res.test_set_score, _status = res.status, tag_discipline_ids = res.tag_discipline_ids, item_banks_group_id = res.item_banks_group_id, _res$is_file = res.is_file, is_file = _res$is_file === void 0 ? false : _res$is_file, hide_actual_output = res.hide_actual_output, code_compile_score = res.code_compile_score, languages = res.languages, is_my = res.is_my, codes = res.codes, answer_text = res.answer_text; // + category = res.category, _user = res.user, code = res.code, language = res.language, _hack_sets = res.hack_sets, description = res.description, difficult = res.difficult, name = res.name, open_or_not = res.open_or_not, sub_discipline_id = res.sub_discipline_id, tag_discipline_id = res.tag_discipline_id, analysis = res.analysis, time_limit = res.time_limit, _test_set_average = res.test_set_average, test_set_score = res.test_set_score, _status = res.status, tag_discipline_ids = res.tag_discipline_ids, item_banks_group_id = res.item_banks_group_id, _res$is_file = res.is_file, is_file = _res$is_file === void 0 ? false : _res$is_file, hide_actual_output = res.hide_actual_output, code_compile_score = res.code_compile_score, languages = res.languages, is_my = res.is_my, codes = res.codes, answer_text = res.answer_text, submit_rule = res.submit_rule; // _getDisciplineIds = (0,util/* getDisciplineIds */.y3)(discips, sub_discipline_id), _getDisciplineIds2 = slicedToArray_default()(_getDisciplineIds, 2), ids = _getDisciplineIds2[0], dictData = _getDisciplineIds2[1]; // console.log('----',hack_sets); new_hack_sets = is_file ? [{ input: '', @@ -4541,7 +4563,8 @@ function reducer(state, action) { code_compile_score: code_compile_score, hide_actual_output: hide_actual_output, analysis: analysis, - answer_text: answer_text + answer_text: answer_text, + submit_rule: submit_rule }, hack_sets: new_hack_sets, tags: tag_discipline_ids, @@ -4617,7 +4640,8 @@ function reducer(state, action) { name: '', item_banks_group_ids: bankstime, is_file: false, - answer_text: '' + answer_text: '', + submit_rule: 1 }, tags: _tag_discipline_id ? _tag_discipline_id === null || _tag_discipline_id === void 0 ? void 0 : _tag_discipline_id.split(',').map(function (t) { return parseInt(t, 10); diff --git a/p__Problems__OjForm__index.async.js b/p__Problems__OjForm__index.async.js index eb562297d6..48ffb9cc71 100644 --- a/p__Problems__OjForm__index.async.js +++ b/p__Problems__OjForm__index.async.js @@ -3739,6 +3739,7 @@ function reducer(state, action) { languages, is_my, codes, + submit_rule, _getDisciplineIds, _getDisciplineIds2, ids, @@ -3796,7 +3797,7 @@ function reducer(state, action) { } } else { // console.log(res.hack_sets, 'response1') - category = res.category, _user = res.user, code = res.code, language = res.language, _hack_sets = res.hack_sets, description = res.description, difficult = res.difficult, name = res.name, open_or_not = res.open_or_not, sub_discipline_id = res.sub_discipline_id, tag_discipline_id = res.tag_discipline_id, analysis = res.analysis, time_limit = res.time_limit, _test_set_average = res.test_set_average, test_set_score = res.test_set_score, _status = res.status, tag_discipline_ids = res.tag_discipline_ids, item_banks_group_id = res.item_banks_group_id, _res$is_file = res.is_file, is_file = _res$is_file === void 0 ? false : _res$is_file, hide_actual_output = res.hide_actual_output, code_compile_score = res.code_compile_score, languages = res.languages, is_my = res.is_my, codes = res.codes; // + category = res.category, _user = res.user, code = res.code, language = res.language, _hack_sets = res.hack_sets, description = res.description, difficult = res.difficult, name = res.name, open_or_not = res.open_or_not, sub_discipline_id = res.sub_discipline_id, tag_discipline_id = res.tag_discipline_id, analysis = res.analysis, time_limit = res.time_limit, _test_set_average = res.test_set_average, test_set_score = res.test_set_score, _status = res.status, tag_discipline_ids = res.tag_discipline_ids, item_banks_group_id = res.item_banks_group_id, _res$is_file = res.is_file, is_file = _res$is_file === void 0 ? false : _res$is_file, hide_actual_output = res.hide_actual_output, code_compile_score = res.code_compile_score, languages = res.languages, is_my = res.is_my, codes = res.codes, submit_rule = res.submit_rule; // _getDisciplineIds = (0,_util__WEBPACK_IMPORTED_MODULE_9__/* .getDisciplineIds */ .y3)(discips, sub_discipline_id), _getDisciplineIds2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_5___default()(_getDisciplineIds, 2), ids = _getDisciplineIds2[0], dictData = _getDisciplineIds2[1]; setischecked(hide_actual_output); // console.log('----',hack_sets); @@ -3850,7 +3851,8 @@ function reducer(state, action) { is_file: is_file, is_my: is_my, code_compile_score: code_compile_score, - analysis: analysis + analysis: analysis, + submit_rule: submit_rule }, hack_sets: new_hack_sets, tags: tag_discipline_ids, @@ -4125,6 +4127,7 @@ function reducer(state, action) { tag_discipline_ids: hack.tag_discipline_ids, item_banks_group_ids: hack.item_banks_group_ids, analysis: hack.analysis + // identifier: id }); case 32: @@ -5217,6 +5220,26 @@ function LeftPanel(_ref5) { })] }) }) + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.jsx)(antd__WEBPACK_IMPORTED_MODULE_31__/* ["default"].Item */ .Z.Item, { + label: "\u8BC4\u6D4B\u65F6\u7A7A\u683C\u5904\u7406", + name: ['hack', 'submit_rule'] + // labelCol={{ span: 24 }} + , + rules: [{ + required: true + }], + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_40__/* ["default"].Group */ .ZP.Group, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.jsx)(antd__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .ZP, { + value: 0, + children: "\u4E0D\u5FFD\u7565\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.jsx)(antd__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .ZP, { + value: 1, + children: "\u5FFD\u7565\u9996\u5C3E\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.jsx)(antd__WEBPACK_IMPORTED_MODULE_40__/* ["default"] */ .ZP, { + value: 2, + children: "\u5FFD\u7565\u6240\u6709\u7A7A\u683C" + })] + }) }), !hack.test_set_score && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.jsx)(antd__WEBPACK_IMPORTED_MODULE_31__/* ["default"].Item */ .Z.Item, { name: ['hack', 'test_set_average'], label: "\u7CFB\u7EDF\u8BC4\u5206\u5360\u6BD4", @@ -5344,6 +5367,9 @@ function LeftPanel(_ref5) { }), !test_set_score ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.Fragment, { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_27__.jsx)(antd__WEBPACK_IMPORTED_MODULE_31__/* ["default"].Item */ .Z.Item, { name: [field.name, 'score'], + style: { + marginBottom: 0 + }, fieldKey: [field.fieldKey, 'score'], rules: [{ required: true, diff --git a/p__Problems__OjForm__index.chunk.css b/p__Problems__OjForm__index.chunk.css index beceb74c40..24eb02a948 100644 --- a/p__Problems__OjForm__index.chunk.css +++ b/p__Problems__OjForm__index.chunk.css @@ -108,7 +108,7 @@ position: relative; } .upBtn___RGH6X button { - position: absolute; + position: absolute !important; z-index: 10; top: -47px; right: 4px; diff --git a/p__Problemset__NewItem__index.async.js b/p__Problemset__NewItem__index.async.js index 460ec3a3ab..4a9025c1c7 100644 --- a/p__Problemset__NewItem__index.async.js +++ b/p__Problemset__NewItem__index.async.js @@ -850,6 +850,7 @@ var jsx_runtime = __webpack_require__(85893); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! antd */ 15746); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! antd */ 31795); /* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! antd */ 79035); +/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! antd */ 78045); /* harmony import */ var _MdEditorInForm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./MdEditorInForm */ 95293); /* harmony import */ var umi__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! umi */ 89214); /* harmony import */ var _index_less_modules__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./index.less?modules */ 52654); @@ -1224,6 +1225,31 @@ var BProgramEditor = function BProgramEditor(_ref2) { className: "ml10 font14", children: "\u79D2" })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_13__/* ["default"].Item */ .Z.Item, { + label: "\u586B\u7A7A\u9879\u7B54\u6848\u7684\u7A7A\u683C\u5904\u7406\u65B9\u5F0F", + style: { + marginTop: 30 + }, + name: ['hack', 'submit_rule'], + labelCol: { + span: 24 + }, + rules: [{ + required: true, + message: '请选择编程语言' + }], + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"].Group */ .ZP.Group, { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 0, + children: "\u4E0D\u5FFD\u7565\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 1, + children: "\u5FFD\u7565\u9996\u5C3E\u7A7A\u683C" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .ZP, { + value: 2, + children: "\u5FFD\u7565\u6240\u6709\u7A7A\u683C" + })] + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .Z, { align: "middle", style: { @@ -6760,7 +6786,8 @@ var NewItem = function NewItem(_ref2) { form.setFieldsValue({ hack: { time_limit: 3, - allow_student_debug: false + allow_student_debug: false, + submit_rule: 1 } }); break; @@ -6769,6 +6796,11 @@ var NewItem = function NewItem(_ref2) { var handleValuesChange = function handleValuesChange(changedValues, allowChangeValues) { var _changedValues$hack; if (changedValues !== null && changedValues !== void 0 && changedValues.item_type) { + if ((changedValues === null || changedValues === void 0 ? void 0 : changedValues.item_type) === "PROGRAM") { + (0,util/* openNewWindow */.xg)("/problems/newcreate"); + // return + } + //更改了试题类型，需要重新设置初始值（只有创建的时候才可以改变试题类型） setInitDataByQuestionType(changedValues === null || changedValues === void 0 ? void 0 : changedValues.item_type, allowChangeValues === null || allowChangeValues === void 0 ? void 0 : allowChangeValues.item_banks_group_id); setUnfold(false); diff --git a/p__Problemset__index.async.js b/p__Problemset__index.async.js index 59b3da6f49..96f9c8ab73 100644 --- a/p__Problemset__index.async.js +++ b/p__Problemset__index.async.js @@ -3991,54 +3991,52 @@ var FolderItems = function FolderItems(_ref) { }) })] }) : /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { - children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", { + className: "iconfont icon-shangyi3 ml10", onClick: function onClick() { return onMove(id, 'up'); + } + }), /*#__PURE__*/(0,jsx_runtime.jsx)("i", { + className: "iconfont icon-shangyi3 ml10", + style: { + transform: 'rotate(180deg)' }, - className: "ml0", - children: /*#__PURE__*/(0,jsx_runtime.jsx)("i", { - className: "iconfont icon-shangyi3", - style: { - transform: 'translateY(2px)' - } - }) - }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { onClick: function onClick() { return onMove(id, 'down'); + } + })] + }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + style: { + position: 'relative', + top: '-2px', + display: 'flex' + }, + children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + className: "ml10", + onClick: function onClick() { + // if (!itemBanksCount) { + // message.warning('该目录下没有试题'); + // return; + // } + onShare(Math.abs(id)); }, + type: "link", + children: "\u5171\u4EAB\u5168\u90E8\u6587\u4EF6\u5939" + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { className: "ml10", - style: { - transform: 'rotate(180deg) translateY(1px)' + onClick: function onClick() { + return setVisible(true); }, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("i", { - className: "iconfont icon-shangyi3" - }) + type: "link", + children: "\u91CD\u547D\u540D" + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { + onClick: function onClick() { + return onDelete(id); + }, + type: "link", + danger: true, + children: "\u5220\u9664" })] - }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { - className: "ml10", - onClick: function onClick() { - // if (!itemBanksCount) { - // message.warning('该目录下没有试题'); - // return; - // } - onShare(Math.abs(id)); - }, - type: "link", - children: "\u5171\u4EAB\u5168\u90E8\u6587\u4EF6\u5939" - }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { - className: "ml10", - onClick: function onClick() { - return setVisible(true); - }, - type: "link", - children: "\u91CD\u547D\u540D" - }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { - onClick: function onClick() { - return onDelete(id); - }, - type: "link", - danger: true, - children: "\u5220\u9664" })] })] }); @@ -6384,7 +6382,9 @@ var Bprogram_Completion = function Completion(_ref) { payload: {} }); }; - console.log('---', choices); + + // console.log('---', data); + return /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { centered: true, destroyOnClose: true, @@ -6405,9 +6405,9 @@ var Bprogram_Completion = function Completion(_ref) { showProgramFill: true, onFillChange: function onFillChange(e) { var items = e === null || e === void 0 ? void 0 : e.map(function (item, index) { - var _item$value, _item$answer; + var _item$value, _item$answer, _item$value2, _item$answer2; return objectSpread2_default()(objectSpread2_default()({}, item), {}, { - types: ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.trim()) === ((_item$answer = item.answer) === null || _item$answer === void 0 ? void 0 : _item$answer.trim()) ? 'success' : 'warning' + types: (data === null || data === void 0 ? void 0 : data.submit_rule) === 0 ? item.value === item.answer ? 'success' : 'warning' : (data === null || data === void 0 ? void 0 : data.submit_rule) === 1 ? ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.trim()) === ((_item$answer = item.answer) === null || _item$answer === void 0 ? void 0 : _item$answer.trim()) ? 'success' : 'warning' : ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.replaceAll(' ', '')) === ((_item$answer2 = item.answer) === null || _item$answer2 === void 0 ? void 0 : _item$answer2.replaceAll(' ', '')) ? 'success' : 'warning' }); }); setChoices(items); diff --git a/p__Problemset__index.chunk.css b/p__Problemset__index.chunk.css index 899f69949f..dd66d9d1ce 100644 --- a/p__Problemset__index.chunk.css +++ b/p__Problemset__index.chunk.css @@ -992,8 +992,8 @@ span[class~='ant-checkbox-checked'] span[class~='ant-checkbox-inner']::after { background-color: #fff; } .exportBtn___uePYs { - display: flex; - align-items: center; + display: flex !important; + align-items: center !important; padding: 0; } .exportBtn___uePYs:hover span { @@ -1601,11 +1601,12 @@ span[class~='ant-checkbox-checked'] span[class~='ant-checkbox-inner']::after { display: inline-flex; align-items: center; justify-content: start; + width: 600px; } .list___Ur31H .btns___ITJo0 { display: none; - align-items: center; justify-content: start; + align-items: center; margin-left: 10px; } .list___Ur31H .btns___ITJo0 button { @@ -1662,6 +1663,8 @@ span[class~='ant-checkbox-checked'] span[class~='ant-checkbox-inner']::after { .folderWrapper___szWWk .folderIcon___MdKkF { height: 20px; width: 20px; + position: relative; + top: -2px; } .folderWrapper___szWWk .share_folderIcon___G1rNy { width: 24px; diff --git a/p__Question__AddOrEdit__index.async.js b/p__Question__AddOrEdit__index.async.js index 291f2a6f6b..9491a2b3fc 100644 --- a/p__Question__AddOrEdit__index.async.js +++ b/p__Question__AddOrEdit__index.async.js @@ -3446,7 +3446,7 @@ function AddOrEdit_reducer(state, action) { code: '' }]; var initData = (0,react.useCallback)( /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() { - var response, _user, _language, _hack_sets, practice_codes, description, difficulty, name, open_or_not, time_limit, _test_set_average, test_set_score, _status, tag_discipline_ids, source_discipline_ids, item_banks_group_id, _response$is_file, is_file, hide_actual_output, review_privilege, review_description, review, new_hack_sets, rs, newCodes, _yield$getUser, _user2; + var response, _user, _language, _hack_sets, practice_codes, description, difficulty, name, open_or_not, time_limit, _test_set_average, test_set_score, _status, tag_discipline_ids, source_discipline_ids, item_banks_group_id, _response$is_file, is_file, hide_actual_output, review_privilege, review_description, submit_rule, review, new_hack_sets, rs, newCodes, _yield$getUser, _user2; return regeneratorRuntime_default()().wrap(function _callee2$(_context2) { while (1) switch (_context2.prev = _context2.next) { case 0: @@ -3462,7 +3462,7 @@ function AddOrEdit_reducer(state, action) { return getProgrammingTopic(id); case 4: response = _context2.sent; - _user = response.user, _language = response.language, _hack_sets = response.practice_sets, practice_codes = response.practice_codes, description = response.description, difficulty = response.difficulty, name = response.name, open_or_not = response.open_or_not, time_limit = response.time_limit, _test_set_average = response.test_set_average, test_set_score = response.test_set_score, _status = response.status, tag_discipline_ids = response.tag_discipline_ids, source_discipline_ids = response.source_discipline_ids, item_banks_group_id = response.item_banks_group_id, _response$is_file = response.is_file, is_file = _response$is_file === void 0 ? false : _response$is_file, hide_actual_output = response.hide_actual_output, review_privilege = response.review_privilege, review_description = response.review_description; + _user = response.user, _language = response.language, _hack_sets = response.practice_sets, practice_codes = response.practice_codes, description = response.description, difficulty = response.difficulty, name = response.name, open_or_not = response.open_or_not, time_limit = response.time_limit, _test_set_average = response.test_set_average, test_set_score = response.test_set_score, _status = response.status, tag_discipline_ids = response.tag_discipline_ids, source_discipline_ids = response.source_discipline_ids, item_banks_group_id = response.item_banks_group_id, _response$is_file = response.is_file, is_file = _response$is_file === void 0 ? false : _response$is_file, hide_actual_output = response.hide_actual_output, review_privilege = response.review_privilege, review_description = response.review_description, submit_rule = response.submit_rule; review = { review_privilege: review_privilege, status: _status, @@ -3501,7 +3501,8 @@ function AddOrEdit_reducer(state, action) { test_set_score: test_set_score, tag_discipline_ids: tag_discipline_ids, source_discipline_ids: source_discipline_ids, - is_file: is_file + is_file: is_file, + submit_rule: submit_rule }, hack_sets: new_hack_sets } @@ -3554,7 +3555,8 @@ function AddOrEdit_reducer(state, action) { test_set_average: true, open_or_not: true, name: '', - is_file: false + is_file: false, + submit_rule: 1 }, hack_sets: [{ input: '', @@ -4683,6 +4685,27 @@ function LeftPanel(_ref6) { })] }) }) + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { + label: "\u8BC4\u6D4B\u65F6\u7A7A\u683C\u5904\u7406", + name: ['hack', 'submit_rule'] + // labelCol={{ span: 24 }} + , + rules: [{ + required: true, + message: '请选择编程语言' + }], + children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_radio/* default.Group */.ZP.Group, { + children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, { + value: 0, + children: "\u4E0D\u5FFD\u7565\u7A7A\u683C" + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, { + value: 1, + children: "\u5FFD\u7565\u9996\u5C3E\u7A7A\u683C" + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, { + value: 2, + children: "\u5FFD\u7565\u6240\u6709\u7A7A\u683C" + })] + }) }), !hack.test_set_score && /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { name: ['hack', 'test_set_average'], label: "\u7CFB\u7EDF\u8BC4\u5206\u5360\u6BD4", diff --git a/p__Question__OjProblem__RecordDetail__index.chunk.css b/p__Question__OjProblem__RecordDetail__index.chunk.css index a45b9e8fd1..1589395bdc 100644 --- a/p__Question__OjProblem__RecordDetail__index.chunk.css +++ b/p__Question__OjProblem__RecordDetail__index.chunk.css @@ -108,7 +108,7 @@ position: relative; } .upBtn___RGH6X button { - position: absolute; + position: absolute !important; z-index: 10; top: -47px; right: 4px; diff --git a/p__Question__OjProblem__index.chunk.css b/p__Question__OjProblem__index.chunk.css index bcd3de521e..4e9032560c 100644 --- a/p__Question__OjProblem__index.chunk.css +++ b/p__Question__OjProblem__index.chunk.css @@ -304,7 +304,7 @@ position: relative; } .upBtn___RGH6X button { - position: absolute; + position: absolute !important; z-index: 10; top: -47px; right: 4px; @@ -3234,6 +3234,13 @@ progress::-moz-progress-bar { .fullscreen-button___ur0es { margin-right: 0; } +.fullscreen-button___ur0es::before { + right: 0px; + left: inherit!important; + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; +} .fullscreen-button1___rfaXm { margin-top: -10px; } diff --git a/p__Shixuns__Edit__body__Warehouse__index.async.js b/p__Shixuns__Edit__body__Warehouse__index.async.js index d56ee16680..108af7f47c 100644 --- a/p__Shixuns__Edit__body__Warehouse__index.async.js +++ b/p__Shixuns__Edit__body__Warehouse__index.async.js @@ -3128,12 +3128,10 @@ var Repository = function Repository(_ref) { draggable: true, onDragEnter: onDragEnter, onDrop: onDrop, - className: Treemodules.gitTree, - allowDrop: function allowDrop(_ref12) { - var dropNode = _ref12.dropNode, - dropPosition = _ref12.dropPosition; - return false; - } + className: Treemodules.gitTree + // allowDrop={({ dropNode, dropPosition }: any) => { + // return false + // }} // onCheck={handleCheckTree} })] }) @@ -3147,7 +3145,7 @@ var Repository = function Repository(_ref) { }, isRepository: !isRepository, onOK: /*#__PURE__*/function () { - var _ref13 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee12(data) { + var _ref12 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee12(data) { var pathArr; return regeneratorRuntime_default()().wrap(function _callee12$(_context12) { while (1) switch (_context12.prev = _context12.next) { @@ -3166,7 +3164,7 @@ var Repository = function Repository(_ref) { }, _callee12); })); return function (_x13) { - return _ref13.apply(this, arguments); + return _ref12.apply(this, arguments); }; }() }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_AddFile, { @@ -3197,7 +3195,7 @@ var Repository = function Repository(_ref) { return setShowUploadFile(false); }, onOK: /*#__PURE__*/function () { - var _ref14 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13(data) { + var _ref13 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13(data) { var pathArr; return regeneratorRuntime_default()().wrap(function _callee13$(_context13) { while (1) switch (_context13.prev = _context13.next) { @@ -3217,7 +3215,7 @@ var Repository = function Repository(_ref) { }, _callee13); })); return function (_x14) { - return _ref14.apply(this, arguments); + return _ref13.apply(this, arguments); }; }() }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_SelectFilePathModal, { @@ -3247,12 +3245,12 @@ var NoData = function NoData() { })] }); }; -/* harmony default export */ var Tree = ((0,_umi_production_exports.connect)(function (_ref15) { - var shixunsDetail = _ref15.shixunsDetail, - loading = _ref15.loading, - globalSetting = _ref15.globalSetting, - practiceSetting = _ref15.practiceSetting, - user = _ref15.user; +/* harmony default export */ var Tree = ((0,_umi_production_exports.connect)(function (_ref14) { + var shixunsDetail = _ref14.shixunsDetail, + loading = _ref14.loading, + globalSetting = _ref14.globalSetting, + practiceSetting = _ref14.practiceSetting, + user = _ref14.user; return { shixunsDetail: shixunsDetail, globalSetting: globalSetting, diff --git a/p__Shixuns__Edit__index.async.js b/p__Shixuns__Edit__index.async.js index aa9ea462b0..f90a97bff8 100644 --- a/p__Shixuns__Edit__index.async.js +++ b/p__Shixuns__Edit__index.async.js @@ -9898,12 +9898,10 @@ var Repository = function Repository(_ref) { draggable: true, onDragEnter: onDragEnter, onDrop: onDrop, - className: Treemodules.gitTree, - allowDrop: function allowDrop(_ref12) { - var dropNode = _ref12.dropNode, - dropPosition = _ref12.dropPosition; - return false; - } + className: Treemodules.gitTree + // allowDrop={({ dropNode, dropPosition }: any) => { + // return false + // }} // onCheck={handleCheckTree} })] }) @@ -9917,7 +9915,7 @@ var Repository = function Repository(_ref) { }, isRepository: !isRepository, onOK: /*#__PURE__*/function () { - var _ref13 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee12(data) { + var _ref12 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee12(data) { var pathArr; return regeneratorRuntime_default()().wrap(function _callee12$(_context12) { while (1) switch (_context12.prev = _context12.next) { @@ -9936,7 +9934,7 @@ var Repository = function Repository(_ref) { }, _callee12); })); return function (_x13) { - return _ref13.apply(this, arguments); + return _ref12.apply(this, arguments); }; }() }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_AddFile, { @@ -9967,7 +9965,7 @@ var Repository = function Repository(_ref) { return setShowUploadFile(false); }, onOK: /*#__PURE__*/function () { - var _ref14 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13(data) { + var _ref13 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13(data) { var pathArr; return regeneratorRuntime_default()().wrap(function _callee13$(_context13) { while (1) switch (_context13.prev = _context13.next) { @@ -9987,7 +9985,7 @@ var Repository = function Repository(_ref) { }, _callee13); })); return function (_x14) { - return _ref14.apply(this, arguments); + return _ref13.apply(this, arguments); }; }() }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_SelectFilePathModal, { @@ -10017,12 +10015,12 @@ var NoData = function NoData() { })] }); }; -/* harmony default export */ var Tree = ((0,_umi_production_exports.connect)(function (_ref15) { - var shixunsDetail = _ref15.shixunsDetail, - loading = _ref15.loading, - globalSetting = _ref15.globalSetting, - practiceSetting = _ref15.practiceSetting, - user = _ref15.user; +/* harmony default export */ var Tree = ((0,_umi_production_exports.connect)(function (_ref14) { + var shixunsDetail = _ref14.shixunsDetail, + loading = _ref14.loading, + globalSetting = _ref14.globalSetting, + practiceSetting = _ref14.practiceSetting, + user = _ref14.user; return { shixunsDetail: shixunsDetail, globalSetting: globalSetting, @@ -13317,13 +13315,17 @@ var MirrorModal = function MirrorModal(_ref) { })(MirrorModal)); ;// CONCATENATED MODULE: ./src/pages/Shixuns/Edit/body/Environment/SettingDrawer/index.less?modules // extracted by mini-css-extract-plugin -/* harmony default export */ var SettingDrawermodules = ({"flex_box_center":"flex_box_center___jnFK3","flex_space_between":"flex_space_between___JoMuQ","flex_box_vertical_center":"flex_box_vertical_center___XkWzp","flex_box_center_end":"flex_box_center_end___kfVJX","flex_box_column":"flex_box_column___mfxox","content":"content___ujW8g","explain":"explain___vGa5a","tabs":"tabs___MbGuX","active":"active___SCmkJ","btns":"btns___MiEQa","popover":"popover___wqXWh"}); +/* harmony default export */ var SettingDrawermodules = ({"flex_box_center":"flex_box_center___jnFK3","flex_space_between":"flex_space_between___JoMuQ","flex_box_vertical_center":"flex_box_vertical_center___XkWzp","flex_box_center_end":"flex_box_center_end___kfVJX","flex_box_column":"flex_box_column___mfxox","content":"content___ujW8g","explain":"explain___vGa5a","tabs":"tabs___MbGuX","active":"active___SCmkJ","btns":"btns___MiEQa","must":"must___n8wNT","popover":"popover___wqXWh","zybzForm":"zybzForm___m1nC0","graaytitle":"graaytitle___vdUDn","dataPicker":"dataPicker___RiEgz"}); // EXTERNAL MODULE: ./node_modules/antd/es/drawer/index.js + 16 modules var drawer = __webpack_require__(35479); // EXTERNAL MODULE: ./node_modules/antd/es/alert/index.js + 3 modules var es_alert = __webpack_require__(38925); // EXTERNAL MODULE: ./node_modules/antd/es/popover/index.js var popover = __webpack_require__(55241); +// EXTERNAL MODULE: ./node_modules/antd/es/date-picker/index.js + 79 modules +var date_picker = __webpack_require__(71628); +// EXTERNAL MODULE: ./node_modules/antd/es/input-number/index.js + 21 modules +var input_number = __webpack_require__(31795); // EXTERNAL MODULE: ./src/components/monaco-editor/index.jsx + 3 modules var monaco_editor = __webpack_require__(8691); ;// CONCATENATED MODULE: ./src/pages/Shixuns/Edit/body/Environment/UseCustomScriptModal/index.less?modules @@ -13452,6 +13454,9 @@ var UseCustomScriptModal = function UseCustomScriptModal(_ref) { })(UseCustomScriptModal)); // EXTERNAL MODULE: ./src/utils/authority.ts var authority = __webpack_require__(7); +// EXTERNAL MODULE: ./node_modules/@umijs/plugins/node_modules/dayjs/dayjs.min.js +var dayjs_min = __webpack_require__(94699); +var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min); ;// CONCATENATED MODULE: ./src/pages/Shixuns/Edit/body/Environment/SettingDrawer/index.tsx @@ -13467,8 +13472,10 @@ var authority = __webpack_require__(7); + +var timeFormat = 'YYYY-MM-DD HH:mm'; var SettingDrawer = function SettingDrawer(_ref) { - var _environment$filter; + var _environment$filter, _schoolList$filter; var visible = _ref.visible, onOk = _ref.onOk, onCancel = _ref.onCancel, @@ -13519,7 +13526,13 @@ var SettingDrawer = function SettingDrawer(_ref) { _useState20 = slicedToArray_default()(_useState19, 2), isImportantShixun = _useState20[0], setIsImportantShixun = _useState20[1]; //实验资源优先保障 - + var _Form$useForm = es_form/* default.useForm */.Z.useForm(), + _Form$useForm2 = slicedToArray_default()(_Form$useForm, 1), + form = _Form$useForm2[0]; + var _useState21 = (0,react.useState)([]), + _useState22 = slicedToArray_default()(_useState21, 2), + schoolList = _useState22[0], + setSchoolList = _useState22[1]; var tabs = [{ id: 1, name: '评测脚本设置' @@ -13530,6 +13543,7 @@ var SettingDrawer = function SettingDrawer(_ref) { (0,react.useEffect)(function () { if (id && visible) { getData(); + getSchoolOption(); } }, [id, visible]); var getData = /*#__PURE__*/function () { @@ -13539,7 +13553,10 @@ var SettingDrawer = function SettingDrawer(_ref) { _data$shixun, _data$shixun2, _data$shixun3, + _data$shixun4, data, + _data$shixun5, + infoVal, _data, _args = arguments; return regeneratorRuntime_default()().wrap(function _callee$(_context) { @@ -13560,6 +13577,7 @@ var SettingDrawer = function SettingDrawer(_ref) { res = _context.sent; if (res.status === 0 && !shixun_environment_id) { data = res.data; + console.log("data", data); setEnvironmentActive((data === null || data === void 0 ? void 0 : data.shixun_environment_id) || null); setEvaluateScript((data === null || data === void 0 ? void 0 : data.evaluate_script) || ''); setEvaluationScript((data === null || data === void 0 ? void 0 : data.choice_standard_scripts) || null); @@ -13567,6 +13585,15 @@ var SettingDrawer = function SettingDrawer(_ref) { setCloseInternet(((_data$shixun = data.shixun) === null || _data$shixun === void 0 ? void 0 : _data$shixun.close_internet) || false); setSurvivalTime((_data$shixun2 = data.shixun) === null || _data$shixun2 === void 0 ? void 0 : _data$shixun2.survival_time); setIsImportantShixun(((_data$shixun3 = data.shixun) === null || _data$shixun3 === void 0 ? void 0 : _data$shixun3.is_important_shixun) || false); + if ((_data$shixun4 = data.shixun) !== null && _data$shixun4 !== void 0 && _data$shixun4.is_important_shixun) { + infoVal = (_data$shixun5 = data.shixun) === null || _data$shixun5 === void 0 ? void 0 : _data$shixun5.important_shixun_configs; + form.setFieldsValue({ + identifier: infoVal === null || infoVal === void 0 ? void 0 : infoVal.identifier, + people_number: infoVal === null || infoVal === void 0 ? void 0 : infoVal.people_number, + school_id: infoVal === null || infoVal === void 0 ? void 0 : infoVal.school_id, + times: [dayjs_min_default()(infoVal === null || infoVal === void 0 ? void 0 : infoVal.start_time), dayjs_min_default()(infoVal === null || infoVal === void 0 ? void 0 : infoVal.end_time)] + }); + } } if (res.status === 0 && shixun_environment_id) { _data = res.data; @@ -13585,6 +13612,29 @@ var SettingDrawer = function SettingDrawer(_ref) { return _ref2.apply(this, arguments); }; }(); + var getSchoolOption = /*#__PURE__*/function () { + var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() { + var res; + return regeneratorRuntime_default()().wrap(function _callee2$(_context2) { + while (1) switch (_context2.prev = _context2.next) { + case 0: + _context2.next = 2; + return dispatch({ + type: 'account/getSchoolOption' + }); + case 2: + res = _context2.sent; + setSchoolList(res === null || res === void 0 ? void 0 : res.schools); + case 4: + case "end": + return _context2.stop(); + } + }, _callee2); + })); + return function getSchoolOption() { + return _ref3.apply(this, arguments); + }; + }(); var handleUseCustomScript = function handleUseCustomScript() { if (verifyModal()) return; dispatch({ @@ -13598,12 +13648,12 @@ var SettingDrawer = function SettingDrawer(_ref) { }); }; var handleGetScriptContent = /*#__PURE__*/function () { - var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2(script_id) { + var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3(script_id) { var res; - return regeneratorRuntime_default()().wrap(function _callee2$(_context2) { - while (1) switch (_context2.prev = _context2.next) { + return regeneratorRuntime_default()().wrap(function _callee3$(_context3) { + while (1) switch (_context3.prev = _context3.next) { case 0: - _context2.next = 2; + _context3.next = 2; return dispatch({ type: 'shixunsDetail/getScriptContent', payload: { @@ -13612,18 +13662,18 @@ var SettingDrawer = function SettingDrawer(_ref) { } }); case 2: - res = _context2.sent; + res = _context3.sent; if (res) { setEvaluateScript(res.content); } case 4: case "end": - return _context2.stop(); + return _context3.stop(); } - }, _callee2); + }, _callee3); })); return function handleGetScriptContent(_x) { - return _ref3.apply(this, arguments); + return _ref4.apply(this, arguments); }; }(); var handleChangeEvaluationScript = function handleChangeEvaluationScript(evaluationScript) { @@ -13637,11 +13687,11 @@ var SettingDrawer = function SettingDrawer(_ref) { children: ["\u539F\u6709\u811A\u672C\u5C06\u88AB\u65B0\u7684\u811A\u672C\u8986\u76D6\uFF0C\u65E0\u6CD5\u64A4\u9500", /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), "\u662F\u5426\u786E\u8BA4\u6267\u884C\u8986\u76D6\u64CD\u4F5C"] }), onOk: function () { - var _onOk = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() { - return regeneratorRuntime_default()().wrap(function _callee3$(_context3) { - while (1) switch (_context3.prev = _context3.next) { + var _onOk = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4() { + return regeneratorRuntime_default()().wrap(function _callee4$(_context4) { + while (1) switch (_context4.prev = _context4.next) { case 0: - _context3.next = 2; + _context4.next = 2; return handleGetScriptContent(evaluationScript); case 2: setEvaluationScript(evaluationScript); @@ -13656,9 +13706,9 @@ var SettingDrawer = function SettingDrawer(_ref) { }); case 4: case "end": - return _context3.stop(); + return _context4.stop(); } - }, _callee3); + }, _callee4); })); function onOk() { return _onOk.apply(this, arguments); @@ -13668,24 +13718,24 @@ var SettingDrawer = function SettingDrawer(_ref) { }); }; var handleOk = /*#__PURE__*/function () { - var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4() { - var res; - return regeneratorRuntime_default()().wrap(function _callee4$(_context4) { - while (1) switch (_context4.prev = _context4.next) { + var _ref5 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5() { + var res, formInfo, query; + return regeneratorRuntime_default()().wrap(function _callee5$(_context5) { + while (1) switch (_context5.prev = _context5.next) { case 0: if (!(active === 1 && !environmentActive)) { - _context4.next = 3; + _context5.next = 3; break; } message/* default.warning */.ZP.warning('请选择运行环境'); - return _context4.abrupt("return"); + return _context5.abrupt("return"); case 3: - setBtnLoading(true); if (!(active === 1)) { - _context4.next = 8; + _context5.next = 8; break; } - _context4.next = 7; + setBtnLoading(true); + _context5.next = 7; return (0,fetch/* default */.ZP)("/api/shixuns/".concat(params.id, "/update_evaluate_script_setting.json"), { method: 'put', body: { @@ -13695,39 +13745,71 @@ var SettingDrawer = function SettingDrawer(_ref) { } }); case 7: - res = _context4.sent; + res = _context5.sent; case 8: if (!(active === 2)) { - _context4.next = 12; + _context5.next = 18; break; } - _context4.next = 11; + formInfo = form.getFieldsValue(); + _context5.next = 12; + return form.validateFields(); + case 12: + setBtnLoading(true); + query = { + close_internet: closeInternet, + survival_time: survivalTime, + is_important_shixun: isImportantShixun + }; + if (isImportantShixun) { + query.important_shixun_configs = { + identifier: formInfo === null || formInfo === void 0 ? void 0 : formInfo.identifier, + people_number: formInfo === null || formInfo === void 0 ? void 0 : formInfo.people_number, + school_id: formInfo === null || formInfo === void 0 ? void 0 : formInfo.school_id, + start_time: dayjs_min_default()(formInfo === null || formInfo === void 0 ? void 0 : formInfo.times[0]).format("YYYY-MM-DD HH:mm"), + end_time: dayjs_min_default()(formInfo === null || formInfo === void 0 ? void 0 : formInfo.times[1]).format("YYYY-MM-DD HH:mm") + }; + } + _context5.next = 17; return (0,fetch/* default */.ZP)("/api/shixuns/".concat(params.id, "/update_environment_setting.json"), { method: 'put', - body: { - close_internet: closeInternet, - survival_time: survivalTime, - is_important_shixun: isImportantShixun - } + body: query }); - case 11: - res = _context4.sent; - case 12: + case 17: + res = _context5.sent; + case 18: if (res.status === 0) { message/* default.success */.ZP.success('保存成功'); onOk(); } setBtnLoading(false); - case 14: + case 20: case "end": - return _context4.stop(); + return _context5.stop(); } - }, _callee4); + }, _callee5); })); return function handleOk() { - return _ref4.apply(this, arguments); + return _ref5.apply(this, arguments); }; }(); + var validateBzbs = function validateBzbs(_, value) { + var pattern1 = /^[^0-9][a-zA-Z0-9]*$/; + var pattern2 = /^.{4,30}$/; + ; + var pattern3 = /^[a-zA-Z0-9]+$/; + if (value && !pattern3.test(value)) { + return Promise.reject('输入内容只能包含数字和字母'); + } else if (value && !pattern1.test(value)) { + return Promise.reject('不能以数字开头'); + } else if (value && !pattern2.test(value)) { + return Promise.reject('输入内容长度必须在4到30个字符之间'); + } + return Promise.resolve(); + }; + var integerParser = function integerParser(value) { + return parseInt(value || '0', 10); + }; return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { children: [/*#__PURE__*/(0,jsx_runtime.jsx)(drawer/* default */.Z, { title: null, @@ -13948,6 +14030,155 @@ var SettingDrawer = function SettingDrawer(_ref) { className: "c-grey-999 font14 c-red", children: "\u5F00\u542F\u540E\uFF0C\u5FC5\u987B\u901A\u77E5\u5E73\u53F0\u8FD0\u7EF4\u4EBA\u5458\u8FDB\u884C\u652F\u6301\u3002" }), "\uFF09"] + }), + // 资源保障开启填写表单 + isImportantShixun && /*#__PURE__*/(0,jsx_runtime.jsxs)(es_form/* default */.Z, { + form: form, + layout: "horizontal", + className: SettingDrawermodules.zybzForm, + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + align: "middle", + className: "mt30", + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + className: "c-grey-333 font16 mr10", + style: { + marginLeft: 55 + }, + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: SettingDrawermodules.must, + children: "*" + }), "\u4FDD\u969C\u6807\u8BC6"] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { + label: "", + name: "identifier", + rules: [{ + required: true, + message: '请输入保障标识' + }, { + validator: validateBzbs + }], + children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, { + bordered: false, + style: { + width: 300, + backgroundColor: '#f5f5f5', + height: 50, + borderRadius: 4 + }, + minLength: 4, + maxLength: 30, + showCount: true, + placeholder: "\u8BF7\u8F93\u5165\u4FDD\u969C\u6807\u8BC6" + }) + }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + className: "ml10 c-grey-999 font14", + children: ["\u4FDD\u969C\u6807\u8BC6\u53EA\u80FD\u7531\u5B57\u6BCD\u548C\u6570\u5B57\u7EC4\u6210\uFF084~30 \u4F4D\uFF09\uFF0C\u4E0D\u80FD\u4EE5\u6570\u5B57\u5F00\u5934\u3002", /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), "\u586B\u5199\u4FDD\u969C\u6807\u8BC6\u662F\u4E3A\u4E86\u4FBF\u4E8E\u5E73\u53F0\u4E3A\u6B64\u5B9E\u8DF5\u9879\u76EE\u7279\u522B\u5206\u914D\u8282\u70B9\u3002"] + })] + }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + align: "middle", + className: "mt30", + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + className: "c-grey-333 font16 mr10", + style: { + marginLeft: 7 + }, + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: SettingDrawermodules.must, + children: "*" + }), "\u9700\u8981\u4FDD\u969C\u7684\u5355\u4F4D"] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { + label: "", + name: "school_id", + rules: [{ + required: true, + message: '请选择需要保障的单位' + }], + children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_select/* default */.Z, { + bordered: false, + style: { + width: 300, + backgroundColor: '#f5f5f5', + height: 50, + borderRadius: 4, + paddingTop: 10 + }, + showArrow: true, + filterOption: function filterOption(input, option) { + return option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0; + }, + showSearch: true, + placeholder: "\u8BF7\u9009\u62E9\u9700\u8981\u4FDD\u969C\u7684\u5355\u4F4D", + children: (_schoolList$filter = schoolList.filter(function (e) { + return e.id !== 0; + })) === null || _schoolList$filter === void 0 ? void 0 : _schoolList$filter.map(function (item, index) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(es_select/* default.Option */.Z.Option, { + title: item === null || item === void 0 ? void 0 : item.name, + value: item === null || item === void 0 ? void 0 : item.id, + children: item === null || item === void 0 ? void 0 : item.name + }, index + 1); + }) + }) + })] + }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + align: "middle", + className: "mt30", + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + className: "c-grey-333 font16 mr10", + style: { + marginLeft: 55 + }, + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: SettingDrawermodules.must, + children: "*" + }), "\u4FDD\u969C\u65F6\u95F4"] + }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + className: SettingDrawermodules.graaytitle, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { + label: "", + name: "times", + rules: [{ + required: true, + message: '请选择开始时间和结束时间' + }], + children: /*#__PURE__*/(0,jsx_runtime.jsx)(date_picker/* default.RangePicker */.Z.RangePicker, { + className: "".concat(SettingDrawermodules.dataPicker), + format: timeFormat, + bordered: false, + showTime: { + minuteStep: 30 + } + }) + }) + })] + }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { + align: "middle", + className: "mt30", + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + className: "c-grey-333 font16 mr10", + style: { + marginLeft: 55 + }, + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { + className: SettingDrawermodules.must, + children: "*" + }), "\u4FDD\u969C\u4EBA\u6570"] + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { + label: "", + name: "people_number", + rules: [{ + required: true, + message: '请输入保障人数' + }], + children: /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, { + parser: integerParser, + style: { + width: 200 + }, + placeholder: "\u8BF7\u8F93\u5165\u4FDD\u969C\u4EBA\u6570", + min: 1 + }) + })] + })] })] })] }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { @@ -17229,9 +17460,6 @@ var Allocation = function Allocation(_ref) { var table = __webpack_require__(63889); // EXTERNAL MODULE: ./node_modules/react-copy-to-clipboard/lib/index.js var lib = __webpack_require__(74855); -// EXTERNAL MODULE: ./node_modules/@umijs/plugins/node_modules/dayjs/dayjs.min.js -var dayjs_min = __webpack_require__(94699); -var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min); ;// CONCATENATED MODULE: ./src/pages/Shixuns/Edit/body/Dataset/index.less?modules // extracted by mini-css-extract-plugin /* harmony default export */ var Datasetmodules = ({"flex_box_center":"flex_box_center___l5eTc","flex_space_between":"flex_space_between___k0OR7","flex_box_vertical_center":"flex_box_vertical_center___OKlIC","flex_box_center_end":"flex_box_center_end___hN9A6","flex_box_column":"flex_box_column___ijTq_","dataset":"dataset___dSWAV","header":"header___BzxI4","title":"title___cPEyN","dataPath":"dataPath___wJ6mR","pathTitle":"pathTitle___TOS2Z","btns":"btns___jGE8o","content":"content___s4ep8","customTable":"customTable___OG3_9","row":"row___ONd7r","empty":"empty___CgtTE","path":"path___Cg5rX","text":"text___SCLRV","actionsBtns":"actionsBtns___L5tdC","customModal":"customModal___qVeG3","shareModal":"shareModal___HedYo","fileName":"fileName___x56US","renameModal":"renameModal___SmCAd","errorDes":"errorDes___VLR_5","uploadFileModal":"uploadFileModal___pYYDB"}); @@ -18040,8 +18268,6 @@ var SelectFilePathModal = function SelectFilePathModal(_ref) { loading: loading.models.index }; })(SelectFilePathModal)); -// EXTERNAL MODULE: ./node_modules/antd/es/input-number/index.js + 21 modules -var input_number = __webpack_require__(31795); // EXTERNAL MODULE: ./node_modules/antd/es/space/index.js + 2 modules var space = __webpack_require__(42075); // EXTERNAL MODULE: ./src/components/FixedButton/index.tsx + 1 modules diff --git a/p__Shixuns__Edit__index.chunk.css b/p__Shixuns__Edit__index.chunk.css index ec257a3c8c..8448c7749b 100644 --- a/p__Shixuns__Edit__index.chunk.css +++ b/p__Shixuns__Edit__index.chunk.css @@ -5870,6 +5870,12 @@ button[class~='ant-btn-default']:disabled.btn___In02G { justify-content: flex-end; margin-top: 15px; } +.must___n8wNT { + color: #E53333; + font-family: SimSun, sans-serif; + margin-top: -2px; + margin-right: 2px; +} .popover___wqXWh { background-color: transparent; color: #fff; @@ -5884,6 +5890,32 @@ button[class~='ant-btn-default']:disabled.btn___In02G { .popover___wqXWh div[class~='ant-popover-inner-content'] { color: #fff; } +.zybzForm___m1nC0 div[class~='ant-form-item'] { + margin-bottom: 0; +} +.zybzForm___m1nC0 div[class~='ant-form-item-explain-error'] { + position: absolute; + bottom: -25px; +} +.zybzForm___m1nC0 .ant-input-number { + height: 50px; + width: 100%; + background-color: #f5f5f5; + border: 0; + padding-top: 10px; + font-size: 16px; +} +.graaytitle___vdUDn { + height: 50px; + background: #f5f5f5; + border-radius: 4px; + display: flex; + justify-content: left; + align-items: center; +} +.dataPicker___RiEgz { + width: 400px; +} /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/pages/Shixuns/Edit/body/Environment/UseCustomScriptModal/index.less?modules ***! diff --git a/p__Shixuns__New__CreateImg__index.chunk.css b/p__Shixuns__New__CreateImg__index.chunk.css index b3799f0957..c6a4847d95 100644 --- a/p__Shixuns__New__CreateImg__index.chunk.css +++ b/p__Shixuns__New__CreateImg__index.chunk.css @@ -41,6 +41,7 @@ .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ diff --git a/p__Shixuns__New__ImagePreview__index.chunk.css b/p__Shixuns__New__ImagePreview__index.chunk.css index 833eef6474..5410401bc5 100644 --- a/p__Shixuns__New__ImagePreview__index.chunk.css +++ b/p__Shixuns__New__ImagePreview__index.chunk.css @@ -41,6 +41,7 @@ .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } /*!*************************************************************************************************************************************************************************************************************************************!*\ diff --git a/p__Terminal__index.chunk.css b/p__Terminal__index.chunk.css index 112039180d..b68f04a3b1 100644 --- a/p__Terminal__index.chunk.css +++ b/p__Terminal__index.chunk.css @@ -308,5 +308,6 @@ .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } diff --git a/p__User__Detail__Certificate__index.chunk.css b/p__User__Detail__Certificate__index.chunk.css index 42bdc231b6..efacb3c7a2 100644 --- a/p__User__Detail__Certificate__index.chunk.css +++ b/p__User__Detail__Certificate__index.chunk.css @@ -41,6 +41,7 @@ .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ diff --git a/p__User__Detail__Competitions__index.async.js b/p__User__Detail__Competitions__index.async.js index 58a0019eb5..ae3b3eec46 100644 --- a/p__User__Detail__Competitions__index.async.js +++ b/p__User__Detail__Competitions__index.async.js @@ -468,9 +468,8 @@ var competitionsPage = function competitionsPage(_ref) { setParams(objectSpread2_default()({}, params)); getdatas(); }, - pageSize: params.per_page - // hideOnSinglePage={true} - , + pageSize: params.per_page, + hideOnSinglePage: !(datas !== null && datas !== void 0 && datas.count), current: params.page }) }), /*#__PURE__*/(0,jsx_runtime.jsxs)(modal/* default */.Z, { diff --git a/p__User__Detail__ExperImentImg__Add__index.chunk.css b/p__User__Detail__ExperImentImg__Add__index.chunk.css index bd66811270..0a92ac385a 100644 --- a/p__User__Detail__ExperImentImg__Add__index.chunk.css +++ b/p__User__Detail__ExperImentImg__Add__index.chunk.css @@ -41,6 +41,7 @@ .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } /*!***********************************************************************************************************************************************************************************************************************************************!*\ diff --git a/p__User__Detail__LearningPath__index.chunk.css b/p__User__Detail__LearningPath__index.chunk.css index 064d9e4457..f23996862d 100644 --- a/p__User__Detail__LearningPath__index.chunk.css +++ b/p__User__Detail__LearningPath__index.chunk.css @@ -41,6 +41,7 @@ .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ diff --git a/p__User__Detail__OtherResources__index.async.js b/p__User__Detail__OtherResources__index.async.js index 62c527d48d..4560f76aef 100644 --- a/p__User__Detail__OtherResources__index.async.js +++ b/p__User__Detail__OtherResources__index.async.js @@ -465,6 +465,9 @@ var ClassroomListPage = function ClassroomListPage(_ref) { }, { max: 40, message: '资源名称最多填写40个字符' + }, { + whitespace: true, + message: '请输入资源名称' }], children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, { placeholder: "\u8BF7\u8F93\u5165\u8D44\u6E90\u540D\u79F0", @@ -479,6 +482,9 @@ var ClassroomListPage = function ClassroomListPage(_ref) { rules: [{ required: true, message: '请输入资源链接' + }, { + whitespace: true, + message: '请输入资源链接' }], children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, { placeholder: "\u8BF7\u8F93\u5165\u8D44\u6E90\u94FE\u63A5" @@ -495,6 +501,9 @@ var ClassroomListPage = function ClassroomListPage(_ref) { }, { max: 10, message: '资源名称最多填写10个字符' + }, { + whitespace: true, + message: '请输入资源类型' }], children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, { placeholder: "\u8BF7\u8F93\u5165\u8D44\u6E90\u7C7B\u578B", diff --git a/p__User__Detail__UserPortrait__index.chunk.css b/p__User__Detail__UserPortrait__index.chunk.css index bd07d93647..0dcedd629d 100644 --- a/p__User__Detail__UserPortrait__index.chunk.css +++ b/p__User__Detail__UserPortrait__index.chunk.css @@ -41,5 +41,6 @@ .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } diff --git a/p__User__Detail__Videos__index.chunk.css b/p__User__Detail__Videos__index.chunk.css index c68c4c23b0..fe57501422 100644 --- a/p__User__Detail__Videos__index.chunk.css +++ b/p__User__Detail__Videos__index.chunk.css @@ -415,6 +415,13 @@ progress::-moz-progress-bar { .fullscreen-button___ur0es { margin-right: 0; } +.fullscreen-button___ur0es::before { + right: 0px; + left: inherit!important; + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; +} .fullscreen-button1___rfaXm { margin-top: -10px; } diff --git a/p__Video__Detail__id.chunk.css b/p__Video__Detail__id.chunk.css index 498bf6a080..f1810dc4b0 100644 --- a/p__Video__Detail__id.chunk.css +++ b/p__Video__Detail__id.chunk.css @@ -237,6 +237,13 @@ progress::-moz-progress-bar { .fullscreen-button___ur0es { margin-right: 0; } +.fullscreen-button___ur0es::before { + right: 0px; + left: inherit!important; + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; +} .fullscreen-button1___rfaXm { margin-top: -10px; } diff --git a/p__index.chunk.css b/p__index.chunk.css index 99126e0b87..8741c460be 100644 --- a/p__index.chunk.css +++ b/p__index.chunk.css @@ -3710,6 +3710,13 @@ progress::-moz-progress-bar { .fullscreen-button___ur0es { margin-right: 0; } +.fullscreen-button___ur0es::before { + right: 0px; + left: inherit!important; + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; +} .fullscreen-button1___rfaXm { margin-top: -10px; } diff --git a/p__tasks__Jupyter__index.async.js b/p__tasks__Jupyter__index.async.js index 95e79e3fee..b934fd1c92 100644 --- a/p__tasks__Jupyter__index.async.js +++ b/p__tasks__Jupyter__index.async.js @@ -2029,7 +2029,7 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) { }, className: "".concat(Jupytermodules.dataSetButton, " ").concat(isOpenDrawer ? "".concat(Jupytermodules.dataSetOpen, " ").concat(isOpenDrawer === 1 ? Jupytermodules.ac : '') : ''), onClick: function onClick(e) { - setIsOpenDrawer(1); + isOpenDrawer ? setIsOpenDrawer(false) : setIsOpenDrawer(1); onHideToolBar(); e.nativeEvent.stopPropagation(); }, diff --git a/p__tasks__index.chunk.css b/p__tasks__index.chunk.css index d9bddf4760..56598b1549 100644 --- a/p__tasks__index.chunk.css +++ b/p__tasks__index.chunk.css @@ -5301,6 +5301,7 @@ ul.menu___sjQxY [class~='ant-dropdown-menu-item-active'] { .vnc-panel { height: 100%; margin: 0 auto; + min-height: 500px; } /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ diff --git a/umi.js b/umi.js index 69f98b62f6..4d8f6889a8 100644 --- a/umi.js +++ b/umi.js @@ -76873,7 +76873,7 @@ __webpack_require__.d(__webpack_exports__, { ;// CONCATENATED MODULE: ./src/utils/env/dev.ts var DEV = { // PROXY_SERVER: 'https://data.educoder.net', - PROXY_SERVER: 'https://test2-data.educoder.net', + PROXY_SERVER: 'https://test-data.educoder.net', API_SERVER: '', REPORT_SERVER: 'http://192.168.1.57:3001', IMG_SERVER: 'https://new-testali-cdn.educoder.net',