diff --git a/14626.async.js b/14626.async.js index 4458c3009f..441b0c9657 100644 --- a/14626.async.js +++ b/14626.async.js @@ -4394,7 +4394,9 @@ var markdown_editor = __webpack_require__(55373); var Operating = function Operating(_ref, ref) { var _formValue$name; - var data = _ref.data; + var data = _ref.data, + _ref$height = _ref.height, + height = _ref$height === void 0 ? 400 : _ref$height; var _Form$useForm = es_form/* default.useForm */.Z.useForm(), _Form$useForm2 = slicedToArray_default()(_Form$useForm, 1), form = _Form$useForm2[0]; @@ -4415,6 +4417,9 @@ var Operating = function Operating(_ref, ref) { }); return /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: Operatingmodules.operating, + style: { + marginBottom: '0' + }, children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_form/* default */.Z, { form: form, scrollToFirstError: true @@ -4477,6 +4482,7 @@ var Operating = function Operating(_ref, ref) { }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { name: "description", children: /*#__PURE__*/(0,jsx_runtime.jsx)(markdown_editor/* default */.Z, { + height: height, defaultValue: formValue.description || '', watch: true }) @@ -7075,23 +7081,24 @@ var ProblemsetPage = function ProblemsetPage(_ref) { return regeneratorRuntime_default()().wrap(function _callee32$(_context32) { while (1) switch (_context32.prev = _context32.next) { case 0: - operatingRef.current.form.validateFields()["catch"](function (e) { - document.body.scrollIntoView(); - }); + _context32.prev = 0; _context32.next = 3; return operatingRef.current.form.validateFields(); case 3: value = operatingRef.current.form.getFieldsValue(); // console.log(value, 'value') if (!((selectitem === null || selectitem === void 0 ? void 0 : selectitem.length) <= 0)) { - _context32.next = 7; + _context32.next = 8; break; } + document.getElementById("topicdom").scrollIntoView({ + behavior: "smooth" + }); message/* default.info */.ZP.info('请选择编程题'); return _context32.abrupt("return"); - case 7: + case 8: setAddLoading(true); _ref34 = paramsRouter, coursesId = _ref34.coursesId, categoryId = _ref34.categoryId; - _context32.next = 11; + _context32.next = 12; return (0,fetch/* default */.ZP)(isProgramEdit ? "/api/homework_commons/".concat(categoryId, "/update_hack.json") : "/api/courses/".concat(coursesId, "/homework_commons.json"), { method: isProgramEdit ? 'put' : 'post', body: objectSpread2_default()(objectSpread2_default()({}, value), {}, { @@ -7103,17 +7110,23 @@ var ProblemsetPage = function ProblemsetPage(_ref) { }) }) }); - case 11: + case 12: res = _context32.sent; if ((res === null || res === void 0 ? void 0 : res.status) === 0) { _umi_production_exports.history.push("/classrooms/".concat(paramsRouter.coursesId, "/program_homework/").concat(isProgramEdit ? categoryId : res.homework_id, "/detail?tabs=1")); } setAddLoading(false); - case 14: + _context32.next = 20; + break; + case 17: + _context32.prev = 17; + _context32.t0 = _context32["catch"](0); + document.body.scrollIntoView(); + case 20: case "end": return _context32.stop(); } - }, _callee32); + }, _callee32, null, [[0, 17]]); })); return function handleAdd() { return _ref33.apply(this, arguments); @@ -7149,10 +7162,15 @@ var ProblemsetPage = function ProblemsetPage(_ref) { className: Problemsetmodules.title, children: isprogram_homework ? isProgramText : '试题库' }), isprogram_homework && /*#__PURE__*/(0,jsx_runtime.jsx)(components_Operating, { + height: 250, data: editData, ref: operatingRef }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: Problemsetmodules.headerWrapper, + style: { + marginTop: "-50px" + }, + id: "topicdom", children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: Problemsetmodules.tabsWrap, children: /*#__PURE__*/(0,jsx_runtime.jsxs)(tabs/* default */.Z, { diff --git a/32925.async.js b/32925.async.js index 9c061e7290..575ae649ae 100644 --- a/32925.async.js +++ b/32925.async.js @@ -1383,6 +1383,7 @@ function SecondLevelDiscuss(_ref) { }); return; } + console.log(id, "idi---------------------------"); onSetActiveDiscussIndex(id); } function onTopOrDown() { @@ -1626,6 +1627,8 @@ function SecondLevelDiscuss(_ref) { })] }, id); }); +// EXTERNAL MODULE: ./src/utils/util.tsx +var util = __webpack_require__(29427); ;// CONCATENATED MODULE: ./src/pages/tasks/left-panel/discuss/index.jsx @@ -1650,6 +1653,7 @@ function SecondLevelDiscuss(_ref) { + var initialState = { @@ -1701,7 +1705,10 @@ function reducer(state, action) { userInfo = _ref.userInfo, _ref$isShixunDetail = _ref.isShixunDetail, isShixunDetail = _ref$isShixunDetail === void 0 ? false : _ref$isShixunDetail, - taskData = _ref.taskData; + taskData = _ref.taskData, + chatgpt = _ref.chatgpt, + to_user_id = _ref.to_user_id, + challengeId = _ref.challengeId; var _useReducer = (0,react.useReducer)(reducer, initialState), _useReducer2 = slicedToArray_default()(_useReducer, 2), state = _useReducer2[0], @@ -1722,6 +1729,7 @@ function reducer(state, action) { activeDiscussIndex = state.activeDiscussIndex; var rewardData = (0,react.useRef)(); var discussEl = (0,react.useRef)(); + var refresh = (0,react.useRef)(); function getDiscusses(_x, _x2) { return _getDiscusses.apply(this, arguments); } @@ -1745,6 +1753,7 @@ function reducer(state, action) { return (0,service/* fetchDiscusses */.o7)(shixunIdentifier, value); case 6: response = _context2.sent; + console.log("activeDiscussIndex", activeDiscussIndex); dispatch({ type: constant/* GET_DISCUSSES */.GR, payload: { @@ -1754,20 +1763,37 @@ function reducer(state, action) { loading: false } }); - _context2.next = 13; + _context2.next = 14; break; - case 10: - _context2.prev = 10; + case 11: + _context2.prev = 11; _context2.t0 = _context2["catch"](2); console.log(_context2.t0); - case 13: + case 14: case "end": return _context2.stop(); } - }, _callee2, null, [[2, 10]]); + }, _callee2, null, [[2, 11]]); })); return _getDiscusses.apply(this, arguments); } + (0,react.useEffect)(function () { + if (activeIndex === 3 && chatgpt) { + console.log("开启定时器"); + clearInterval(refresh.current); + refresh.current = setInterval(function () { + getDiscusses(page, true); + }, 5000); + } else { + console.log("清除定时器"); + return function () { + clearInterval(refresh.current); + }; + } + return function () { + clearInterval(refresh.current); + }; + }, [chatgpt, activeIndex, activeDiscussIndex]); (0,react.useEffect)(function () { if (!open) { clearInterval(timeRefersh); @@ -2245,6 +2271,7 @@ function reducer(state, action) { if (!data) { return /*#__PURE__*/(0,jsx_runtime.jsx)(Spinner/* default */.Z, {}); } + // 开启实时刷新调用的函数 var handleRefresh = function handleRefresh() { setOpen(!open); if (!open) { @@ -2259,11 +2286,22 @@ function reducer(state, action) { comments = data.comments, all = data.all, can_hidden = data.can_hidden; + console.log(to_user_id, "to_user_id"); return /*#__PURE__*/(0,jsx_runtime.jsxs)(react.Fragment, { children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: "discuss-container", ref: discussEl, - children: [(taskData === null || taskData === void 0 ? void 0 : taskData.myshixun_manager) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { + children: [chatgpt && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { + type: "primary", + style: { + "float": 'right', + marginBottom: 10 + }, + onClick: function onClick() { + (0,util/* openNewWindow */.xg)("/chatgpt?id=".concat(to_user_id, "&position=").concat(challengeId)); + }, + children: "\u8FDB\u5165\u5386\u53F2\u95EE\u7B54" + }), (taskData === null || taskData === void 0 ? void 0 : taskData.myshixun_manager) && !chatgpt && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { style: { "float": 'right', marginBottom: 10 diff --git a/60696.async.js b/60696.async.js index fb28cd7172..8c2960dbfa 100644 --- a/60696.async.js +++ b/60696.async.js @@ -298,10 +298,10 @@ var ReuseSingleShixunModal = function ReuseSingleShixunModal(_ref3) { style: { marginBottom: 20 }, - children: "1\u3001\u590D\u5236\uFF0C\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u4E8C\u6B21\u7F16\u8F91\uFF0C\u7F16\u8F91\u7684\u5185\u5BB9\u4E0D\u4F1A\u540C\u6B65\u81F3\u539F\u9879\u76EE\u3002" + children: "1\u3001\u590D\u5236\uFF1A\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF08\u4E0D\u4F1A\u590D\u5236\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF09\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u7F16\u8F91\u5E76\u4E0E\u539F\u9879\u76EE\u4FE1\u606F\u4E92\u4E0D\u5F71\u54CD\u3002" }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "".concat(ReuseShixunModalmodules.content, " ").concat(ReuseShixunModalmodules.orangeColor), - children: "2\u3001\u4E0D\u590D\u5236\uFF0C\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + children: "2\u3001\u4E0D\u590D\u5236\uFF1A\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" })] })] }) : /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { @@ -381,8 +381,8 @@ var ReuseSingleShixunModal = function ReuseSingleShixunModal(_ref3) { }) : /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: ["\u8BE5\u9879\u76EE\u4E0D\u652F\u6301\u590D\u5236\uFF0C\u82E5\u786E\u8BA4\u7EE7\u7EED\u53D1\u9001\uFF0C", /*#__PURE__*/(0,jsx_runtime.jsx)("span", { className: ReuseShixunModalmodules.orangeColor, - children: "\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55" - }), "\uFF08\u5982\u679C\u4E0D\u60F3\u91CD\u7F6E\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF0C\u5EFA\u8BAE\u53C2\u7167\u8BE5\u5B9E\u8DF5\u9879\u76EE\u5185\u5BB9\u81EA\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\uFF0C\u6216\u8005\u5C1D\u8BD5\u8054\u7CFB\u9879\u76EE\u521B\u5EFA\u4EBA\u5F00\u653E\u672C\u9879\u76EE\u7684\u590D\u5236\u6743\u9650\uFF09\u3002"] + children: "\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + }), "\uFF08\u5982\u679C\u4E0D\u60F3\u6E05\u7A7A\u5B66\u751F\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\uFF0C\u5EFA\u8BAE\u53C2\u7167\u8BE5\u5B9E\u8DF5\u9879\u76EE\u7684\u5185\u5BB9\u81EA\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\uFF0C\u6216\u8005\u5C1D\u8BD5\u8054\u7CFB\u9879\u76EE\u521B\u5EFA\u4EBA\u5F00\u653E\u672C\u9879\u76EE\u7684\u590D\u5236\u6743\u9650\uFF09\u3002"] })] }) }) @@ -732,10 +732,10 @@ var ReuseMultipleShixunModal = function ReuseMultipleShixunModal(props) { style: { marginBottom: 20 }, - children: "1\u3001\u590D\u5236\uFF0C\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u4E8C\u6B21\u7F16\u8F91\uFF0C\u7F16\u8F91\u7684\u5185\u5BB9\u4E0D\u4F1A\u540C\u6B65\u81F3\u539F\u9879\u76EE\u3002" + children: "1\u3001\u590D\u5236\uFF1A\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF08\u4E0D\u4F1A\u590D\u5236\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF09\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u7F16\u8F91\u5E76\u4E0E\u539F\u9879\u76EE\u4FE1\u606F\u4E92\u4E0D\u5F71\u54CD\u3002" }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: ReuseShixunModalmodules.orangeColor, - children: "2\u3001\u4E0D\u590D\u5236\uFF0C\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + children: "2\u3001\u4E0D\u590D\u5236\uFF1A\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" })] }), (renderData === null || renderData === void 0 ? void 0 : renderData.can_copy_num) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { diff --git a/66616.async.js b/66616.async.js index f2e698b27a..62a2896b11 100644 --- a/66616.async.js +++ b/66616.async.js @@ -2524,7 +2524,8 @@ var AddVideoModal = function AddVideoModal(_ref2) { name: form.getFieldValue('name'), attachment_id: form.getFieldValue('attachment_id'), description: form.getFieldValue('description'), - tags: tagsList + tags: form.getFieldValue('tag') + // tags: tagsList, })); case 9: res = _context.sent; diff --git a/color.less b/color.less index f0073b71da..dd20362dbb 100644 --- a/color.less +++ b/color.less @@ -563,10 +563,10 @@ a.ant-btn-disabled:active > a:only-child::after {background: transparent;} .ant-comment-actions > li > span {color: @text-color-secondary;} .ant-comment-actions > li > span:hover {color: #595959;} .ant-picker-status-error.ant-picker, .ant-picker-status-error.ant-picker:not([disabled]):hover {background-color: #fff;border-color: @error-color;} -.ant-picker-status-error.ant-picker-focused, .ant-picker-status-error.ant-picker:focus {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(31, 184, 172, 0.2);border-right-width: 1px;} +.ant-picker-status-error.ant-picker-focused, .ant-picker-status-error.ant-picker:focus {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(173, 81, 161, 0.2);border-right-width: 1px;} .ant-picker-status-error.ant-picker .ant-picker-active-bar {background: color(~`colorPalette("@{error-color}", 5)`);} .ant-picker-status-warning.ant-picker, .ant-picker-status-warning.ant-picker:not([disabled]):hover {background-color: #fff;border-color: @warning-color;} -.ant-picker-status-warning.ant-picker-focused, .ant-picker-status-warning.ant-picker:focus {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(207, 75, 14, 0.2);border-right-width: 1px;} +.ant-picker-status-warning.ant-picker-focused, .ant-picker-status-warning.ant-picker:focus {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(32, 218, 253, 0.2);border-right-width: 1px;} .ant-picker-status-warning.ant-picker .ant-picker-active-bar {background: color(~`colorPalette("@{warning-color}", 5)`);} .ant-picker {color: @text-color;background: #fff;border: 1px solid @border-color-base;border-radius: 2px;} .ant-picker:hover, .ant-picker-focused {border-color: color(~`colorPalette("@{primary-color}", 5)`);border-right-width: 1px;} @@ -788,16 +788,16 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .anticon.ant-input-clear-icon:hover, .ant-input-clear-icon:hover {color: @text-color-secondary;} .anticon.ant-input-clear-icon:active, .ant-input-clear-icon:active {color: @text-color;} .ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input, .ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:hover {background: #fff;border-color: @error-color;} -.ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus, .ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(31, 184, 172, 0.2);border-right-width: 1px;} +.ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus, .ant-input-status-error:not(.ant-input-disabled):not(.ant-input-borderless).ant-input-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(173, 81, 161, 0.2);border-right-width: 1px;} .ant-input-status-error .ant-input-prefix {color: @error-color;} .ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input, .ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:hover {background: #fff;border-color: @warning-color;} -.ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus, .ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(207, 75, 14, 0.2);border-right-width: 1px;} +.ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus, .ant-input-status-warning:not(.ant-input-disabled):not(.ant-input-borderless).ant-input-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(32, 218, 253, 0.2);border-right-width: 1px;} .ant-input-status-warning .ant-input-prefix {color: @warning-color;} .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper, .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:hover {background: #fff;border-color: @error-color;} -.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:focus, .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(31, 184, 172, 0.2);border-right-width: 1px;} +.ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:focus, .ant-input-affix-wrapper-status-error:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(173, 81, 161, 0.2);border-right-width: 1px;} .ant-input-affix-wrapper-status-error .ant-input-prefix {color: @error-color;} .ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper, .ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:hover {background: #fff;border-color: @warning-color;} -.ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:focus, .ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(207, 75, 14, 0.2);border-right-width: 1px;} +.ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper:focus, .ant-input-affix-wrapper-status-warning:not(.ant-input-affix-wrapper-disabled):not(.ant-input-affix-wrapper-borderless).ant-input-affix-wrapper-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(32, 218, 253, 0.2);border-right-width: 1px;} .ant-input-affix-wrapper-status-warning .ant-input-prefix {color: @warning-color;} .ant-input-group-wrapper-status-error .ant-input-group-addon {color: @error-color;border-color: @error-color;} .ant-input-group-wrapper-status-warning .ant-input-group-addon {color: @warning-color;border-color: @warning-color;} @@ -894,16 +894,16 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-input-number-affix-wrapper > div.ant-input-number {border: none;} .ant-input-number-affix-wrapper > div.ant-input-number.ant-input-number-focused {box-shadow: none !important;} .ant-input-number-status-error:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number, .ant-input-number-status-error:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number:hover {background: #fff;border-color: @error-color;} -.ant-input-number-status-error:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number:focus, .ant-input-number-status-error:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(31, 184, 172, 0.2);border-right-width: 1px;} +.ant-input-number-status-error:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number:focus, .ant-input-number-status-error:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(173, 81, 161, 0.2);border-right-width: 1px;} .ant-input-number-status-error .ant-input-number-prefix {color: @error-color;} .ant-input-number-status-warning:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number, .ant-input-number-status-warning:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number:hover {background: #fff;border-color: @warning-color;} -.ant-input-number-status-warning:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number:focus, .ant-input-number-status-warning:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(207, 75, 14, 0.2);border-right-width: 1px;} +.ant-input-number-status-warning:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number:focus, .ant-input-number-status-warning:not(.ant-input-number-disabled):not(.ant-input-number-borderless).ant-input-number-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(32, 218, 253, 0.2);border-right-width: 1px;} .ant-input-number-status-warning .ant-input-number-prefix {color: @warning-color;} .ant-input-number-affix-wrapper-status-error:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper, .ant-input-number-affix-wrapper-status-error:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper:hover {background: #fff;border-color: @error-color;} -.ant-input-number-affix-wrapper-status-error:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper:focus, .ant-input-number-affix-wrapper-status-error:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(31, 184, 172, 0.2);border-right-width: 1px;} +.ant-input-number-affix-wrapper-status-error:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper:focus, .ant-input-number-affix-wrapper-status-error:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(173, 81, 161, 0.2);border-right-width: 1px;} .ant-input-number-affix-wrapper-status-error .ant-input-number-prefix {color: @error-color;} .ant-input-number-affix-wrapper-status-warning:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper, .ant-input-number-affix-wrapper-status-warning:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper:hover {background: #fff;border-color: @warning-color;} -.ant-input-number-affix-wrapper-status-warning:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper:focus, .ant-input-number-affix-wrapper-status-warning:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(207, 75, 14, 0.2);border-right-width: 1px;} +.ant-input-number-affix-wrapper-status-warning:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper:focus, .ant-input-number-affix-wrapper-status-warning:not(.ant-input-number-affix-wrapper-disabled):not(.ant-input-number-affix-wrapper-borderless).ant-input-number-affix-wrapper-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(32, 218, 253, 0.2);border-right-width: 1px;} .ant-input-number-affix-wrapper-status-warning .ant-input-number-prefix {color: @warning-color;} .ant-input-number-group-wrapper-status-error .ant-input-number-group-addon {color: @error-color;border-color: @error-color;} .ant-input-number-group-wrapper-status-warning .ant-input-number-group-addon {color: @warning-color;border-color: @warning-color;} @@ -1024,10 +1024,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-list-grid .ant-col > .ant-list-item {border-bottom: none;} .ant-list-bordered {border: 1px solid @border-color-base;border-radius: 2px;} .ant-mentions-status-error:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions, .ant-mentions-status-error:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions:hover {background: #fff;border-color: @error-color;} -.ant-mentions-status-error:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions:focus, .ant-mentions-status-error:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(31, 184, 172, 0.2);border-right-width: 1px;} +.ant-mentions-status-error:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions:focus, .ant-mentions-status-error:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions-focused {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(173, 81, 161, 0.2);border-right-width: 1px;} .ant-mentions-status-error .ant-input-prefix {color: @error-color;} .ant-mentions-status-warning:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions, .ant-mentions-status-warning:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions:hover {background: #fff;border-color: @warning-color;} -.ant-mentions-status-warning:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions:focus, .ant-mentions-status-warning:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(207, 75, 14, 0.2);border-right-width: 1px;} +.ant-mentions-status-warning:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions:focus, .ant-mentions-status-warning:not(.ant-mentions-disabled):not(.ant-mentions-borderless).ant-mentions-focused {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(32, 218, 253, 0.2);border-right-width: 1px;} .ant-mentions-status-warning .ant-input-prefix {color: @warning-color;} .ant-mentions {color: @text-color;background-color: #fff;background-image: none;border: 1px solid @border-color-base;border-radius: 2px;} .ant-mentions::placeholder {color: #bfbfbf;} @@ -1360,9 +1360,9 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-select-multiple .ant-select-selection-item-remove {color: inherit;color: @text-color-secondary;} .ant-select-multiple .ant-select-selection-item-remove:hover {color: rgba(0, 0, 0, 0.75);} .ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer) .ant-select-selector {background-color: #fff;border-color: @error-color !important;} -.ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-open .ant-select-selector, .ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(31, 184, 172, 0.2);border-right-width: 1px;} +.ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-open .ant-select-selector, .ant-select-status-error.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{error-color}", 5)`);box-shadow: 0 0 0 2px rgba(173, 81, 161, 0.2);border-right-width: 1px;} .ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer) .ant-select-selector {background-color: #fff;border-color: @warning-color !important;} -.ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-open .ant-select-selector, .ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(207, 75, 14, 0.2);border-right-width: 1px;} +.ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-open .ant-select-selector, .ant-select-status-warning.ant-select:not(.ant-select-disabled):not(.ant-select-customize-input):not(.ant-pagination-size-changer).ant-select-focused .ant-select-selector {border-color: color(~`colorPalette("@{warning-color}", 5)`);box-shadow: 0 0 0 2px rgba(32, 218, 253, 0.2);border-right-width: 1px;} .ant-select {color: @text-color;} .ant-select:not(.ant-select-customize-input) .ant-select-selector {background-color: #fff;border: 1px solid @border-color-base;border-radius: 2px;} .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {border-color: color(~`colorPalette("@{primary-color}", 5)`);box-shadow: 0 0 0 2px fade(@primary-color, 20%);border-right-width: 1px;} diff --git a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js index 87627d38c1..e7f0cffe73 100644 --- a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js @@ -7633,9 +7633,8 @@ var Publish_WorkList = function WorkList(_ref) { }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { className: "ml5", children: /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, { - disabled: disabled - // disabled={disabled || unifiedLateTimeDisabled} - , + // disabled={disabled} + disabled: disabled || unifiedLateTimeDisabled, value: data.late_penalty, onChange: function onChange(value) { var _classroomList$Assist16; diff --git a/p__Classrooms__Lists__Exercise__Edit__index.async.js b/p__Classrooms__Lists__Exercise__Edit__index.async.js index 4710e73d92..33102a07b2 100644 --- a/p__Classrooms__Lists__Exercise__Edit__index.async.js +++ b/p__Classrooms__Lists__Exercise__Edit__index.async.js @@ -1062,10 +1062,10 @@ var ReuseSingleShixunModal = function ReuseSingleShixunModal(_ref3) { style: { marginBottom: 20 }, - children: "1\u3001\u590D\u5236\uFF0C\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u4E8C\u6B21\u7F16\u8F91\uFF0C\u7F16\u8F91\u7684\u5185\u5BB9\u4E0D\u4F1A\u540C\u6B65\u81F3\u539F\u9879\u76EE\u3002" + children: "1\u3001\u590D\u5236\uFF1A\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF08\u4E0D\u4F1A\u590D\u5236\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF09\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u7F16\u8F91\u5E76\u4E0E\u539F\u9879\u76EE\u4FE1\u606F\u4E92\u4E0D\u5F71\u54CD\u3002" }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "".concat(ReuseShixunModalmodules.content, " ").concat(ReuseShixunModalmodules.orangeColor), - children: "2\u3001\u4E0D\u590D\u5236\uFF0C\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + children: "2\u3001\u4E0D\u590D\u5236\uFF1A\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" })] })] }) : /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { @@ -1145,8 +1145,8 @@ var ReuseSingleShixunModal = function ReuseSingleShixunModal(_ref3) { }) : /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: ["\u8BE5\u9879\u76EE\u4E0D\u652F\u6301\u590D\u5236\uFF0C\u82E5\u786E\u8BA4\u7EE7\u7EED\u53D1\u9001\uFF0C", /*#__PURE__*/(0,jsx_runtime.jsx)("span", { className: ReuseShixunModalmodules.orangeColor, - children: "\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55" - }), "\uFF08\u5982\u679C\u4E0D\u60F3\u91CD\u7F6E\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF0C\u5EFA\u8BAE\u53C2\u7167\u8BE5\u5B9E\u8DF5\u9879\u76EE\u5185\u5BB9\u81EA\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\uFF0C\u6216\u8005\u5C1D\u8BD5\u8054\u7CFB\u9879\u76EE\u521B\u5EFA\u4EBA\u5F00\u653E\u672C\u9879\u76EE\u7684\u590D\u5236\u6743\u9650\uFF09\u3002"] + children: "\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + }), "\uFF08\u5982\u679C\u4E0D\u60F3\u6E05\u7A7A\u5B66\u751F\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\uFF0C\u5EFA\u8BAE\u53C2\u7167\u8BE5\u5B9E\u8DF5\u9879\u76EE\u7684\u5185\u5BB9\u81EA\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\uFF0C\u6216\u8005\u5C1D\u8BD5\u8054\u7CFB\u9879\u76EE\u521B\u5EFA\u4EBA\u5F00\u653E\u672C\u9879\u76EE\u7684\u590D\u5236\u6743\u9650\uFF09\u3002"] })] }) }) @@ -1496,10 +1496,10 @@ var ReuseMultipleShixunModal = function ReuseMultipleShixunModal(props) { style: { marginBottom: 20 }, - children: "1\u3001\u590D\u5236\uFF0C\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u4E8C\u6B21\u7F16\u8F91\uFF0C\u7F16\u8F91\u7684\u5185\u5BB9\u4E0D\u4F1A\u540C\u6B65\u81F3\u539F\u9879\u76EE\u3002" + children: "1\u3001\u590D\u5236\uFF1A\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF08\u4E0D\u4F1A\u590D\u5236\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF09\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u7F16\u8F91\u5E76\u4E0E\u539F\u9879\u76EE\u4FE1\u606F\u4E92\u4E0D\u5F71\u54CD\u3002" }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: ReuseShixunModalmodules.orangeColor, - children: "2\u3001\u4E0D\u590D\u5236\uFF0C\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + children: "2\u3001\u4E0D\u590D\u5236\uFF1A\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" })] }), (renderData === null || renderData === void 0 ? void 0 : renderData.can_copy_num) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { diff --git a/p__Classrooms__Lists__GroupHomework__Detail__index.async.js b/p__Classrooms__Lists__GroupHomework__Detail__index.async.js index 50bfca8e67..d8b188a4a3 100644 --- a/p__Classrooms__Lists__GroupHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__GroupHomework__Detail__index.async.js @@ -8389,8 +8389,9 @@ var Publish_Publish = function Publish(_ref) { }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { className: "ml5", children: /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, { - // disabled={disabled || unifiedLateTimeDisabled} - disabled: disabled || banding_late, + disabled: disabled || unifiedLateTimeDisabled + // disabled={disabled ||banding_late} + , min: 0, value: data.late_penalty, onChange: function onChange(value) { diff --git a/p__Classrooms__Lists__Polls__Detail__index.async.js b/p__Classrooms__Lists__Polls__Detail__index.async.js index ca59826353..118b5a1afb 100644 --- a/p__Classrooms__Lists__Polls__Detail__index.async.js +++ b/p__Classrooms__Lists__Polls__Detail__index.async.js @@ -4125,6 +4125,7 @@ var PublishShixun = function PublishShixun(_ref) { }, [polls.actionTabs.key]); var getData = /*#__PURE__*/function () { var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_11___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_8___default()().mark(function _callee(nextPage) { + var _polls$actionTabs$sel; var res, _res$course_info, _res$course_info2, _form$setFieldsValue; return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_8___default()().wrap(function _callee$(_context) { while (1) switch (_context.prev = _context.next) { @@ -4133,7 +4134,9 @@ var PublishShixun = function PublishShixun(_ref) { _context.next = 3; return (0,_service_polls__WEBPACK_IMPORTED_MODULE_20__/* .getPollsCourses */ .Q9)({ coursesId: params.coursesId, - check_ids: polls.actionTabs.selectArrs, + check_ids: (_polls$actionTabs$sel = polls.actionTabs.selectArrs) === null || _polls$actionTabs$sel === void 0 ? void 0 : _polls$actionTabs$sel.map(function (i) { + return Number(i); + }), page: nextPage ? nextPage : page, limit: limit }); @@ -4167,6 +4170,7 @@ var PublishShixun = function PublishShixun(_ref) { }; var handleOk = /*#__PURE__*/function () { var _ref3 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_11___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_8___default()().mark(function _callee2() { + var _polls$actionTabs$sel2; var formValue, res; return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_8___default()().wrap(function _callee2$(_context2) { while (1) switch (_context2.prev = _context2.next) { @@ -4176,7 +4180,9 @@ var PublishShixun = function PublishShixun(_ref) { return (0,_utils_fetch__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .ZP)("/api/courses/".concat(params.coursesId, "/polls/publish.json"), { method: 'post', body: { - check_ids: _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_10___default()(polls.actionTabs.selectArrs), + check_ids: _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_10___default()((_polls$actionTabs$sel2 = polls.actionTabs.selectArrs) === null || _polls$actionTabs$sel2 === void 0 ? void 0 : _polls$actionTabs$sel2.map(function (i) { + return Number(i); + })), group_ids: formValue.group_ids ? _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_10___default()(formValue.group_ids) : [], end_time: moment__WEBPACK_IMPORTED_MODULE_15___default()(formValue.end_time).format('YYYY-MM-DD HH:mm') } diff --git a/p__Classrooms__Lists__Polls__index.async.js b/p__Classrooms__Lists__Polls__index.async.js index 38daa2d5bc..db50f2a768 100644 --- a/p__Classrooms__Lists__Polls__index.async.js +++ b/p__Classrooms__Lists__Polls__index.async.js @@ -467,6 +467,7 @@ var PublishShixun = function PublishShixun(_ref) { }, [polls.actionTabs.key]); var getData = /*#__PURE__*/function () { var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_11___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_8___default()().mark(function _callee(nextPage) { + var _polls$actionTabs$sel; var res, _res$course_info, _res$course_info2, _form$setFieldsValue; return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_8___default()().wrap(function _callee$(_context) { while (1) switch (_context.prev = _context.next) { @@ -475,7 +476,9 @@ var PublishShixun = function PublishShixun(_ref) { _context.next = 3; return (0,_service_polls__WEBPACK_IMPORTED_MODULE_20__/* .getPollsCourses */ .Q9)({ coursesId: params.coursesId, - check_ids: polls.actionTabs.selectArrs, + check_ids: (_polls$actionTabs$sel = polls.actionTabs.selectArrs) === null || _polls$actionTabs$sel === void 0 ? void 0 : _polls$actionTabs$sel.map(function (i) { + return Number(i); + }), page: nextPage ? nextPage : page, limit: limit }); @@ -509,6 +512,7 @@ var PublishShixun = function PublishShixun(_ref) { }; var handleOk = /*#__PURE__*/function () { var _ref3 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_11___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_8___default()().mark(function _callee2() { + var _polls$actionTabs$sel2; var formValue, res; return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_8___default()().wrap(function _callee2$(_context2) { while (1) switch (_context2.prev = _context2.next) { @@ -518,7 +522,9 @@ var PublishShixun = function PublishShixun(_ref) { return (0,_utils_fetch__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .ZP)("/api/courses/".concat(params.coursesId, "/polls/publish.json"), { method: 'post', body: { - check_ids: _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_10___default()(polls.actionTabs.selectArrs), + check_ids: _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_10___default()((_polls$actionTabs$sel2 = polls.actionTabs.selectArrs) === null || _polls$actionTabs$sel2 === void 0 ? void 0 : _polls$actionTabs$sel2.map(function (i) { + return Number(i); + })), group_ids: formValue.group_ids ? _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_10___default()(formValue.group_ids) : [], end_time: moment__WEBPACK_IMPORTED_MODULE_15___default()(formValue.end_time).format('YYYY-MM-DD HH:mm') } diff --git a/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js b/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js index 951cc29e05..e333aa277d 100644 --- a/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js @@ -2118,6 +2118,8 @@ var QualityModal_DelShixun = function DelShixun(_ref) { var markdown_editor = __webpack_require__(55373); // EXTERNAL MODULE: ./src/utils/export.ts var utils_export = __webpack_require__(12034); +// EXTERNAL MODULE: ./src/utils/verifyLogin.tsx + 3 modules +var verifyLogin = __webpack_require__(72551); ;// CONCATENATED MODULE: ./src/pages/Classrooms/Lists/ProgramHomework/Detail/components/WorkList/index.tsx @@ -2172,6 +2174,7 @@ var utils_export = __webpack_require__(12034); + var WorkList = function WorkList(_ref) { @@ -2253,7 +2256,7 @@ var WorkList = function WorkList(_ref) { setshowopen = _useState30[1]; var location = (0,_umi_production_exports.useLocation)(); (0,react.useEffect)(function () { - getData(true); + getData(); return function () { setWorkList([]); setStudentList([]); @@ -2280,16 +2283,20 @@ var WorkList = function WorkList(_ref) { type: 'shixunHomeworks/getWorkList', payload: params }); - if (bool) { - res.then(function (t) { - var _t$homework_status, _t$homework_status2, _t$homework_status3; - // ["进行中","提交中", "补交中"].includes(t?.homework_status?.[0] - if ((t !== null && t !== void 0 && (_t$homework_status = t.homework_status) !== null && _t$homework_status !== void 0 && _t$homework_status.includes('进行中') || t !== null && t !== void 0 && (_t$homework_status2 = t.homework_status) !== null && _t$homework_status2 !== void 0 && _t$homework_status2.includes('补交中') || t !== null && t !== void 0 && (_t$homework_status3 = t.homework_status) !== null && _t$homework_status3 !== void 0 && _t$homework_status3.includes('提交中')) && !(0,authority/* isStudent */.dE)()) { - handleUpdateScore(); - } - }); - return res; - } + // if (bool) { + // res.then((t: any) => { + // // ["进行中","提交中", "补交中"].includes(t?.homework_status?.[0] + // if ( + // (t?.homework_status?.includes('进行中') || + // t?.homework_status?.includes('补交中') || + // t?.homework_status?.includes('提交中')) && + // !isStudent() + // ) { + // handleUpdateScore(); + // } + // }); + // return res; + // } return res; }; (0,react.useEffect)(function () { @@ -2360,7 +2367,7 @@ var WorkList = function WorkList(_ref) { }(); var onHandleChange = function onHandleChange() { params.page = 1; - var formValue = Object.assign({}, form.getFieldValue()); + var formValue = Object.assign({}, form.getFieldsValue()); delete params.course_group; delete params.teacher_comment; Object.keys(formValue).map(function (v) { @@ -2878,12 +2885,13 @@ var WorkList = function WorkList(_ref) { message/* default.warn */.ZP.warn('您未获取此权限，需向管理员申请权限才能使用此功能'); return; } + if (!(0,verifyLogin/* handleProfessionalCertificationModal */.O5)()) { + return; + } window.open("/classrooms/".concat(params.coursesId, "/program_homework/").concat(params.categoryId, "/").concat(record.id, "/").concat(record.user_id, "/comment"), '_blank'); - // history.push(`/classrooms/${params.coursesId}/program_homework/${params.categoryId}/${record.id}${record.id}/comment`) } }; }, - scroll: { x: 'max-content' }, @@ -6692,8 +6700,6 @@ var Publish = __webpack_require__(33137); var Detailmodules = __webpack_require__(41642); // EXTERNAL MODULE: ./src/service/shixuns.ts var shixuns = __webpack_require__(56088); -// EXTERNAL MODULE: ./src/utils/verifyLogin.tsx + 3 modules -var verifyLogin = __webpack_require__(72551); // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules var env = __webpack_require__(59758); // EXTERNAL MODULE: ./src/assets/images/question/b1.svg diff --git a/p__Competitions__Detail__index.async.js b/p__Competitions__Detail__index.async.js index 2a4e7f7e39..dd22aa6517 100644 --- a/p__Competitions__Detail__index.async.js +++ b/p__Competitions__Detail__index.async.js @@ -8490,6 +8490,7 @@ var competitionDetails = function competitionDetails(_ref) { var loction = (0,_umi_production_exports.useLocation)(); var see = (0,react.useRef)(null); (0,react.useEffect)(function () { + console.log("++++++++++++++++++++++++++++++++++++", identifier); if (identifier) { init(); //调用默认加载第一条数据 @@ -9330,7 +9331,7 @@ var competitionDetails = function competitionDetails(_ref) { className: Detailmodules.buttonsize, disabled: true, children: "\u62A5\u540D\u622A\u6B62" - }) : null, HeaderDetail.competition_status === 'progressing' && HeaderDetail.enroll_end != true ? /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { + }) : null, HeaderDetail.competition_status === 'progressing' && HeaderDetail.enroll_end != true && HeaderDetail.enroll_end_time ? /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { type: "primary", disabled: StaffDetail.enrolled && !HeaderDetail.need_attachment, className: Detailmodules.buttonsize, @@ -9340,13 +9341,13 @@ var competitionDetails = function competitionDetails(_ref) { (_see$current = see.current) === null || _see$current === void 0 ? void 0 : _see$current.handleVisible(); return; } - gotocourse(e, HeaderDetail, HeaderDetail.mode === 2 ? 'ismodel' : HeaderDetail.personal ? 'personal' : "/competitions/index/".concat(HeaderDetail.identifier, "/enroll")); + gotocourse(e, HeaderDetail, HeaderDetail.mode === 2 ? 'ismodel' : HeaderDetail.personal ? 'personal' : "/competitions/".concat(HeaderDetail.identifier, "/detail/enroll")); }, children: StaffDetail.enrolled ? HeaderDetail.need_attachment ? '上传作品' : '已报名' : HeaderDetail !== null && HeaderDetail !== void 0 && HeaderDetail.enroll_url ? '前往大赛官网报名' : '立即报名' }) : null] - }), user.userInfo.real_name != "游客" && !(HeaderDetail !== null && HeaderDetail !== void 0 && HeaderDetail.enroll_url) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + }), user.userInfo.real_name != "游客" && !(HeaderDetail !== null && HeaderDetail !== void 0 && HeaderDetail.enroll_url) && HeaderDetail.enroll_end_time && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { onClick: function onClick(e) { - return gotocourse(e, HeaderDetail, HeaderDetail.mode === 2 ? 'ismodel' : HeaderDetail.personal ? 'personal' : "/competitions/index/".concat(HeaderDetail.identifier, "/enroll")); + return gotocourse(e, HeaderDetail, HeaderDetail.mode === 2 ? 'ismodel' : HeaderDetail.personal ? 'personal' : "/competitions/".concat(HeaderDetail.identifier, "/detail/enroll")); }, className: Detailmodules.myteam, children: (0,authority/* isSuperAdmin */.j5)() ? '参赛战队>>' : '我的战队>>' diff --git a/p__Competitions__Entered__Assembly__TeamDateil.async.js b/p__Competitions__Entered__Assembly__TeamDateil.async.js index 6fc8330267..e2ed71429c 100644 --- a/p__Competitions__Entered__Assembly__TeamDateil.async.js +++ b/p__Competitions__Entered__Assembly__TeamDateil.async.js @@ -303,7 +303,7 @@ var competitionDetails = function competitionDetails(_ref) { }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd_es_breadcrumb__WEBPACK_IMPORTED_MODULE_13__/* ["default"].Item */ .Z.Item, { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(umi__WEBPACK_IMPORTED_MODULE_9__.Link, { - to: "/competitions/index/".concat(identifier, "/enroll"), + to: "/competitions/".concat(identifier, "/detail/enroll"), children: "\u62A5\u540D" }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_10__.jsx)(antd_es_breadcrumb__WEBPACK_IMPORTED_MODULE_13__/* ["default"].Item */ .Z.Item, { diff --git a/p__Competitions__Entered__index.async.js b/p__Competitions__Entered__index.async.js index 3e3e0ebdea..ff5d615e15 100644 --- a/p__Competitions__Entered__index.async.js +++ b/p__Competitions__Entered__index.async.js @@ -369,7 +369,7 @@ function managed(_ref) { title: item.name, children: item.name ? item.name.length > 6 ? item.name.substring(0, 6) + '...' : item.name : '--' }), type === 1 ? /*#__PURE__*/(0,jsx_runtime.jsx)(react_router_dom/* Link */.rU, { - to: "/competitions/index/".concat(identifier, "/UpdateTeanname/").concat(item.id), + to: "/competitions/".concat(identifier, "/detail/UpdateTeanname/").concat(item.id), children: /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { overlayStyle: { zIndex: 1 @@ -477,7 +477,7 @@ function managed(_ref) { }) })] }), mode === 3 && /*#__PURE__*/(0,jsx_runtime.jsx)(react_router_dom/* Link */.rU, { - to: "/competitions/index/".concat(identifier, "/teamDetail/").concat(item.id), + to: "/competitions/".concat(identifier, "/detail/teamDetail/").concat(item.id), style: { color: "#0152d9", fontSize: '14px', @@ -575,7 +575,7 @@ function AllTeams(_ref) { children: "\u67E5\u770B" })] }), mode === 3 && /*#__PURE__*/(0,jsx_runtime.jsx)(react_router_dom/* Link */.rU, { - to: "/competitions/index/".concat(identifier, "/teamDetail/").concat(item.id), + to: "/competitions/".concat(identifier, "/detail/teamDetail/").concat(item.id), style: { color: "#0152d9", fontSize: '14px', @@ -1656,7 +1656,7 @@ function SignupSuccess(_ref) { style: { marginRight: '20px' }, - to: "/competitions/index/".concat(data === null || data === void 0 ? void 0 : data.identify), + to: "/competitions/".concat(data === null || data === void 0 ? void 0 : data.identify, "/detail"), children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { children: "\u8D5B\u4E8B\u8BE6\u60C5" }) @@ -1664,7 +1664,7 @@ function SignupSuccess(_ref) { style: { marginLeft: '20px' }, - to: "/competitions/index/".concat(data === null || data === void 0 ? void 0 : data.identify, "/UpdateTeanname/").concat(data === null || data === void 0 ? void 0 : data.team_id), + to: "/competitions/".concat(data === null || data === void 0 ? void 0 : data.identify, "/detail/UpdateTeanname/").concat(data === null || data === void 0 ? void 0 : data.team_id), children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { type: "primary", children: "\u7F16\u8F91\u6218\u961F" @@ -2214,7 +2214,7 @@ var competitionDetails = function competitionDetails(_ref) { }) }), /*#__PURE__*/(0,jsx_runtime.jsx)(breadcrumb/* default.Item */.Z.Item, { children: /*#__PURE__*/(0,jsx_runtime.jsxs)(_umi_production_exports.Link, { - to: "/competitions/index/".concat(identifier), + to: "/competitions/".concat(identifier, "/detail"), children: [HeaderDetail.name, HeaderDetail.sub_title ? '-' + HeaderDetail.sub_title : null] }) }), /*#__PURE__*/(0,jsx_runtime.jsx)(breadcrumb/* default.Item */.Z.Item, { @@ -2488,7 +2488,7 @@ var competitionDetails = function competitionDetails(_ref) { }, type: "primary", onClick: function onClick() { - (0,util/* openNewWindow */.xg)("/competitions/index/".concat(HeaderDetail === null || HeaderDetail === void 0 ? void 0 : HeaderDetail.identifier, "?active=\u8D5B\u9898\u53D1\u5E03")); + (0,util/* openNewWindow */.xg)("/competitions/".concat(HeaderDetail === null || HeaderDetail === void 0 ? void 0 : HeaderDetail.identifier, "/detail?active=\u8D5B\u9898\u53D1\u5E03")); }, children: "\u524D\u5F80\u67E5\u770B" }), [45, 51].includes(parseInt(HeaderDetail === null || HeaderDetail === void 0 ? void 0 : HeaderDetail.id)) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { diff --git a/p__Competitions__Index__index.async.js b/p__Competitions__Index__index.async.js index 57dd2b553c..f02287b621 100644 --- a/p__Competitions__Index__index.async.js +++ b/p__Competitions__Index__index.async.js @@ -424,6 +424,9 @@ var competitionsPage = function competitionsPage(_ref) { (0,react.useEffect)(function () { getdata(); }, [params, keyword]); + (0,react.useEffect)(function () { + competitions.listParams.url_suffix_name = params.Identifier; + }, [params.Identifier]); function getdata() { return _getdata.apply(this, arguments); } @@ -434,20 +437,15 @@ var competitionsPage = function competitionsPage(_ref) { while (1) switch (_context3.prev = _context3.next) { case 0: setloadings(true); - if (!['/competitions/index', '/competitions/index/', '/competitions/', '/competitions'].some(function (item) { - return location.pathname == item; - })) { - competitions.listParams.url_suffix_name = location.pathname.split('/competitions/')[1]; - } competitions.listParams.page = 1; competitions.listParams.keyword = keyword || ''; competitions.listParams.category = type; - _context3.next = 7; + _context3.next = 6; return dispatch({ type: 'competitions/getList', payload: objectSpread2_default()({}, competitions.listParams) }); - case 7: + case 6: data = _context3.sent; setloadings(false); setCheckedValues([]); @@ -455,7 +453,7 @@ var competitionsPage = function competitionsPage(_ref) { data: [["东北", 0, 0, 0], ["华东", 0, 0, 0], ["华北", 0, 0, 0], ["华中", 0, 0, 0], ["华南", 0, 0, 0], ["西南", 0, 0, 0], ["西北", 0, 0, 0], ["其他", 0, 0, 0]] }); setData(toConsumableArray_default()(data === null || data === void 0 ? void 0 : data.competitions)); - case 12: + case 11: case "end": return _context3.stop(); } @@ -495,7 +493,7 @@ var competitionsPage = function competitionsPage(_ref) { // payload: { // category: type, // page: page, - // }, + // }, }); case 6: lists = _context.sent; @@ -1104,6 +1102,8 @@ var Index_competitionsPage = function competitionsPage(_ref) { _useState20 = slicedToArray_default()(_useState19, 2), datas = _useState20[0], setdatas = _useState20[1]; + var _useParams = (0,_umi_production_exports.useParams)(), + identifier = _useParams.identifier; //出现页面右侧悬浮按钮 (0,react.useEffect)(function () { @@ -1119,13 +1119,9 @@ var Index_competitionsPage = function competitionsPage(_ref) { }; }, []); (0,react.useEffect)(function () { - if (!['/competitions/index', '/competitions/index/', '/competitions/', '/competitions'].some(function (item) { - return location.pathname == item; - })) { - competitions.listParams.url_suffix_name = location.pathname.split('/competitions/')[1]; - } else { - competitions.listParams.url_suffix_name = ''; - } + competitions.listParams.url_suffix_name = identifier; + }, [identifier]); + (0,react.useEffect)(function () { // getHomeNotice(); dispatch({ type: 'competitions/getList', @@ -1441,7 +1437,7 @@ var Index_competitionsPage = function competitionsPage(_ref) { if (item.external_url) { tourl(item.external_url); } else { - tourl(item.competition_status === 'ended' ? "/competitions/index/".concat(item.identifier) : item.competition_status === 'nearly_published' ? item.permission.editable == true ? "/competitions/index/".concat(item.identifier) : null : item.competition_status === 'progressing' ? "/competitions/index/".concat(item.identifier) : null); + tourl(item.competition_status === 'ended' ? "/competitions/".concat(item.identifier, "/detail") : item.competition_status === 'nearly_published' ? item.permission.editable == true ? "/competitions/".concat(item.identifier, "/detail") : null : item.competition_status === 'progressing' ? "/competitions/".concat(item.identifier, "/detail") : null); } }; @@ -1458,7 +1454,7 @@ var Index_competitionsPage = function competitionsPage(_ref) { event.stopPropagation(); tourl(item.external_url); } else { - gotocourse(event, item, item.mode === 2 ? 'ismodel' : item.personal ? 'personal' : "/competitions/index/".concat(item.identifier, "/enroll")); + gotocourse(event, item, item.mode === 2 ? 'ismodel' : item.personal ? 'personal' : "/competitions/".concat(item.identifier, "/detail/enroll")); } }; var _useState21 = (0,react.useState)(''), @@ -1494,6 +1490,8 @@ var Index_competitionsPage = function competitionsPage(_ref) { children: [competitions.listParams.url_suffix_name && competitions.banner !== '' && /*#__PURE__*/(0,jsx_runtime.jsx)("img", { src: "".concat(env/* default.IMG_SERVER */.Z.IMG_SERVER).concat(competitions.banner), style: { + width: '100%', + objectFit: "cover", height: "100%", position: "absolute", left: '50%', @@ -1507,7 +1505,7 @@ var Index_competitionsPage = function competitionsPage(_ref) { }, children: /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* Banner */.jL, { title: competitions.competition_title || '竞赛组织', - sunTitle: competitions.listParams.url_suffix_name && competitions.competition_title ? '' : '激发创新活力，培养软件人才', + sunTitle: competitions.listParams.url_suffix_name && competitions.competition_title ? '' : '激发创新活力，培养创新人才', img: competitions.listParams.url_suffix_name && competitions.banner ? '' : competition_banner_namespaceObject, imgWidth: 438, bannerExtraContent: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { @@ -1686,7 +1684,7 @@ var Index_competitionsPage = function competitionsPage(_ref) { return noclick(e); }, children: "\u62A5\u540D\u622A\u6B62" - }) : null, item && item.competition_status === 'progressing' && item.enroll_end != true && !item.external_url ? /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { + }) : null, item && item.competition_status === 'progressing' && item.enroll_end != true && !item.external_url && item.enroll_end_time ? /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { className: Indexmodules.signup, onClick: function onClick(e) { return onLickSignUpClick(e, item); diff --git a/p__Competitions__Update__index.async.js b/p__Competitions__Update__index.async.js index 30805e2f70..cc16e73179 100644 --- a/p__Competitions__Update__index.async.js +++ b/p__Competitions__Update__index.async.js @@ -228,7 +228,7 @@ var competitionDetails = function competitionDetails(_ref) { data = _context2.sent; if ((data === null || data === void 0 ? void 0 : data.status) === 0) { message/* default.info */.ZP.info('修改成功'); - _umi_production_exports.history.push("/competitions/index/".concat(identifier, "/enroll")); + _umi_production_exports.history.push("/competitions/".concat(identifier, "/detail/enroll")); } case 7: case "end": @@ -269,12 +269,12 @@ var competitionDetails = function competitionDetails(_ref) { }) }), /*#__PURE__*/(0,jsx_runtime.jsx)(breadcrumb/* default.Item */.Z.Item, { children: /*#__PURE__*/(0,jsx_runtime.jsxs)(_umi_production_exports.Link, { - to: "/competitions/index/".concat(identifier), + to: "/competitions/".concat(identifier, "/detail"), children: [HeaderDetail && HeaderDetail.name, HeaderDetail && HeaderDetail.sub_title ? '-' + HeaderDetail && HeaderDetail.sub_title : null] }) }), /*#__PURE__*/(0,jsx_runtime.jsx)(breadcrumb/* default.Item */.Z.Item, { children: /*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { - to: "/competitions/index/".concat(identifier, "/enroll"), + to: "/competitions/".concat(identifier, "/detail/enroll"), children: "\u62A5\u540D" }) }), /*#__PURE__*/(0,jsx_runtime.jsx)(breadcrumb/* default.Item */.Z.Item, { @@ -379,7 +379,7 @@ var competitionDetails = function competitionDetails(_ref) { marginLeft: '15px' }, children: /*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { - to: "/competitions/index/".concat(identifier, "/enroll"), + to: "/competitions/".concat(identifier, "/detail/enroll"), children: "\u53D6\u6D88" }) })] diff --git a/p__Message__index.async.js b/p__Message__index.async.js index 4f3393fa07..eede502f28 100644 --- a/p__Message__index.async.js +++ b/p__Message__index.async.js @@ -27,10 +27,10 @@ var space = __webpack_require__(26713); var radio_style = __webpack_require__(83822); // EXTERNAL MODULE: ./node_modules/antd/es/radio/index.js + 4 modules var es_radio = __webpack_require__(29924); -// EXTERNAL MODULE: ./node_modules/antd/es/tooltip/style/index.js + 1 modules -var tooltip_style = __webpack_require__(38390); -// EXTERNAL MODULE: ./node_modules/antd/es/tooltip/index.js + 3 modules -var tooltip = __webpack_require__(84908); +// EXTERNAL MODULE: ./node_modules/antd/es/button/style/index.js + 1 modules +var button_style = __webpack_require__(29913); +// EXTERNAL MODULE: ./node_modules/antd/es/button/index.js +var es_button = __webpack_require__(71577); // EXTERNAL MODULE: ./node_modules/antd/es/input/style/index.js + 1 modules var input_style = __webpack_require__(69463); // EXTERNAL MODULE: ./node_modules/antd/es/input/index.js + 5 modules @@ -69,7 +69,7 @@ var objectDestructuringEmpty_default = /*#__PURE__*/__webpack_require__.n(object var react = __webpack_require__(67294); ;// CONCATENATED MODULE: ./src/pages/Message/index.less?modules // extracted by mini-css-extract-plugin -/* harmony default export */ var Messagemodules = ({"flex_box_center":"flex_box_center___Ja97S","flex_space_between":"flex_space_between___RJu4E","flex_box_vertical_center":"flex_box_vertical_center___jhPTF","flex_box_center_end":"flex_box_center_end___ZtezU","flex_box_column":"flex_box_column___MqeI4","wrap":"wrap___k3OOZ","head":"head___h6t3O","empty":"empty___S6QaM","content":"content___sMZPl","left":"left___J41Si","title":"title___GUZvZ","leftBar":"leftBar___u_UUF","li":"li___Hnrra","active":"active___N4MxL","right":"right___eLWWO","rightBar":"rightBar___fMTLo","center":"center____NDzP","tabs":"tabs___jdS5u","cut":"cut___w1Pz_","action":"action___QkQ0f","actActive":"actActive___ESHzD","answers":"answers___dVktP","btn":"btn___BnDvU","disableBtn":"disableBtn___WYJSQ","unsolved":"unsolved___z4SON","box":"box____EpoE","hot":"hot___oUwVX"}); +/* harmony default export */ var Messagemodules = ({"flex_box_center":"flex_box_center___Ja97S","flex_space_between":"flex_space_between___RJu4E","flex_box_vertical_center":"flex_box_vertical_center___jhPTF","flex_box_center_end":"flex_box_center_end___ZtezU","flex_box_column":"flex_box_column___MqeI4","wrap":"wrap___k3OOZ","head":"head___h6t3O","empty":"empty___S6QaM","content":"content___sMZPl","left":"left___J41Si","title":"title___GUZvZ","leftBar":"leftBar___u_UUF","li":"li___Hnrra","active":"active___N4MxL","right":"right___eLWWO","rightBar":"rightBar___fMTLo","center":"center____NDzP","tabs":"tabs___jdS5u","cut":"cut___w1Pz_","action":"action___QkQ0f","actActive":"actActive___ESHzD","answers":"answers___dVktP","btn":"btn___BnDvU","disableBtn":"disableBtn___WYJSQ","unsolved":"unsolved___z4SON","box":"box____EpoE","hot":"hot___oUwVX","animation":"animation___YQjk7","text":"text___Si2da"}); // EXTERNAL MODULE: ./src/utils/fetch.ts var fetch = __webpack_require__(84519); // EXTERNAL MODULE: ./src/.umi-production/exports.ts + 8 modules @@ -120,7 +120,7 @@ var jsx_runtime = __webpack_require__(85893); var Message = function Message(_ref) { - var _rightData$data, _rightData$data2; + var _rightData$data$, _rightData$data$$shix, _rightData$data, _rightData$data2; objectDestructuringEmpty_default()(_ref); var _getJsonFromUrl = (0,util/* getJsonFromUrl */.oP)(), id = _getJsonFromUrl.id, @@ -178,6 +178,25 @@ var Message = function Message(_ref) { _useState24 = slicedToArray_default()(_useState23, 2), visible = _useState24[0], setVisible = _useState24[1]; + var _useState25 = (0,react.useState)(false), + _useState26 = slicedToArray_default()(_useState25, 2), + isLoading = _useState26[0], + setisLoading = _useState26[1]; + + // const [disSubmit, setdisSubmit] = useState(false) + // const items = challengeList?.map((item: any) => { + // return { + // label: + // { + // setChallengeId(k.target.value) + // getRightData(active, k.target.value) + // }}> + // {item.id === 0 ? item.subject : `${item.subject} 实训---第${item?.position}关`} + // + // , + // key: item.id + // } + // }) (0,react.useEffect)(function () { (0,_umi_production_exports.getDvaApp)()._store.dispatch({ type: 'globalSetting/footerToggle', @@ -353,6 +372,10 @@ var Message = function Message(_ref) { }(); var handleChange = function handleChange(e) { setValue(e.target.value); + // 判断是否为纯空格 + if (e.target.value.trim().length === 0) { + return; + } }; var handleLeftChange = function handleLeftChange(itemId) { loadData.current = loadData.current + 1; @@ -363,6 +386,7 @@ var Message = function Message(_ref) { getRightData(itemId, 0); getChallengeData(itemId); }; + // 点击发送触发 var handleSummit = /*#__PURE__*/function () { var _ref6 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5() { var _newRightData$data; @@ -370,33 +394,50 @@ var Message = function Message(_ref) { return regeneratorRuntime_default()().wrap(function _callee5$(_context5) { while (1) switch (_context5.prev = _context5.next) { case 0: + if (!(value.trim().length === 0)) { + _context5.next = 3; + break; + } + message/* default.error */.ZP.error("不能输入纯空格"); + return _context5.abrupt("return"); + case 3: if (!btnDisable) { - _context5.next = 2; + _context5.next = 5; break; } return _context5.abrupt("return"); - case 2: + case 5: if (value) { - _context5.next = 5; + _context5.next = 8; break; } message/* default.warn */.ZP.warn('请输入你要问的问题'); return _context5.abrupt("return"); - case 5: - setBtnDisable(true); + case 8: + // setBtnDisable(true); now = moment_default()().format('YYYY-MM-DDTHH:mm:ss.SSSZ'); newRightData = JSON.parse(JSON.stringify(rightData)); newRightData === null || newRightData === void 0 ? void 0 : (_newRightData$data = newRightData.data) === null || _newRightData$data === void 0 ? void 0 : _newRightData$data.push({ id: 0, updated_at: now, - question: value + question: value, + answer: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + className: Messagemodules.animation, + children: "\u8001\u5E08\u6B63\u5728\u56DE\u7B54\u4E2D\uFF0C\u8BF7\u7A0D\u540E" + }) }); setRightData(newRightData); setBarBottomIndex(barBottomIndex + 1); setValue(''); loadData.current = loadData.current + 1; - index = loadData.current; - _context5.next = 16; + index = loadData.current; // getRightData(active, challengeId, true) + // // 判断是否为纯空格 + // if (value.trim().length === 0) { + // message.error("不能输入纯空格") + // return + // } + setisLoading(true); + _context5.next = 19; return (0,fetch/* default */.ZP)("/api/chats/get_answer", { method: 'post', body: { @@ -407,19 +448,24 @@ var Message = function Message(_ref) { time: now } }); - case 16: + case 19: res = _context5.sent; if (!(index !== loadData.current)) { - _context5.next = 19; + _context5.next = 22; break; } return _context5.abrupt("return"); - case 19: + case 22: if ((res === null || res === void 0 ? void 0 : res.status) === 0) { + setisLoading(false); + // setdisSubmit(false) getRightData(active, challengeId, true); + } else { + // setdisSubmit(false) + setisLoading(false); } - setBtnDisable(false); - case 21: + // setBtnDisable(false) + case 23: case "end": return _context5.stop(); } @@ -479,6 +525,8 @@ var Message = function Message(_ref) { } }; var magList = ["\u8BF7".concat(rightData === null || rightData === void 0 ? void 0 : rightData.user_name, "\u8001\u5E08\u5C1D\u8BD5\u518D\u56DE\u7B54\u4E00\u6B21"), '可能启用了机器人，请老师亲自回答']; + // console.log("rightData", rightData); + return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: Messagemodules.wrap, children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { @@ -531,7 +579,7 @@ var Message = function Message(_ref) { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", { className: "iconfont icon-lianjie3" }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { - children: ["\u5F53\u524D\u5BF9\u8BDD\u5173\u8054\uFF1A", rightData !== null && rightData !== void 0 && rightData.challenge_name ? "".concat(rightData === null || rightData === void 0 ? void 0 : rightData.challenge_name, " \u5B9E\u8BAD---\u7B2C").concat(rightData === null || rightData === void 0 ? void 0 : rightData.challenge_position, "\u5173") : '全部'] + children: ["\u5F53\u524D\u5BF9\u8BDD\u5173\u8054\uFF1A", rightData !== null && rightData !== void 0 && rightData.challenge_name ? "".concat(rightData === null || rightData === void 0 ? void 0 : (_rightData$data$ = rightData.data[0]) === null || _rightData$data$ === void 0 ? void 0 : (_rightData$data$$shix = _rightData$data$.shixun) === null || _rightData$data$$shix === void 0 ? void 0 : _rightData$data$$shix.name, " \u5B9E\u8BAD---\u7B2C").concat(rightData === null || rightData === void 0 ? void 0 : rightData.challenge_position, "\u5173") : '全部'] }), !btnDisable && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { onClick: function onClick() { saveChallengeId.current = challengeId; @@ -550,6 +598,7 @@ var Message = function Message(_ref) { children: [!(rightData !== null && rightData !== void 0 && (_rightData$data = rightData.data) !== null && _rightData$data !== void 0 && _rightData$data.length) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: Messagemodules.empty }), rightData === null || rightData === void 0 ? void 0 : (_rightData$data2 = rightData.data) === null || _rightData$data2 === void 0 ? void 0 : _rightData$data2.map(function (e, i) { + var _e$shixun, _e$shixun2, _e$challenge; return /*#__PURE__*/(0,jsx_runtime.jsxs)(react.Fragment, { children: [!!e.question && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: Messagemodules.li, @@ -575,14 +624,34 @@ var Message = function Message(_ref) { src: "".concat(env/* default.IMG_SERVER */.Z.IMG_SERVER, "/images/").concat(rightData === null || rightData === void 0 ? void 0 : rightData.avatar) }), /*#__PURE__*/(0,jsx_runtime.jsxs)("aside", { children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("p", { - children: [/*#__PURE__*/(0,jsx_runtime.jsx)("b", { - children: rightData.user_name + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + style: { + display: "flex" + }, + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("b", { + style: { + marginRight: "20px" + }, + children: rightData.user_name + }), (_e$shixun = e.shixun) !== null && _e$shixun !== void 0 && _e$shixun.name ? /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + style: { + display: "flex", + alignItems: "center" + }, + children: ["\u5F53\u524D\u5BF9\u8BDD\u5173\u8054\uFF1A", (_e$shixun2 = e.shixun) === null || _e$shixun2 === void 0 ? void 0 : _e$shixun2.name, " \u5B9E\u8BAD---\u7B2C", (_e$challenge = e.challenge) === null || _e$challenge === void 0 ? void 0 : _e$challenge.position, "\u5173"] + }) : /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + style: { + display: "flex", + alignItems: "center" + }, + children: "\u5F53\u524D\u5BF9\u8BDD\u5173\u8054\uFF1A\u5168\u90E8" + })] }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", { children: moment_default()(e.updated_at).format("YYYY-MM-DD HH:mm") })] - }), /*#__PURE__*/(0,jsx_runtime.jsx)("pre", { + }), typeof e.answer === "string" ? /*#__PURE__*/(0,jsx_runtime.jsx)("pre", { children: e.answer - }), !!e.question && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { + }) : e.answer, !!e.question && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: Messagemodules.action, children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", { onClick: function onClick() { @@ -661,14 +730,8 @@ var Message = function Message(_ref) { // onKeyDown={handleKeyDown} value: value, onChange: handleChange - }), btnDisable ? /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - open: true, - title: "\u8001\u5E08\u6B63\u5728\u56DE\u7B54\uFF0C\u8BF7\u7A0D\u5019", - children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { - className: Messagemodules.disableBtn, - children: "\u53D1\u9001" - }) - }) : /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { + loading: isLoading, onClick: handleSummit, className: Messagemodules.btn, children: "\u53D1\u9001" @@ -698,9 +761,10 @@ var Message = function Message(_ref) { children: /*#__PURE__*/(0,jsx_runtime.jsx)(space/* default */.Z, { direction: "vertical", children: challengeList === null || challengeList === void 0 ? void 0 : challengeList.map(function (e) { + var _e$shixun3; return /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, { value: e.id, - children: e.id === 0 ? e.subject : "".concat(e.subject, " \u5B9E\u8BAD---\u7B2C").concat(e === null || e === void 0 ? void 0 : e.position, "\u5173") + children: e.id === 0 ? e.subject : "".concat((_e$shixun3 = e.shixun) === null || _e$shixun3 === void 0 ? void 0 : _e$shixun3.name, " \u5B9E\u8BAD---\u7B2C").concat(e === null || e === void 0 ? void 0 : e.challenge_position, "\u5173") }, e.id); }) }) diff --git a/p__Message__index.chunk.css b/p__Message__index.chunk.css index 97b1de0dbc..8adb0ae477 100644 --- a/p__Message__index.chunk.css +++ b/p__Message__index.chunk.css @@ -957,7 +957,6 @@ span.ant-radio + * { border-radius: 2px; color: #fff; text-align: center; - line-height: 38px; flex-shrink: 0; margin-left: 22px; font-size: 14px; @@ -1014,6 +1013,32 @@ span.ant-radio + * { line-height: 30px; color: #fff !important; } +.animation___YQjk7 { + color: #333; + font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace; + font-size: 14px; +} +.animation___YQjk7:after { + content: " "; + animation: text___Si2da 2s infinite; +} +@keyframes text___Si2da { + 0% { + content: ""; + } + 20% { + content: "."; + } + 40% { + content: ".."; + } + 60% { + content: "..."; + } + 80% { + content: "...."; + } +} /* stylelint-disable no-duplicate-selectors */ /* stylelint-disable */ /* stylelint-disable declaration-bang-space-before,no-duplicate-selectors,string-no-newline */ diff --git a/p__Paperlibrary__EditPaper__index.async.js b/p__Paperlibrary__EditPaper__index.async.js index a3ef6b4219..5ba509e93a 100644 --- a/p__Paperlibrary__EditPaper__index.async.js +++ b/p__Paperlibrary__EditPaper__index.async.js @@ -373,10 +373,10 @@ var ReuseSingleShixunModal = function ReuseSingleShixunModal(_ref3) { style: { marginBottom: 20 }, - children: "1\u3001\u590D\u5236\uFF0C\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u4E8C\u6B21\u7F16\u8F91\uFF0C\u7F16\u8F91\u7684\u5185\u5BB9\u4E0D\u4F1A\u540C\u6B65\u81F3\u539F\u9879\u76EE\u3002" + children: "1\u3001\u590D\u5236\uFF1A\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF08\u4E0D\u4F1A\u590D\u5236\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF09\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u7F16\u8F91\u5E76\u4E0E\u539F\u9879\u76EE\u4FE1\u606F\u4E92\u4E0D\u5F71\u54CD\u3002" }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "".concat(ReuseShixunModalmodules.content, " ").concat(ReuseShixunModalmodules.orangeColor), - children: "2\u3001\u4E0D\u590D\u5236\uFF0C\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + children: "2\u3001\u4E0D\u590D\u5236\uFF1A\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" })] })] }) : /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { @@ -456,8 +456,8 @@ var ReuseSingleShixunModal = function ReuseSingleShixunModal(_ref3) { }) : /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: ["\u8BE5\u9879\u76EE\u4E0D\u652F\u6301\u590D\u5236\uFF0C\u82E5\u786E\u8BA4\u7EE7\u7EED\u53D1\u9001\uFF0C", /*#__PURE__*/(0,jsx_runtime.jsx)("span", { className: ReuseShixunModalmodules.orangeColor, - children: "\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55" - }), "\uFF08\u5982\u679C\u4E0D\u60F3\u91CD\u7F6E\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF0C\u5EFA\u8BAE\u53C2\u7167\u8BE5\u5B9E\u8DF5\u9879\u76EE\u5185\u5BB9\u81EA\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\uFF0C\u6216\u8005\u5C1D\u8BD5\u8054\u7CFB\u9879\u76EE\u521B\u5EFA\u4EBA\u5F00\u653E\u672C\u9879\u76EE\u7684\u590D\u5236\u6743\u9650\uFF09\u3002"] + children: "\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + }), "\uFF08\u5982\u679C\u4E0D\u60F3\u6E05\u7A7A\u5B66\u751F\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\uFF0C\u5EFA\u8BAE\u53C2\u7167\u8BE5\u5B9E\u8DF5\u9879\u76EE\u7684\u5185\u5BB9\u81EA\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\uFF0C\u6216\u8005\u5C1D\u8BD5\u8054\u7CFB\u9879\u76EE\u521B\u5EFA\u4EBA\u5F00\u653E\u672C\u9879\u76EE\u7684\u590D\u5236\u6743\u9650\uFF09\u3002"] })] }) }) @@ -807,10 +807,10 @@ var ReuseMultipleShixunModal = function ReuseMultipleShixunModal(props) { style: { marginBottom: 20 }, - children: "1\u3001\u590D\u5236\uFF0C\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u4E8C\u6B21\u7F16\u8F91\uFF0C\u7F16\u8F91\u7684\u5185\u5BB9\u4E0D\u4F1A\u540C\u6B65\u81F3\u539F\u9879\u76EE\u3002" + children: "1\u3001\u590D\u5236\uFF1A\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF08\u4E0D\u4F1A\u590D\u5236\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF09\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u7F16\u8F91\u5E76\u4E0E\u539F\u9879\u76EE\u4FE1\u606F\u4E92\u4E0D\u5F71\u54CD\u3002" }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: ReuseShixunModalmodules.orangeColor, - children: "2\u3001\u4E0D\u590D\u5236\uFF0C\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + children: "2\u3001\u4E0D\u590D\u5236\uFF1A\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" })] }), (renderData === null || renderData === void 0 ? void 0 : renderData.can_copy_num) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { diff --git a/p__Paths__Detail__id.async.js b/p__Paths__Detail__id.async.js index da4e6109ca..bc6e64e786 100644 --- a/p__Paths__Detail__id.async.js +++ b/p__Paths__Detail__id.async.js @@ -1470,10 +1470,10 @@ var ReuseSingleShixunModal = function ReuseSingleShixunModal(_ref3) { style: { marginBottom: 20 }, - children: "1\u3001\u590D\u5236\uFF0C\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u4E8C\u6B21\u7F16\u8F91\uFF0C\u7F16\u8F91\u7684\u5185\u5BB9\u4E0D\u4F1A\u540C\u6B65\u81F3\u539F\u9879\u76EE\u3002" + children: "1\u3001\u590D\u5236\uFF1A\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF08\u4E0D\u4F1A\u590D\u5236\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF09\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u7F16\u8F91\u5E76\u4E0E\u539F\u9879\u76EE\u4FE1\u606F\u4E92\u4E0D\u5F71\u54CD\u3002" }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "".concat(ReuseShixunModalmodules.content, " ").concat(ReuseShixunModalmodules.orangeColor), - children: "2\u3001\u4E0D\u590D\u5236\uFF0C\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + children: "2\u3001\u4E0D\u590D\u5236\uFF1A\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" })] })] }) : /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { @@ -1553,8 +1553,8 @@ var ReuseSingleShixunModal = function ReuseSingleShixunModal(_ref3) { }) : /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: ["\u8BE5\u9879\u76EE\u4E0D\u652F\u6301\u590D\u5236\uFF0C\u82E5\u786E\u8BA4\u7EE7\u7EED\u53D1\u9001\uFF0C", /*#__PURE__*/(0,jsx_runtime.jsx)("span", { className: ReuseShixunModalmodules.orangeColor, - children: "\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55" - }), "\uFF08\u5982\u679C\u4E0D\u60F3\u91CD\u7F6E\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF0C\u5EFA\u8BAE\u53C2\u7167\u8BE5\u5B9E\u8DF5\u9879\u76EE\u5185\u5BB9\u81EA\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\uFF0C\u6216\u8005\u5C1D\u8BD5\u8054\u7CFB\u9879\u76EE\u521B\u5EFA\u4EBA\u5F00\u653E\u672C\u9879\u76EE\u7684\u590D\u5236\u6743\u9650\uFF09\u3002"] + children: "\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + }), "\uFF08\u5982\u679C\u4E0D\u60F3\u6E05\u7A7A\u5B66\u751F\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\uFF0C\u5EFA\u8BAE\u53C2\u7167\u8BE5\u5B9E\u8DF5\u9879\u76EE\u7684\u5185\u5BB9\u81EA\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\uFF0C\u6216\u8005\u5C1D\u8BD5\u8054\u7CFB\u9879\u76EE\u521B\u5EFA\u4EBA\u5F00\u653E\u672C\u9879\u76EE\u7684\u590D\u5236\u6743\u9650\uFF09\u3002"] })] }) }) @@ -1904,10 +1904,10 @@ var ReuseMultipleShixunModal = function ReuseMultipleShixunModal(props) { style: { marginBottom: 20 }, - children: "1\u3001\u590D\u5236\uFF0C\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u4E8C\u6B21\u7F16\u8F91\uFF0C\u7F16\u8F91\u7684\u5185\u5BB9\u4E0D\u4F1A\u540C\u6B65\u81F3\u539F\u9879\u76EE\u3002" + children: "1\u3001\u590D\u5236\uFF1A\u7CFB\u7EDF\u5C06\u590D\u5236\u5E76\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u9879\u76EE\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF08\u4E0D\u4F1A\u590D\u5236\u5B66\u751F\u7684\u6311\u6218\u8BB0\u5F55\uFF09\uFF0C\u65B0\u7684\u9879\u76EE\u652F\u6301\u8FDB\u884C\u7F16\u8F91\u5E76\u4E0E\u539F\u9879\u76EE\u4FE1\u606F\u4E92\u4E0D\u5F71\u54CD\u3002" }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: ReuseShixunModalmodules.orangeColor, - children: "2\u3001\u4E0D\u590D\u5236\uFF0C\u5F53\u524D\u9879\u76EE\u4F1A\u76F4\u63A5\u88AB\u5F15\u7528\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u5B66\u751F\u8FDB\u5165\u9879\u76EE\u6311\u6218\u65F6\u4F1A\u91CD\u7F6E\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" + children: "2\u3001\u4E0D\u590D\u5236\uFF1A\u5F53\u524D\u9879\u76EE\u4F1A\u88AB\u76F4\u63A5\u53D1\u9001\u5230\u8BFE\u5802\u4E2D\u4F7F\u7528\uFF0C\u6311\u6218\u8FC7\u8BE5\u9879\u76EE\u7684\u5B66\u751F\u518D\u6B21\u8FDB\u5165\u9879\u76EE\u5F00\u542F\u6311\u6218\u65F6\uFF0C\u4F1A\u6E05\u7A7A\u4E4B\u524D\u7684\u6311\u6218\u8BB0\u5F55\u3002" })] }), (renderData === null || renderData === void 0 ? void 0 : renderData.can_copy_num) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { diff --git a/p__Problemset__index.async.js b/p__Problemset__index.async.js index 84b1053621..55b6847c21 100644 --- a/p__Problemset__index.async.js +++ b/p__Problemset__index.async.js @@ -4394,7 +4394,9 @@ var markdown_editor = __webpack_require__(55373); var Operating = function Operating(_ref, ref) { var _formValue$name; - var data = _ref.data; + var data = _ref.data, + _ref$height = _ref.height, + height = _ref$height === void 0 ? 400 : _ref$height; var _Form$useForm = es_form/* default.useForm */.Z.useForm(), _Form$useForm2 = slicedToArray_default()(_Form$useForm, 1), form = _Form$useForm2[0]; @@ -4415,6 +4417,9 @@ var Operating = function Operating(_ref, ref) { }); return /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: Operatingmodules.operating, + style: { + marginBottom: '0' + }, children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_form/* default */.Z, { form: form, scrollToFirstError: true @@ -4477,6 +4482,7 @@ var Operating = function Operating(_ref, ref) { }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { name: "description", children: /*#__PURE__*/(0,jsx_runtime.jsx)(markdown_editor/* default */.Z, { + height: height, defaultValue: formValue.description || '', watch: true }) @@ -7075,23 +7081,24 @@ var ProblemsetPage = function ProblemsetPage(_ref) { return regeneratorRuntime_default()().wrap(function _callee32$(_context32) { while (1) switch (_context32.prev = _context32.next) { case 0: - operatingRef.current.form.validateFields()["catch"](function (e) { - document.body.scrollIntoView(); - }); + _context32.prev = 0; _context32.next = 3; return operatingRef.current.form.validateFields(); case 3: value = operatingRef.current.form.getFieldsValue(); // console.log(value, 'value') if (!((selectitem === null || selectitem === void 0 ? void 0 : selectitem.length) <= 0)) { - _context32.next = 7; + _context32.next = 8; break; } + document.getElementById("topicdom").scrollIntoView({ + behavior: "smooth" + }); message/* default.info */.ZP.info('请选择编程题'); return _context32.abrupt("return"); - case 7: + case 8: setAddLoading(true); _ref34 = paramsRouter, coursesId = _ref34.coursesId, categoryId = _ref34.categoryId; - _context32.next = 11; + _context32.next = 12; return (0,fetch/* default */.ZP)(isProgramEdit ? "/api/homework_commons/".concat(categoryId, "/update_hack.json") : "/api/courses/".concat(coursesId, "/homework_commons.json"), { method: isProgramEdit ? 'put' : 'post', body: objectSpread2_default()(objectSpread2_default()({}, value), {}, { @@ -7103,17 +7110,23 @@ var ProblemsetPage = function ProblemsetPage(_ref) { }) }) }); - case 11: + case 12: res = _context32.sent; if ((res === null || res === void 0 ? void 0 : res.status) === 0) { _umi_production_exports.history.push("/classrooms/".concat(paramsRouter.coursesId, "/program_homework/").concat(isProgramEdit ? categoryId : res.homework_id, "/detail?tabs=1")); } setAddLoading(false); - case 14: + _context32.next = 20; + break; + case 17: + _context32.prev = 17; + _context32.t0 = _context32["catch"](0); + document.body.scrollIntoView(); + case 20: case "end": return _context32.stop(); } - }, _callee32); + }, _callee32, null, [[0, 17]]); })); return function handleAdd() { return _ref33.apply(this, arguments); @@ -7149,10 +7162,15 @@ var ProblemsetPage = function ProblemsetPage(_ref) { className: Problemsetmodules.title, children: isprogram_homework ? isProgramText : '试题库' }), isprogram_homework && /*#__PURE__*/(0,jsx_runtime.jsx)(components_Operating, { + height: 250, data: editData, ref: operatingRef }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: Problemsetmodules.headerWrapper, + style: { + marginTop: "-50px" + }, + id: "topicdom", children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: Problemsetmodules.tabsWrap, children: /*#__PURE__*/(0,jsx_runtime.jsxs)(tabs/* default */.Z, { diff --git a/p__Shixuns__Detail__id.async.js b/p__Shixuns__Detail__id.async.js index b95d1f5167..49171d697c 100644 --- a/p__Shixuns__Detail__id.async.js +++ b/p__Shixuns__Detail__id.async.js @@ -1210,6 +1210,11 @@ var Banner = function Banner(_ref) { _useState18 = slicedToArray_default()(_useState17, 2), isOpen = _useState18[0], setIsopen = _useState18[1]; + // 按钮加载： + var _useState19 = (0,react.useState)(false), + _useState20 = slicedToArray_default()(_useState19, 2), + isLoading = _useState20[0], + setisLoading = _useState20[1]; var levelColor = [{ level: '初级', color: '#44D7B6' @@ -1260,6 +1265,7 @@ var Banner = function Banner(_ref) { }, 5000); }, []); var editable = (_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : (_user$userInfo$shixun = _user$userInfo.shixun) === null || _user$userInfo$shixun === void 0 ? void 0 : _user$userInfo$shixun.editable; + // 复制确认调用的函数： var handleCopy = /*#__PURE__*/function () { var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() { var _shixunsDetail$detail, _shixunsDetail$detail2; @@ -1267,14 +1273,15 @@ var Banner = function Banner(_ref) { return regeneratorRuntime_default()().wrap(function _callee$(_context) { while (1) switch (_context.prev = _context.next) { case 0: + setisLoading(true); if (!((_shixunsDetail$detail = shixunsDetail.detail) !== null && _shixunsDetail$detail !== void 0 && _shixunsDetail$detail.windows_vnc && !(0,authority/* isCommonSuperAdminOrOperation */.ag)())) { - _context.next = 2; + _context.next = 3; break; } return _context.abrupt("return", false); - case 2: + case 3: if (!((_shixunsDetail$detail2 = shixunsDetail.detail) !== null && _shixunsDetail$detail2 !== void 0 && _shixunsDetail$detail2.can_fork)) { - _context.next = 5; + _context.next = 6; break; } dispatch({ @@ -1284,20 +1291,24 @@ var Banner = function Banner(_ref) { } }); return _context.abrupt("return"); - case 5: - _context.next = 7; + case 6: + _context.next = 8; return (0,fetch/* default */.ZP)("/api/shixuns/".concat(shixunId === null || shixunId === void 0 ? void 0 : shixunId.current, "/copy.json"), { method: 'post', body: {} }); - case 7: + case 8: res = _context.sent; if (res.status === 0) { + setisLoading(false); _umi_production_exports.history === null || _umi_production_exports.history === void 0 ? void 0 : _umi_production_exports.history.push("/shixuns/".concat((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.shixun, "/challenges")); message/* default.success */.ZP.success('复制成功'); setisshowmodal(false); + } else { + setisLoading(false); } if (res.status === -3) { + setisLoading(false); dispatch({ type: 'shixunsDetail/setActionTabs', payload: { @@ -1308,7 +1319,7 @@ var Banner = function Banner(_ref) { } }); } - case 10: + case 11: case "end": return _context.stop(); } @@ -1668,10 +1679,10 @@ var Banner = function Banner(_ref) { var _shixunsDetail$detail12; setTextAreaValue((_shixunsDetail$detail12 = shixunsDetail.detail) === null || _shixunsDetail$detail12 === void 0 ? void 0 : _shixunsDetail$detail12.mark_content); }, [(_shixunsDetail$detail13 = shixunsDetail.detail) === null || _shixunsDetail$detail13 === void 0 ? void 0 : _shixunsDetail$detail13.mark_content]); - var _useState19 = (0,react.useState)(''), - _useState20 = slicedToArray_default()(_useState19, 2), - textAreaValue = _useState20[0], - setTextAreaValue = _useState20[1]; + var _useState21 = (0,react.useState)(''), + _useState22 = slicedToArray_default()(_useState21, 2), + textAreaValue = _useState22[0], + setTextAreaValue = _useState22[1]; var sendTags = /*#__PURE__*/function () { var _ref6 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6(value) { var _shixunsDetail$detail14, _shixunsDetail$detail15; @@ -2201,6 +2212,7 @@ var Banner = function Banner(_ref) { }, children: "\u53D6\u6D88" }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { + loading: isLoading, onClick: function onClick() { if (isredio == 1) { var _shixunsDetail$detail79; diff --git a/p__Shixuns__Edit__index.async.js b/p__Shixuns__Edit__index.async.js index 795e56322a..ac8edf5e97 100644 --- a/p__Shixuns__Edit__index.async.js +++ b/p__Shixuns__Edit__index.async.js @@ -676,7 +676,8 @@ var SelectEnvironment = function SelectEnvironment(_ref) { _ref$tags = _ref.tags, tags = _ref$tags === void 0 ? [] : _ref$tags, _ref$onChange = _ref.onChange, - onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange; + onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange, + shixun_type = _ref.shixun_type; var _useState = (0,react.useState)(''), _useState2 = slicedToArray_default()(_useState, 2), inputValue = _useState2[0], @@ -804,20 +805,22 @@ var SelectEnvironment = function SelectEnvironment(_ref) { case 7: clearTimeout(timerSearch.current); timerSearch.current = setTimeout( /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() { - var res, _res$data, _newItems, _res$data2; + var params, res, _res$data, _newItems, _res$data2; return regeneratorRuntime_default()().wrap(function _callee$(_context) { while (1) switch (_context.prev = _context.next) { case 0: - _context.next = 2; + params = { + keywords: encodeURIComponent(searchText || ''), + page: 1, + limit: 100000 + }; + shixun_type ? params["shixun_type"] = shixun_type : ""; + _context.next = 4; return (0,fetch/* default */.ZP)("/api/shixuns/search_image.json", { method: 'get', - params: { - keywords: encodeURIComponent(searchText || ''), - page: 1, - limit: 100000 - } + params: params }); - case 2: + case 4: res = _context.sent; if ((res === null || res === void 0 ? void 0 : res.status) === 0) { _newItems = listDom((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.mirrors) || []); @@ -826,7 +829,7 @@ var SelectEnvironment = function SelectEnvironment(_ref) { optionsSave.current = (0,lodash.cloneDeep)((res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.mirrors) || []); } } - case 4: + case 6: case "end": return _context.stop(); } @@ -884,7 +887,7 @@ var SelectEnvironment = function SelectEnvironment(_ref) { }; var clear = function clear() { setOptions([]); - setInputValue(''); + setInputValue(""); }; var activeClear = function activeClear(id) { onChange(id); @@ -901,7 +904,10 @@ var SelectEnvironment = function SelectEnvironment(_ref) { }); } return /*#__PURE__*/(0,jsx_runtime.jsx)("i", { - onClick: clear, + onClick: function onClick(e) { + e.stopPropagation(); + clear(); + }, className: "iconfont icon-shanchu4 c-grey-c" }); }; @@ -6554,7 +6560,7 @@ var radioStyle = { lineHeight: '30px' }; function Setting(_ref) { - var _user$userInfo, _user$userInfo$shixun, _shixunsDetail$detail, _shixunsDetail$detail2, _shixunsDetail$detail3, _shixunsDetail$detail4, _shixunsDetail$detail5, _shixunsDetail$settin99, _shixunsDetail$settin100, _shixunsDetail$detail6, _shixunsDetail$detail7, _shixunsDetail$settin152, _shixunsDetail$settin153, _shixunsDetail$settin154, _shixunsDetail$settin155, _shixunsDetail$detail8; + var _user$userInfo, _user$userInfo$shixun, _shixunsDetail$detail, _shixunsDetail$detail2, _shixunsDetail$detail3, _shixunsDetail$detail4, _shixunsDetail$detail5, _shixunsDetail$settin101, _shixunsDetail$settin102, _shixunsDetail$detail6, _shixunsDetail$detail7, _shixunsDetail$settin154, _shixunsDetail$settin155, _shixunsDetail$settin156, _shixunsDetail$settin157, _shixunsDetail$detail8; var user = _ref.user, dispatch = _ref.dispatch, shixunsDetail = _ref.shixunsDetail, @@ -6685,58 +6691,62 @@ function Setting(_ref) { _useState62 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState61, 2), disableDiscuss = _useState62[0], setDisableDiscuss = _useState62[1]; - //远程连接界面 var _useState63 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(false), _useState64 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState63, 2), - Remote = _useState64[0], - setRemote = _useState64[1]; - //关于实训 - var _useState65 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(), + disableAI = _useState64[0], + setdisableAI = _useState64[1]; + //远程连接界面 + var _useState65 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(false), _useState66 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState65, 2), - createTitle = _useState66[0], - setCreateTitle = _useState66[1]; - //判断文件是否修改 - var _useState67 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(false), + Remote = _useState66[0], + setRemote = _useState66[1]; + //关于实训 + var _useState67 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(), _useState68 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState67, 2), - isupdate = _useState68[0], - setIsupdate = _useState68[1]; - var _useState69 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(3), + createTitle = _useState68[0], + setCreateTitle = _useState68[1]; + //判断文件是否修改 + var _useState69 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(false), _useState70 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState69, 2), - terminal_count = _useState70[0], - setterminal_count = _useState70[1]; + isupdate = _useState70[0], + setIsupdate = _useState70[1]; + var _useState71 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(3), + _useState72 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState71, 2), + terminal_count = _useState72[0], + setterminal_count = _useState72[1]; //端口 - var _useState71 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(false), - _useState72 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState71, 2), - port = _useState72[0], - setport = _useState72[1]; + var _useState73 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(false), + _useState74 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState73, 2), + port = _useState74[0], + setport = _useState74[1]; //云主机窗口选择云 - var _useState73 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(), - _useState74 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState73, 2), - webssh_cloud = _useState74[0], - setWebsshCloud = _useState74[1]; + var _useState75 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(), + _useState76 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState75, 2), + webssh_cloud = _useState76[0], + setWebsshCloud = _useState76[1]; //实验环境使用时长 - var _useState75 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(0), - _useState76 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState75, 2), - survival_time = _useState76[0], - setSurvivalTime = _useState76[1]; + var _useState77 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(0), + _useState78 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState77, 2), + survival_time = _useState78[0], + setSurvivalTime = _useState78[1]; //实训容器网络 - var _useState77 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(false), - _useState78 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState77, 2), - close_internet = _useState78[0], - setclose_internet = _useState78[1]; + var _useState79 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(false), + _useState80 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState79, 2), + close_internet = _useState80[0], + setclose_internet = _useState80[1]; //图形化集合 - var _useState79 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)([{ + var _useState81 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)([{ template_name: '', template_identity: '' }]), - _useState80 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState79, 2), - shixun_virtual_templates = _useState80[0], - setshixun_virtual_templates = _useState80[1]; + _useState82 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState81, 2), + shixun_virtual_templates = _useState82[0], + setshixun_virtual_templates = _useState82[1]; var params = (0,umi__WEBPACK_IMPORTED_MODULE_23__.useParams)(); var diffObj = { forbid_copy: 'forbidCopy', @@ -6760,10 +6770,10 @@ function Setting(_ref) { }; //默认选中 - var _useState81 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(), - _useState82 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState81, 2), - isRadiuvalue = _useState82[0], - setIsRadiuValue = _useState82[1]; + var _useState83 = (0,react__WEBPACK_IMPORTED_MODULE_22__.useState)(), + _useState84 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_20___default()(_useState83, 2), + isRadiuvalue = _useState84[0], + setIsRadiuValue = _useState84[1]; var editable = (_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : (_user$userInfo$shixun = _user$userInfo.shixun) === null || _user$userInfo$shixun === void 0 ? void 0 : _user$userInfo$shixun.editable; var handleGetDepartments = /*#__PURE__*/function () { var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_19___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_18___default()().mark(function _callee(value) { @@ -6854,8 +6864,8 @@ function Setting(_ref) { setServiceConfigList(configList); }; var handleInitState = function handleInitState() { - var _shixunsDetail$settin3, _shixunsDetail$settin4, _shixunsDetail$settin5, _shixunsDetail$settin6, _shixunsDetail$settin7, _shixunsDetail$settin8, _shixunsDetail$settin9, _shixunsDetail$settin10, _shixunsDetail$settin11, _shixunsDetail$settin12, _shixunsDetail$settin13, _shixunsDetail$settin14, _shixunsDetail$settin15, _shixunsDetail$settin16, _shixunsDetail$settin17, _shixunsDetail$settin18, _shixunsDetail$settin19, _shixunsDetail$settin20, _shixunsDetail$settin21, _shixunsDetail$settin22, _shixunsDetail$settin23, _shixunsDetail$settin24, _shixunsDetail$settin25, _shixunsDetail$settin26, _shixunsDetail$settin27, _shixunsDetail$settin28, _shixunsDetail$settin29, _shixunsDetail$settin30, _shixunsDetail$settin31, _shixunsDetail$settin32, _shixunsDetail$settin33, _shixunsDetail$settin34, _shixunsDetail$settin35, _shixunsDetail$settin36, _shixunsDetail$settin37, _shixunsDetail$settin38, _shixunsDetail$settin39, _shixunsDetail$settin40, _shixunsDetail$settin41, _shixunsDetail$settin42, _shixunsDetail$settin43, _shixunsDetail$settin44, _shixunsDetail$settin45, _shixunsDetail$settin46, _shixunsDetail$settin47, _shixunsDetail$settin48, _shixunsDetail$settin49, _shixunsDetail$settin50, _shixunsDetail$settin51, _shixunsDetail$settin52, _shixunsDetail$settin53, _shixunsDetail$settin54, _shixunsDetail$settin55, _shixunsDetail$settin56, _shixunsDetail$settin57, _shixunsDetail$settin58, _shixunsDetail$settin59, _shixunsDetail$settin62, _shixunsDetail$settin63, _shixunsDetail$settin64, _shixunsDetail$settin65, _shixunsDetail$settin66, _shixunsDetail$settin67, _shixunsDetail$settin68, _shixunsDetail$settin69, _shixunsDetail$settin70, _shixunsDetail$settin71, _shixunsDetail$settin72, _shixunsDetail$settin73; - // console.log('---------',shixunsDetail?.setting?.shixun); + var _shixunsDetail$settin3, _shixunsDetail$settin4, _shixunsDetail$settin5, _shixunsDetail$settin6, _shixunsDetail$settin7, _shixunsDetail$settin8, _shixunsDetail$settin9, _shixunsDetail$settin10, _shixunsDetail$settin11, _shixunsDetail$settin12, _shixunsDetail$settin13, _shixunsDetail$settin14, _shixunsDetail$settin15, _shixunsDetail$settin16, _shixunsDetail$settin17, _shixunsDetail$settin18, _shixunsDetail$settin19, _shixunsDetail$settin20, _shixunsDetail$settin21, _shixunsDetail$settin22, _shixunsDetail$settin23, _shixunsDetail$settin24, _shixunsDetail$settin25, _shixunsDetail$settin26, _shixunsDetail$settin27, _shixunsDetail$settin28, _shixunsDetail$settin29, _shixunsDetail$settin30, _shixunsDetail$settin31, _shixunsDetail$settin32, _shixunsDetail$settin33, _shixunsDetail$settin34, _shixunsDetail$settin35, _shixunsDetail$settin36, _shixunsDetail$settin37, _shixunsDetail$settin38, _shixunsDetail$settin39, _shixunsDetail$settin40, _shixunsDetail$settin41, _shixunsDetail$settin42, _shixunsDetail$settin43, _shixunsDetail$settin44, _shixunsDetail$settin45, _shixunsDetail$settin46, _shixunsDetail$settin47, _shixunsDetail$settin48, _shixunsDetail$settin49, _shixunsDetail$settin50, _shixunsDetail$settin51, _shixunsDetail$settin52, _shixunsDetail$settin53, _shixunsDetail$settin54, _shixunsDetail$settin55, _shixunsDetail$settin56, _shixunsDetail$settin57, _shixunsDetail$settin58, _shixunsDetail$settin59, _shixunsDetail$settin60, _shixunsDetail$settin61, _shixunsDetail$settin64, _shixunsDetail$settin65, _shixunsDetail$settin66, _shixunsDetail$settin67, _shixunsDetail$settin68, _shixunsDetail$settin69, _shixunsDetail$settin70, _shixunsDetail$settin71, _shixunsDetail$settin72, _shixunsDetail$settin73, _shixunsDetail$settin74, _shixunsDetail$settin75; + // console.log('---------', shixunsDetail?.setting?.shixun); var _ref3 = (shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin3 = shixunsDetail.setting) === null || _shixunsDetail$settin3 === void 0 ? void 0 : _shixunsDetail$settin3.shixun) || {}, choice_main_type = _ref3.choice_main_type, @@ -6876,48 +6886,49 @@ function Setting(_ref) { setVirtualMachine((_shixunsDetail$settin10 = shixunsDetail.setting) === null || _shixunsDetail$settin10 === void 0 ? void 0 : (_shixunsDetail$settin11 = _shixunsDetail$settin10.shixun) === null || _shixunsDetail$settin11 === void 0 ? void 0 : _shixunsDetail$settin11.virtual_machine); setLinuxVNC((_shixunsDetail$settin12 = shixunsDetail.setting) === null || _shixunsDetail$settin12 === void 0 ? void 0 : (_shixunsDetail$settin13 = _shixunsDetail$settin12.shixun) === null || _shixunsDetail$settin13 === void 0 ? void 0 : _shixunsDetail$settin13.linux_vnc); setWindowsConnectionMode(((_shixunsDetail$settin14 = shixunsDetail.setting) === null || _shixunsDetail$settin14 === void 0 ? void 0 : (_shixunsDetail$settin15 = _shixunsDetail$settin14.shixun) === null || _shixunsDetail$settin15 === void 0 ? void 0 : _shixunsDetail$settin15.windows_connection_mode) || 'vnc'); - setVNC((_shixunsDetail$settin16 = shixunsDetail.setting) === null || _shixunsDetail$settin16 === void 0 ? void 0 : (_shixunsDetail$settin17 = _shixunsDetail$settin16.shixun) === null || _shixunsDetail$settin17 === void 0 ? void 0 : _shixunsDetail$settin17.vnc); - setWebsshShow(!!((_shixunsDetail$settin18 = shixunsDetail.setting) !== null && _shixunsDetail$settin18 !== void 0 && (_shixunsDetail$settin19 = _shixunsDetail$settin18.shixun) !== null && _shixunsDetail$settin19 !== void 0 && _shixunsDetail$settin19.webssh)); - setSshRadioValue((_shixunsDetail$settin20 = shixunsDetail.setting) === null || _shixunsDetail$settin20 === void 0 ? void 0 : (_shixunsDetail$settin21 = _shixunsDetail$settin20.shixun) === null || _shixunsDetail$settin21 === void 0 ? void 0 : _shixunsDetail$settin21.webssh); - setMultiWebssh((_shixunsDetail$settin22 = shixunsDetail.setting) === null || _shixunsDetail$settin22 === void 0 ? void 0 : (_shixunsDetail$settin23 = _shixunsDetail$settin22.shixun) === null || _shixunsDetail$settin23 === void 0 ? void 0 : _shixunsDetail$settin23.multi_webssh); - setHideCode((_shixunsDetail$settin24 = shixunsDetail.setting) === null || _shixunsDetail$settin24 === void 0 ? void 0 : (_shixunsDetail$settin25 = _shixunsDetail$settin24.shixun) === null || _shixunsDetail$settin25 === void 0 ? void 0 : _shixunsDetail$settin25.hide_code); - setCodeEditPermission((_shixunsDetail$settin26 = shixunsDetail.setting) === null || _shixunsDetail$settin26 === void 0 ? void 0 : (_shixunsDetail$settin27 = _shixunsDetail$settin26.shixun) === null || _shixunsDetail$settin27 === void 0 ? void 0 : _shixunsDetail$settin27.code_edit_permission); - setCodeHidden((_shixunsDetail$settin28 = shixunsDetail.setting) === null || _shixunsDetail$settin28 === void 0 ? void 0 : (_shixunsDetail$settin29 = _shixunsDetail$settin28.shixun) === null || _shixunsDetail$settin29 === void 0 ? void 0 : _shixunsDetail$settin29.show_code_dir); - setForbidCopy((_shixunsDetail$settin30 = shixunsDetail.setting) === null || _shixunsDetail$settin30 === void 0 ? void 0 : (_shixunsDetail$settin31 = _shixunsDetail$settin30.shixun) === null || _shixunsDetail$settin31 === void 0 ? void 0 : _shixunsDetail$settin31.forbid_copy); - setTaskPass((_shixunsDetail$settin32 = shixunsDetail.setting) === null || _shixunsDetail$settin32 === void 0 ? void 0 : (_shixunsDetail$settin33 = _shixunsDetail$settin32.shixun) === null || _shixunsDetail$settin33 === void 0 ? void 0 : _shixunsDetail$settin33.task_pass); - setTestSetPermission((_shixunsDetail$settin34 = shixunsDetail.setting) === null || _shixunsDetail$settin34 === void 0 ? void 0 : (_shixunsDetail$settin35 = _shixunsDetail$settin34.shixun) === null || _shixunsDetail$settin35 === void 0 ? void 0 : _shixunsDetail$settin35.test_set_permission); - set_display_git_address((_shixunsDetail$settin36 = shixunsDetail.setting.shixun) === null || _shixunsDetail$settin36 === void 0 ? void 0 : _shixunsDetail$settin36.display_git_address); - setIsCopy((_shixunsDetail$settin37 = shixunsDetail.setting) === null || _shixunsDetail$settin37 === void 0 ? void 0 : (_shixunsDetail$settin38 = _shixunsDetail$settin37.shixun) === null || _shixunsDetail$settin38 === void 0 ? void 0 : _shixunsDetail$settin38.can_copy); - setOpenValue((_shixunsDetail$settin39 = shixunsDetail.setting) === null || _shixunsDetail$settin39 === void 0 ? void 0 : (_shixunsDetail$settin40 = _shixunsDetail$settin39.shixun) === null || _shixunsDetail$settin40 === void 0 ? void 0 : _shixunsDetail$settin40.use_scope); - setIsOpenTime(!!((_shixunsDetail$settin41 = shixunsDetail.setting) !== null && _shixunsDetail$settin41 !== void 0 && (_shixunsDetail$settin42 = _shixunsDetail$settin41.shixun) !== null && _shixunsDetail$settin42 !== void 0 && _shixunsDetail$settin42.opening_time)); - setOpenTime((_shixunsDetail$settin43 = shixunsDetail.setting) === null || _shixunsDetail$settin43 === void 0 ? void 0 : (_shixunsDetail$settin44 = _shixunsDetail$settin43.shixun) === null || _shixunsDetail$settin44 === void 0 ? void 0 : _shixunsDetail$settin44.opening_time); - setSelectDepartmentList((_shixunsDetail$settin45 = shixunsDetail.setting) === null || _shixunsDetail$settin45 === void 0 ? void 0 : (_shixunsDetail$settin46 = _shixunsDetail$settin45.shixun) === null || _shixunsDetail$settin46 === void 0 ? void 0 : _shixunsDetail$settin46.scope_partment); - setevaluationScript((_shixunsDetail$settin47 = shixunsDetail.setting) === null || _shixunsDetail$settin47 === void 0 ? void 0 : (_shixunsDetail$settin48 = _shixunsDetail$settin47.shixun) === null || _shixunsDetail$settin48 === void 0 ? void 0 : _shixunsDetail$settin48.choice_standard_scripts); - setDisableDiscuss((_shixunsDetail$settin49 = shixunsDetail.setting) === null || _shixunsDetail$settin49 === void 0 ? void 0 : (_shixunsDetail$settin50 = _shixunsDetail$settin49.shixun) === null || _shixunsDetail$settin50 === void 0 ? void 0 : _shixunsDetail$settin50.is_disable_discuss); + setdisableAI((_shixunsDetail$settin16 = shixunsDetail.setting) === null || _shixunsDetail$settin16 === void 0 ? void 0 : (_shixunsDetail$settin17 = _shixunsDetail$settin16.shixun) === null || _shixunsDetail$settin17 === void 0 ? void 0 : _shixunsDetail$settin17.ai_reply); + setVNC((_shixunsDetail$settin18 = shixunsDetail.setting) === null || _shixunsDetail$settin18 === void 0 ? void 0 : (_shixunsDetail$settin19 = _shixunsDetail$settin18.shixun) === null || _shixunsDetail$settin19 === void 0 ? void 0 : _shixunsDetail$settin19.vnc); + setWebsshShow(!!((_shixunsDetail$settin20 = shixunsDetail.setting) !== null && _shixunsDetail$settin20 !== void 0 && (_shixunsDetail$settin21 = _shixunsDetail$settin20.shixun) !== null && _shixunsDetail$settin21 !== void 0 && _shixunsDetail$settin21.webssh)); + setSshRadioValue((_shixunsDetail$settin22 = shixunsDetail.setting) === null || _shixunsDetail$settin22 === void 0 ? void 0 : (_shixunsDetail$settin23 = _shixunsDetail$settin22.shixun) === null || _shixunsDetail$settin23 === void 0 ? void 0 : _shixunsDetail$settin23.webssh); + setMultiWebssh((_shixunsDetail$settin24 = shixunsDetail.setting) === null || _shixunsDetail$settin24 === void 0 ? void 0 : (_shixunsDetail$settin25 = _shixunsDetail$settin24.shixun) === null || _shixunsDetail$settin25 === void 0 ? void 0 : _shixunsDetail$settin25.multi_webssh); + setHideCode((_shixunsDetail$settin26 = shixunsDetail.setting) === null || _shixunsDetail$settin26 === void 0 ? void 0 : (_shixunsDetail$settin27 = _shixunsDetail$settin26.shixun) === null || _shixunsDetail$settin27 === void 0 ? void 0 : _shixunsDetail$settin27.hide_code); + setCodeEditPermission((_shixunsDetail$settin28 = shixunsDetail.setting) === null || _shixunsDetail$settin28 === void 0 ? void 0 : (_shixunsDetail$settin29 = _shixunsDetail$settin28.shixun) === null || _shixunsDetail$settin29 === void 0 ? void 0 : _shixunsDetail$settin29.code_edit_permission); + setCodeHidden((_shixunsDetail$settin30 = shixunsDetail.setting) === null || _shixunsDetail$settin30 === void 0 ? void 0 : (_shixunsDetail$settin31 = _shixunsDetail$settin30.shixun) === null || _shixunsDetail$settin31 === void 0 ? void 0 : _shixunsDetail$settin31.show_code_dir); + setForbidCopy((_shixunsDetail$settin32 = shixunsDetail.setting) === null || _shixunsDetail$settin32 === void 0 ? void 0 : (_shixunsDetail$settin33 = _shixunsDetail$settin32.shixun) === null || _shixunsDetail$settin33 === void 0 ? void 0 : _shixunsDetail$settin33.forbid_copy); + setTaskPass((_shixunsDetail$settin34 = shixunsDetail.setting) === null || _shixunsDetail$settin34 === void 0 ? void 0 : (_shixunsDetail$settin35 = _shixunsDetail$settin34.shixun) === null || _shixunsDetail$settin35 === void 0 ? void 0 : _shixunsDetail$settin35.task_pass); + setTestSetPermission((_shixunsDetail$settin36 = shixunsDetail.setting) === null || _shixunsDetail$settin36 === void 0 ? void 0 : (_shixunsDetail$settin37 = _shixunsDetail$settin36.shixun) === null || _shixunsDetail$settin37 === void 0 ? void 0 : _shixunsDetail$settin37.test_set_permission); + set_display_git_address((_shixunsDetail$settin38 = shixunsDetail.setting.shixun) === null || _shixunsDetail$settin38 === void 0 ? void 0 : _shixunsDetail$settin38.display_git_address); + setIsCopy((_shixunsDetail$settin39 = shixunsDetail.setting) === null || _shixunsDetail$settin39 === void 0 ? void 0 : (_shixunsDetail$settin40 = _shixunsDetail$settin39.shixun) === null || _shixunsDetail$settin40 === void 0 ? void 0 : _shixunsDetail$settin40.can_copy); + setOpenValue((_shixunsDetail$settin41 = shixunsDetail.setting) === null || _shixunsDetail$settin41 === void 0 ? void 0 : (_shixunsDetail$settin42 = _shixunsDetail$settin41.shixun) === null || _shixunsDetail$settin42 === void 0 ? void 0 : _shixunsDetail$settin42.use_scope); + setIsOpenTime(!!((_shixunsDetail$settin43 = shixunsDetail.setting) !== null && _shixunsDetail$settin43 !== void 0 && (_shixunsDetail$settin44 = _shixunsDetail$settin43.shixun) !== null && _shixunsDetail$settin44 !== void 0 && _shixunsDetail$settin44.opening_time)); + setOpenTime((_shixunsDetail$settin45 = shixunsDetail.setting) === null || _shixunsDetail$settin45 === void 0 ? void 0 : (_shixunsDetail$settin46 = _shixunsDetail$settin45.shixun) === null || _shixunsDetail$settin46 === void 0 ? void 0 : _shixunsDetail$settin46.opening_time); + setSelectDepartmentList((_shixunsDetail$settin47 = shixunsDetail.setting) === null || _shixunsDetail$settin47 === void 0 ? void 0 : (_shixunsDetail$settin48 = _shixunsDetail$settin47.shixun) === null || _shixunsDetail$settin48 === void 0 ? void 0 : _shixunsDetail$settin48.scope_partment); + setevaluationScript((_shixunsDetail$settin49 = shixunsDetail.setting) === null || _shixunsDetail$settin49 === void 0 ? void 0 : (_shixunsDetail$settin50 = _shixunsDetail$settin49.shixun) === null || _shixunsDetail$settin50 === void 0 ? void 0 : _shixunsDetail$settin50.choice_standard_scripts); + setDisableDiscuss((_shixunsDetail$settin51 = shixunsDetail.setting) === null || _shixunsDetail$settin51 === void 0 ? void 0 : (_shixunsDetail$settin52 = _shixunsDetail$settin51.shixun) === null || _shixunsDetail$settin52 === void 0 ? void 0 : _shixunsDetail$settin52.is_disable_discuss); // handleChangeInstallPackage(choice_main_type, choice_small_type) - setterminal_count((_shixunsDetail$settin51 = shixunsDetail.setting) === null || _shixunsDetail$settin51 === void 0 ? void 0 : (_shixunsDetail$settin52 = _shixunsDetail$settin51.shixun) === null || _shixunsDetail$settin52 === void 0 ? void 0 : _shixunsDetail$settin52.terminal_count); - setSurvivalTime((_shixunsDetail$settin53 = shixunsDetail.setting) === null || _shixunsDetail$settin53 === void 0 ? void 0 : (_shixunsDetail$settin54 = _shixunsDetail$settin53.shixun) === null || _shixunsDetail$settin54 === void 0 ? void 0 : _shixunsDetail$settin54.survival_time); - setclose_internet((_shixunsDetail$settin55 = shixunsDetail.setting) === null || _shixunsDetail$settin55 === void 0 ? void 0 : (_shixunsDetail$settin56 = _shixunsDetail$settin55.shixun) === null || _shixunsDetail$settin56 === void 0 ? void 0 : _shixunsDetail$settin56.close_internet); - if ((shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin57 = shixunsDetail.setting) === null || _shixunsDetail$settin57 === void 0 ? void 0 : (_shixunsDetail$settin58 = _shixunsDetail$settin57.shixun) === null || _shixunsDetail$settin58 === void 0 ? void 0 : (_shixunsDetail$settin59 = _shixunsDetail$settin58.shixun_virtual_templates) === null || _shixunsDetail$settin59 === void 0 ? void 0 : _shixunsDetail$settin59.length) > 0) { - var _shixunsDetail$settin60, _shixunsDetail$settin61; - setshixun_virtual_templates(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_16___default()(shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin60 = shixunsDetail.setting) === null || _shixunsDetail$settin60 === void 0 ? void 0 : (_shixunsDetail$settin61 = _shixunsDetail$settin60.shixun) === null || _shixunsDetail$settin61 === void 0 ? void 0 : _shixunsDetail$settin61.shixun_virtual_templates)); - } - setport((_shixunsDetail$settin62 = shixunsDetail.setting) === null || _shixunsDetail$settin62 === void 0 ? void 0 : (_shixunsDetail$settin63 = _shixunsDetail$settin62.shixun) === null || _shixunsDetail$settin63 === void 0 ? void 0 : _shixunsDetail$settin63.port_mapping); - if ((_shixunsDetail$settin64 = shixunsDetail.setting) !== null && _shixunsDetail$settin64 !== void 0 && (_shixunsDetail$settin65 = _shixunsDetail$settin64.shixun) !== null && _shixunsDetail$settin65 !== void 0 && _shixunsDetail$settin65.windows_vnc || (_shixunsDetail$settin66 = shixunsDetail.setting) !== null && _shixunsDetail$settin66 !== void 0 && (_shixunsDetail$settin67 = _shixunsDetail$settin66.shixun) !== null && _shixunsDetail$settin67 !== void 0 && _shixunsDetail$settin67.linux_vnc || (_shixunsDetail$settin68 = shixunsDetail.setting) !== null && _shixunsDetail$settin68 !== void 0 && (_shixunsDetail$settin69 = _shixunsDetail$settin68.shixun) !== null && _shixunsDetail$settin69 !== void 0 && _shixunsDetail$settin69.vnc || (_shixunsDetail$settin70 = shixunsDetail.setting) !== null && _shixunsDetail$settin70 !== void 0 && (_shixunsDetail$settin71 = _shixunsDetail$settin70.shixun) !== null && _shixunsDetail$settin71 !== void 0 && _shixunsDetail$settin71.virtual_machine) { + setterminal_count((_shixunsDetail$settin53 = shixunsDetail.setting) === null || _shixunsDetail$settin53 === void 0 ? void 0 : (_shixunsDetail$settin54 = _shixunsDetail$settin53.shixun) === null || _shixunsDetail$settin54 === void 0 ? void 0 : _shixunsDetail$settin54.terminal_count); + setSurvivalTime((_shixunsDetail$settin55 = shixunsDetail.setting) === null || _shixunsDetail$settin55 === void 0 ? void 0 : (_shixunsDetail$settin56 = _shixunsDetail$settin55.shixun) === null || _shixunsDetail$settin56 === void 0 ? void 0 : _shixunsDetail$settin56.survival_time); + setclose_internet((_shixunsDetail$settin57 = shixunsDetail.setting) === null || _shixunsDetail$settin57 === void 0 ? void 0 : (_shixunsDetail$settin58 = _shixunsDetail$settin57.shixun) === null || _shixunsDetail$settin58 === void 0 ? void 0 : _shixunsDetail$settin58.close_internet); + if ((shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin59 = shixunsDetail.setting) === null || _shixunsDetail$settin59 === void 0 ? void 0 : (_shixunsDetail$settin60 = _shixunsDetail$settin59.shixun) === null || _shixunsDetail$settin60 === void 0 ? void 0 : (_shixunsDetail$settin61 = _shixunsDetail$settin60.shixun_virtual_templates) === null || _shixunsDetail$settin61 === void 0 ? void 0 : _shixunsDetail$settin61.length) > 0) { + var _shixunsDetail$settin62, _shixunsDetail$settin63; + setshixun_virtual_templates(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_16___default()(shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin62 = shixunsDetail.setting) === null || _shixunsDetail$settin62 === void 0 ? void 0 : (_shixunsDetail$settin63 = _shixunsDetail$settin62.shixun) === null || _shixunsDetail$settin63 === void 0 ? void 0 : _shixunsDetail$settin63.shixun_virtual_templates)); + } + setport((_shixunsDetail$settin64 = shixunsDetail.setting) === null || _shixunsDetail$settin64 === void 0 ? void 0 : (_shixunsDetail$settin65 = _shixunsDetail$settin64.shixun) === null || _shixunsDetail$settin65 === void 0 ? void 0 : _shixunsDetail$settin65.port_mapping); + if ((_shixunsDetail$settin66 = shixunsDetail.setting) !== null && _shixunsDetail$settin66 !== void 0 && (_shixunsDetail$settin67 = _shixunsDetail$settin66.shixun) !== null && _shixunsDetail$settin67 !== void 0 && _shixunsDetail$settin67.windows_vnc || (_shixunsDetail$settin68 = shixunsDetail.setting) !== null && _shixunsDetail$settin68 !== void 0 && (_shixunsDetail$settin69 = _shixunsDetail$settin68.shixun) !== null && _shixunsDetail$settin69 !== void 0 && _shixunsDetail$settin69.linux_vnc || (_shixunsDetail$settin70 = shixunsDetail.setting) !== null && _shixunsDetail$settin70 !== void 0 && (_shixunsDetail$settin71 = _shixunsDetail$settin70.shixun) !== null && _shixunsDetail$settin71 !== void 0 && _shixunsDetail$settin71.vnc || (_shixunsDetail$settin72 = shixunsDetail.setting) !== null && _shixunsDetail$settin72 !== void 0 && (_shixunsDetail$settin73 = _shixunsDetail$settin72.shixun) !== null && _shixunsDetail$settin73 !== void 0 && _shixunsDetail$settin73.virtual_machine) { setIsRadiuValue(5); setRemote(true); - } else if (!!((_shixunsDetail$settin72 = shixunsDetail.setting) !== null && _shixunsDetail$settin72 !== void 0 && (_shixunsDetail$settin73 = _shixunsDetail$settin72.shixun) !== null && _shixunsDetail$settin73 !== void 0 && _shixunsDetail$settin73.webssh)) { + } else if (!!((_shixunsDetail$settin74 = shixunsDetail.setting) !== null && _shixunsDetail$settin74 !== void 0 && (_shixunsDetail$settin75 = _shixunsDetail$settin74.shixun) !== null && _shixunsDetail$settin75 !== void 0 && _shixunsDetail$settin75.webssh)) { setRemote(true); setIsRadiuValue(3); } }; (0,react__WEBPACK_IMPORTED_MODULE_22__.useEffect)(function () { - var _Object$keys$filter, _shixunsDetail$settin75, _shixunsDetail$settin76, _shixunsDetail$settin77, _shixunsDetail$settin78, _shixunsDetail$settin79, _shixunsDetail$settin80, _shixunsDetail$settin81, _shixunsDetail$settin84, _shixunsDetail$settin85, _shixunsDetail$settin86; + var _Object$keys$filter, _shixunsDetail$settin77, _shixunsDetail$settin78, _shixunsDetail$settin79, _shixunsDetail$settin80, _shixunsDetail$settin81, _shixunsDetail$settin82, _shixunsDetail$settin83, _shixunsDetail$settin86, _shixunsDetail$settin87, _shixunsDetail$settin88; var confirmLeave = false; // console.log(Object.keys(diffObj).filter(item => shixunsDetail.setting?.shixun[item] != eval(diffObj[item]))) if (!!((_Object$keys$filter = Object.keys(diffObj).filter(function (item) { - var _shixunsDetail$settin74; - return ((_shixunsDetail$settin74 = shixunsDetail.setting) === null || _shixunsDetail$settin74 === void 0 ? void 0 : _shixunsDetail$settin74.shixun[item]) != eval(diffObj[item]); + var _shixunsDetail$settin76; + return ((_shixunsDetail$settin76 = shixunsDetail.setting) === null || _shixunsDetail$settin76 === void 0 ? void 0 : _shixunsDetail$settin76.shixun[item]) != eval(diffObj[item]); })) !== null && _Object$keys$filter !== void 0 && _Object$keys$filter.length)) { confirmLeave = true; } @@ -6925,36 +6936,36 @@ function Setting(_ref) { // serviceConfigList // selectDepartmentList, - if (isOpenTime != !!((_shixunsDetail$settin75 = shixunsDetail.setting) !== null && _shixunsDetail$settin75 !== void 0 && (_shixunsDetail$settin76 = _shixunsDetail$settin75.shixun) !== null && _shixunsDetail$settin76 !== void 0 && _shixunsDetail$settin76.opening_time)) { + if (isOpenTime != !!((_shixunsDetail$settin77 = shixunsDetail.setting) !== null && _shixunsDetail$settin77 !== void 0 && (_shixunsDetail$settin78 = _shixunsDetail$settin77.shixun) !== null && _shixunsDetail$settin78 !== void 0 && _shixunsDetail$settin78.opening_time)) { confirmLeave = true; } - if (disableDiscuss != !!((_shixunsDetail$settin77 = shixunsDetail.setting) !== null && _shixunsDetail$settin77 !== void 0 && (_shixunsDetail$settin78 = _shixunsDetail$settin77.shixun) !== null && _shixunsDetail$settin78 !== void 0 && _shixunsDetail$settin78.is_disable_discuss)) { + if (disableDiscuss != !!((_shixunsDetail$settin79 = shixunsDetail.setting) !== null && _shixunsDetail$settin79 !== void 0 && (_shixunsDetail$settin80 = _shixunsDetail$settin79.shixun) !== null && _shixunsDetail$settin80 !== void 0 && _shixunsDetail$settin80.is_disable_discuss)) { confirmLeave = true; } - if (selectDepartmentList.length != ((_shixunsDetail$settin79 = shixunsDetail.setting) === null || _shixunsDetail$settin79 === void 0 ? void 0 : (_shixunsDetail$settin80 = _shixunsDetail$settin79.shixun) === null || _shixunsDetail$settin80 === void 0 ? void 0 : (_shixunsDetail$settin81 = _shixunsDetail$settin80.scope_partment) === null || _shixunsDetail$settin81 === void 0 ? void 0 : _shixunsDetail$settin81.length)) { + if (selectDepartmentList.length != ((_shixunsDetail$settin81 = shixunsDetail.setting) === null || _shixunsDetail$settin81 === void 0 ? void 0 : (_shixunsDetail$settin82 = _shixunsDetail$settin81.shixun) === null || _shixunsDetail$settin82 === void 0 ? void 0 : (_shixunsDetail$settin83 = _shixunsDetail$settin82.scope_partment) === null || _shixunsDetail$settin83 === void 0 ? void 0 : _shixunsDetail$settin83.length)) { confirmLeave = true; } selectDepartmentList === null || selectDepartmentList === void 0 ? void 0 : selectDepartmentList.map(function (item, index) { - var _shixunsDetail$settin82, _shixunsDetail$settin83; - if (item != ((_shixunsDetail$settin82 = shixunsDetail.setting) === null || _shixunsDetail$settin82 === void 0 ? void 0 : (_shixunsDetail$settin83 = _shixunsDetail$settin82.shixun) === null || _shixunsDetail$settin83 === void 0 ? void 0 : _shixunsDetail$settin83.scope_partment[index])) { + var _shixunsDetail$settin84, _shixunsDetail$settin85; + if (item != ((_shixunsDetail$settin84 = shixunsDetail.setting) === null || _shixunsDetail$settin84 === void 0 ? void 0 : (_shixunsDetail$settin85 = _shixunsDetail$settin84.shixun) === null || _shixunsDetail$settin85 === void 0 ? void 0 : _shixunsDetail$settin85.scope_partment[index])) { confirmLeave = true; } }); - if (serviceConfigList.length != ((_shixunsDetail$settin84 = shixunsDetail.setting) === null || _shixunsDetail$settin84 === void 0 ? void 0 : (_shixunsDetail$settin85 = _shixunsDetail$settin84.shixun) === null || _shixunsDetail$settin85 === void 0 ? void 0 : (_shixunsDetail$settin86 = _shixunsDetail$settin85.shixun_service_configs) === null || _shixunsDetail$settin86 === void 0 ? void 0 : _shixunsDetail$settin86.length)) { + if (serviceConfigList.length != ((_shixunsDetail$settin86 = shixunsDetail.setting) === null || _shixunsDetail$settin86 === void 0 ? void 0 : (_shixunsDetail$settin87 = _shixunsDetail$settin86.shixun) === null || _shixunsDetail$settin87 === void 0 ? void 0 : (_shixunsDetail$settin88 = _shixunsDetail$settin87.shixun_service_configs) === null || _shixunsDetail$settin88 === void 0 ? void 0 : _shixunsDetail$settin88.length)) { confirmLeave = true; } serviceConfigList === null || serviceConfigList === void 0 ? void 0 : serviceConfigList.map(function (item, index) { - var _shixunsDetail$settin87, _shixunsDetail$settin88, _shixunsDetail$settin89, _shixunsDetail$settin90, _shixunsDetail$settin91, _shixunsDetail$settin92, _shixunsDetail$settin93, _shixunsDetail$settin94, _shixunsDetail$settin95, _shixunsDetail$settin96, _shixunsDetail$settin97, _shixunsDetail$settin98; - if ((item === null || item === void 0 ? void 0 : item.cpu_limit) != ((_shixunsDetail$settin87 = shixunsDetail.setting) === null || _shixunsDetail$settin87 === void 0 ? void 0 : (_shixunsDetail$settin88 = _shixunsDetail$settin87.shixun) === null || _shixunsDetail$settin88 === void 0 ? void 0 : (_shixunsDetail$settin89 = _shixunsDetail$settin88.shixun_service_configs[index]) === null || _shixunsDetail$settin89 === void 0 ? void 0 : _shixunsDetail$settin89.cpu_limit)) { + var _shixunsDetail$settin89, _shixunsDetail$settin90, _shixunsDetail$settin91, _shixunsDetail$settin92, _shixunsDetail$settin93, _shixunsDetail$settin94, _shixunsDetail$settin95, _shixunsDetail$settin96, _shixunsDetail$settin97, _shixunsDetail$settin98, _shixunsDetail$settin99, _shixunsDetail$settin100; + if ((item === null || item === void 0 ? void 0 : item.cpu_limit) != ((_shixunsDetail$settin89 = shixunsDetail.setting) === null || _shixunsDetail$settin89 === void 0 ? void 0 : (_shixunsDetail$settin90 = _shixunsDetail$settin89.shixun) === null || _shixunsDetail$settin90 === void 0 ? void 0 : (_shixunsDetail$settin91 = _shixunsDetail$settin90.shixun_service_configs[index]) === null || _shixunsDetail$settin91 === void 0 ? void 0 : _shixunsDetail$settin91.cpu_limit)) { confirmLeave = true; } - if ((item === null || item === void 0 ? void 0 : item.lower_cpu_limit) != ((_shixunsDetail$settin90 = shixunsDetail.setting) === null || _shixunsDetail$settin90 === void 0 ? void 0 : (_shixunsDetail$settin91 = _shixunsDetail$settin90.shixun) === null || _shixunsDetail$settin91 === void 0 ? void 0 : (_shixunsDetail$settin92 = _shixunsDetail$settin91.shixun_service_configs[index]) === null || _shixunsDetail$settin92 === void 0 ? void 0 : _shixunsDetail$settin92.lower_cpu_limit)) { + if ((item === null || item === void 0 ? void 0 : item.lower_cpu_limit) != ((_shixunsDetail$settin92 = shixunsDetail.setting) === null || _shixunsDetail$settin92 === void 0 ? void 0 : (_shixunsDetail$settin93 = _shixunsDetail$settin92.shixun) === null || _shixunsDetail$settin93 === void 0 ? void 0 : (_shixunsDetail$settin94 = _shixunsDetail$settin93.shixun_service_configs[index]) === null || _shixunsDetail$settin94 === void 0 ? void 0 : _shixunsDetail$settin94.lower_cpu_limit)) { confirmLeave = true; } - if ((item === null || item === void 0 ? void 0 : item.memory_limit) != ((_shixunsDetail$settin93 = shixunsDetail.setting) === null || _shixunsDetail$settin93 === void 0 ? void 0 : (_shixunsDetail$settin94 = _shixunsDetail$settin93.shixun) === null || _shixunsDetail$settin94 === void 0 ? void 0 : (_shixunsDetail$settin95 = _shixunsDetail$settin94.shixun_service_configs[index]) === null || _shixunsDetail$settin95 === void 0 ? void 0 : _shixunsDetail$settin95.memory_limit)) { + if ((item === null || item === void 0 ? void 0 : item.memory_limit) != ((_shixunsDetail$settin95 = shixunsDetail.setting) === null || _shixunsDetail$settin95 === void 0 ? void 0 : (_shixunsDetail$settin96 = _shixunsDetail$settin95.shixun) === null || _shixunsDetail$settin96 === void 0 ? void 0 : (_shixunsDetail$settin97 = _shixunsDetail$settin96.shixun_service_configs[index]) === null || _shixunsDetail$settin97 === void 0 ? void 0 : _shixunsDetail$settin97.memory_limit)) { confirmLeave = true; } - if ((item === null || item === void 0 ? void 0 : item.request_limit) != ((_shixunsDetail$settin96 = shixunsDetail.setting) === null || _shixunsDetail$settin96 === void 0 ? void 0 : (_shixunsDetail$settin97 = _shixunsDetail$settin96.shixun) === null || _shixunsDetail$settin97 === void 0 ? void 0 : (_shixunsDetail$settin98 = _shixunsDetail$settin97.shixun_service_configs[index]) === null || _shixunsDetail$settin98 === void 0 ? void 0 : _shixunsDetail$settin98.request_limit)) { + if ((item === null || item === void 0 ? void 0 : item.request_limit) != ((_shixunsDetail$settin98 = shixunsDetail.setting) === null || _shixunsDetail$settin98 === void 0 ? void 0 : (_shixunsDetail$settin99 = _shixunsDetail$settin98.shixun) === null || _shixunsDetail$settin99 === void 0 ? void 0 : (_shixunsDetail$settin100 = _shixunsDetail$settin99.shixun_service_configs[index]) === null || _shixunsDetail$settin100 === void 0 ? void 0 : _shixunsDetail$settin100.request_limit)) { confirmLeave = true; } }); @@ -7060,7 +7071,8 @@ function Setting(_ref) { close_internet: close_internet }, shixun_info: { - evaluate_script: is_jupyter ? null : evaluateScript + evaluate_script: is_jupyter ? null : evaluateScript, + ai_reply: disableAI }, shixun_service_configs: serviceConfigList.map(function (item) { return { @@ -7432,7 +7444,7 @@ function Setting(_ref) { })] }) })] - }), !((((_shixunsDetail$detail4 = shixunsDetail.detail) === null || _shixunsDetail$detail4 === void 0 ? void 0 : _shixunsDetail$detail4.shixun_status) > 1 || ((_shixunsDetail$detail5 = shixunsDetail.detail) === null || _shixunsDetail$detail5 === void 0 ? void 0 : _shixunsDetail$detail5["public"]) === 2) && ((_shixunsDetail$settin99 = shixunsDetail.setting) === null || _shixunsDetail$settin99 === void 0 ? void 0 : (_shixunsDetail$settin100 = _shixunsDetail$settin99.shixun) === null || _shixunsDetail$settin100 === void 0 ? void 0 : _shixunsDetail$settin100.use_scope) === 0 && ((_shixunsDetail$detail6 = shixunsDetail.detail) === null || _shixunsDetail$detail6 === void 0 ? void 0 : _shixunsDetail$detail6.identity) > 2) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsxs)("div", { + }), !((((_shixunsDetail$detail4 = shixunsDetail.detail) === null || _shixunsDetail$detail4 === void 0 ? void 0 : _shixunsDetail$detail4.shixun_status) > 1 || ((_shixunsDetail$detail5 = shixunsDetail.detail) === null || _shixunsDetail$detail5 === void 0 ? void 0 : _shixunsDetail$detail5["public"]) === 2) && ((_shixunsDetail$settin101 = shixunsDetail.setting) === null || _shixunsDetail$settin101 === void 0 ? void 0 : (_shixunsDetail$settin102 = _shixunsDetail$settin101.shixun) === null || _shixunsDetail$settin102 === void 0 ? void 0 : _shixunsDetail$settin102.use_scope) === 0 && ((_shixunsDetail$detail6 = shixunsDetail.detail) === null || _shixunsDetail$detail6 === void 0 ? void 0 : _shixunsDetail$detail6.identity) > 2) && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsxs)("div", { className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].labelWrap */ .Z.labelWrap, children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)("label", { className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].label */ .Z.label, @@ -7684,17 +7696,17 @@ function Setting(_ref) { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsxs)(antd_es_radio__WEBPACK_IMPORTED_MODULE_41__/* ["default"].Group */ .ZP.Group, { value: isRadiuvalue, onChange: function onChange(e) { - var _shixunsDetail$settin101, _shixunsDetail$settin102, _shixunsDetail$settin103, _shixunsDetail$settin104, _shixunsDetail$settin107, _shixunsDetail$settin108, _shixunsDetail$settin109, _shixunsDetail$settin110, _shixunsDetail$settin111, _shixunsDetail$settin112; + var _shixunsDetail$settin103, _shixunsDetail$settin104, _shixunsDetail$settin105, _shixunsDetail$settin106, _shixunsDetail$settin109, _shixunsDetail$settin110, _shixunsDetail$settin111, _shixunsDetail$settin112, _shixunsDetail$settin113, _shixunsDetail$settin114; setIsRadiuValue(e.target.value); setSshRadioValue(1); setport(false); - if (e.target.value === 3 && ((_shixunsDetail$settin101 = shixunsDetail.setting) === null || _shixunsDetail$settin101 === void 0 ? void 0 : (_shixunsDetail$settin102 = _shixunsDetail$settin101.shixun) === null || _shixunsDetail$settin102 === void 0 ? void 0 : _shixunsDetail$settin102.webssh) === 2 && !((_shixunsDetail$settin103 = shixunsDetail.setting) !== null && _shixunsDetail$settin103 !== void 0 && (_shixunsDetail$settin104 = _shixunsDetail$settin103.shixun) !== null && _shixunsDetail$settin104 !== void 0 && _shixunsDetail$settin104.vnc)) { - var _shixunsDetail$settin105, _shixunsDetail$settin106; - setport((_shixunsDetail$settin105 = shixunsDetail.setting) === null || _shixunsDetail$settin105 === void 0 ? void 0 : (_shixunsDetail$settin106 = _shixunsDetail$settin105.shixun) === null || _shixunsDetail$settin106 === void 0 ? void 0 : _shixunsDetail$settin106.port_mapping); + if (e.target.value === 3 && ((_shixunsDetail$settin103 = shixunsDetail.setting) === null || _shixunsDetail$settin103 === void 0 ? void 0 : (_shixunsDetail$settin104 = _shixunsDetail$settin103.shixun) === null || _shixunsDetail$settin104 === void 0 ? void 0 : _shixunsDetail$settin104.webssh) === 2 && !((_shixunsDetail$settin105 = shixunsDetail.setting) !== null && _shixunsDetail$settin105 !== void 0 && (_shixunsDetail$settin106 = _shixunsDetail$settin105.shixun) !== null && _shixunsDetail$settin106 !== void 0 && _shixunsDetail$settin106.vnc)) { + var _shixunsDetail$settin107, _shixunsDetail$settin108; + setport((_shixunsDetail$settin107 = shixunsDetail.setting) === null || _shixunsDetail$settin107 === void 0 ? void 0 : (_shixunsDetail$settin108 = _shixunsDetail$settin107.shixun) === null || _shixunsDetail$settin108 === void 0 ? void 0 : _shixunsDetail$settin108.port_mapping); } - if (e.target.value === 5 && !((_shixunsDetail$settin107 = shixunsDetail.setting) !== null && _shixunsDetail$settin107 !== void 0 && (_shixunsDetail$settin108 = _shixunsDetail$settin107.shixun) !== null && _shixunsDetail$settin108 !== void 0 && _shixunsDetail$settin108.linux_vnc) && !((_shixunsDetail$settin109 = shixunsDetail.setting) !== null && _shixunsDetail$settin109 !== void 0 && (_shixunsDetail$settin110 = _shixunsDetail$settin109.shixun) !== null && _shixunsDetail$settin110 !== void 0 && _shixunsDetail$settin110.windows_vnc) && (_shixunsDetail$settin111 = shixunsDetail.setting) !== null && _shixunsDetail$settin111 !== void 0 && (_shixunsDetail$settin112 = _shixunsDetail$settin111.shixun) !== null && _shixunsDetail$settin112 !== void 0 && _shixunsDetail$settin112.vnc) { - var _shixunsDetail$settin113, _shixunsDetail$settin114; - setport((_shixunsDetail$settin113 = shixunsDetail.setting) === null || _shixunsDetail$settin113 === void 0 ? void 0 : (_shixunsDetail$settin114 = _shixunsDetail$settin113.shixun) === null || _shixunsDetail$settin114 === void 0 ? void 0 : _shixunsDetail$settin114.port_mapping); + if (e.target.value === 5 && !((_shixunsDetail$settin109 = shixunsDetail.setting) !== null && _shixunsDetail$settin109 !== void 0 && (_shixunsDetail$settin110 = _shixunsDetail$settin109.shixun) !== null && _shixunsDetail$settin110 !== void 0 && _shixunsDetail$settin110.linux_vnc) && !((_shixunsDetail$settin111 = shixunsDetail.setting) !== null && _shixunsDetail$settin111 !== void 0 && (_shixunsDetail$settin112 = _shixunsDetail$settin111.shixun) !== null && _shixunsDetail$settin112 !== void 0 && _shixunsDetail$settin112.windows_vnc) && (_shixunsDetail$settin113 = shixunsDetail.setting) !== null && _shixunsDetail$settin113 !== void 0 && (_shixunsDetail$settin114 = _shixunsDetail$settin113.shixun) !== null && _shixunsDetail$settin114 !== void 0 && _shixunsDetail$settin114.vnc) { + var _shixunsDetail$settin115, _shixunsDetail$settin116; + setport((_shixunsDetail$settin115 = shixunsDetail.setting) === null || _shixunsDetail$settin115 === void 0 ? void 0 : (_shixunsDetail$settin116 = _shixunsDetail$settin115.shixun) === null || _shixunsDetail$settin116 === void 0 ? void 0 : _shixunsDetail$settin116.port_mapping); } if (e.target.value === 1) { setVNC(false); @@ -7756,15 +7768,15 @@ function Setting(_ref) { value: sshRadioValue, disabled: !editable, onChange: function onChange(e) { - var _shixunsDetail$settin115, _shixunsDetail$settin116, _shixunsDetail$settin119, _shixunsDetail$settin120, _shixunsDetail$settin123, _shixunsDetail$settin124; + var _shixunsDetail$settin117, _shixunsDetail$settin118, _shixunsDetail$settin121, _shixunsDetail$settin122, _shixunsDetail$settin125, _shixunsDetail$settin126; var value = e.target.value; setport(false); - if (value === 1 && ((_shixunsDetail$settin115 = shixunsDetail.setting) === null || _shixunsDetail$settin115 === void 0 ? void 0 : (_shixunsDetail$settin116 = _shixunsDetail$settin115.shixun) === null || _shixunsDetail$settin116 === void 0 ? void 0 : _shixunsDetail$settin116.webssh) === 1) { - var _shixunsDetail$settin117, _shixunsDetail$settin118; - setport((_shixunsDetail$settin117 = shixunsDetail.setting) === null || _shixunsDetail$settin117 === void 0 ? void 0 : (_shixunsDetail$settin118 = _shixunsDetail$settin117.shixun) === null || _shixunsDetail$settin118 === void 0 ? void 0 : _shixunsDetail$settin118.port_mapping); - } else if (value === 2 && ((_shixunsDetail$settin119 = shixunsDetail.setting) === null || _shixunsDetail$settin119 === void 0 ? void 0 : (_shixunsDetail$settin120 = _shixunsDetail$settin119.shixun) === null || _shixunsDetail$settin120 === void 0 ? void 0 : _shixunsDetail$settin120.webssh) === 2) { - var _shixunsDetail$settin121, _shixunsDetail$settin122; - setport((_shixunsDetail$settin121 = shixunsDetail.setting) === null || _shixunsDetail$settin121 === void 0 ? void 0 : (_shixunsDetail$settin122 = _shixunsDetail$settin121.shixun) === null || _shixunsDetail$settin122 === void 0 ? void 0 : _shixunsDetail$settin122.port_mapping); + if (value === 1 && ((_shixunsDetail$settin117 = shixunsDetail.setting) === null || _shixunsDetail$settin117 === void 0 ? void 0 : (_shixunsDetail$settin118 = _shixunsDetail$settin117.shixun) === null || _shixunsDetail$settin118 === void 0 ? void 0 : _shixunsDetail$settin118.webssh) === 1) { + var _shixunsDetail$settin119, _shixunsDetail$settin120; + setport((_shixunsDetail$settin119 = shixunsDetail.setting) === null || _shixunsDetail$settin119 === void 0 ? void 0 : (_shixunsDetail$settin120 = _shixunsDetail$settin119.shixun) === null || _shixunsDetail$settin120 === void 0 ? void 0 : _shixunsDetail$settin120.port_mapping); + } else if (value === 2 && ((_shixunsDetail$settin121 = shixunsDetail.setting) === null || _shixunsDetail$settin121 === void 0 ? void 0 : (_shixunsDetail$settin122 = _shixunsDetail$settin121.shixun) === null || _shixunsDetail$settin122 === void 0 ? void 0 : _shixunsDetail$settin122.webssh) === 2) { + var _shixunsDetail$settin123, _shixunsDetail$settin124; + setport((_shixunsDetail$settin123 = shixunsDetail.setting) === null || _shixunsDetail$settin123 === void 0 ? void 0 : (_shixunsDetail$settin124 = _shixunsDetail$settin123.shixun) === null || _shixunsDetail$settin124 === void 0 ? void 0 : _shixunsDetail$settin124.port_mapping); } setSshRadioValue(value); if (value !== 1) { @@ -7772,10 +7784,10 @@ function Setting(_ref) { } setWindowVNCTemplate(''); setWebsshCloud(1); - if (value === 3 && ((_shixunsDetail$settin123 = shixunsDetail.setting) === null || _shixunsDetail$settin123 === void 0 ? void 0 : (_shixunsDetail$settin124 = _shixunsDetail$settin123.shixun) === null || _shixunsDetail$settin124 === void 0 ? void 0 : _shixunsDetail$settin124.webssh) === 3) { - var _shixunsDetail$settin125, _shixunsDetail$settin126, _shixunsDetail$settin127, _shixunsDetail$settin128; - setWebsshCloud((_shixunsDetail$settin125 = shixunsDetail.setting) === null || _shixunsDetail$settin125 === void 0 ? void 0 : (_shixunsDetail$settin126 = _shixunsDetail$settin125.shixun) === null || _shixunsDetail$settin126 === void 0 ? void 0 : _shixunsDetail$settin126.webssh_cloud); - setWindowVNCTemplate((_shixunsDetail$settin127 = shixunsDetail.setting) === null || _shixunsDetail$settin127 === void 0 ? void 0 : (_shixunsDetail$settin128 = _shixunsDetail$settin127.shixun) === null || _shixunsDetail$settin128 === void 0 ? void 0 : _shixunsDetail$settin128.windows_start_template); + if (value === 3 && ((_shixunsDetail$settin125 = shixunsDetail.setting) === null || _shixunsDetail$settin125 === void 0 ? void 0 : (_shixunsDetail$settin126 = _shixunsDetail$settin125.shixun) === null || _shixunsDetail$settin126 === void 0 ? void 0 : _shixunsDetail$settin126.webssh) === 3) { + var _shixunsDetail$settin127, _shixunsDetail$settin128, _shixunsDetail$settin129, _shixunsDetail$settin130; + setWebsshCloud((_shixunsDetail$settin127 = shixunsDetail.setting) === null || _shixunsDetail$settin127 === void 0 ? void 0 : (_shixunsDetail$settin128 = _shixunsDetail$settin127.shixun) === null || _shixunsDetail$settin128 === void 0 ? void 0 : _shixunsDetail$settin128.webssh_cloud); + setWindowVNCTemplate((_shixunsDetail$settin129 = shixunsDetail.setting) === null || _shixunsDetail$settin129 === void 0 ? void 0 : (_shixunsDetail$settin130 = _shixunsDetail$settin129.shixun) === null || _shixunsDetail$settin130 === void 0 ? void 0 : _shixunsDetail$settin130.windows_start_template); } }, children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsxs)(antd_es_radio__WEBPACK_IMPORTED_MODULE_41__/* ["default"] */ .ZP, { @@ -7984,22 +7996,22 @@ function Setting(_ref) { value: linux_vnc ? 'linux_vnc' : windows_vnc ? 'windows_vnc' : virtual_machine ? 'virtual_machine' : 'linux', disabled: !editable, onChange: function onChange(e) { - var _shixunsDetail$settin129, _shixunsDetail$settin130, _shixunsDetail$settin133, _shixunsDetail$settin134, _shixunsDetail$settin137, _shixunsDetail$settin138, _shixunsDetail$settin147, _shixunsDetail$settin148, _shixunsDetail$settin149; + var _shixunsDetail$settin131, _shixunsDetail$settin132, _shixunsDetail$settin135, _shixunsDetail$settin136, _shixunsDetail$settin139, _shixunsDetail$settin140, _shixunsDetail$settin149, _shixunsDetail$settin150, _shixunsDetail$settin151; var value = e.target.value; setWindowVNCTemplate(''); setport(false); - if (value === 'linux_vnc' && (_shixunsDetail$settin129 = shixunsDetail.setting) !== null && _shixunsDetail$settin129 !== void 0 && (_shixunsDetail$settin130 = _shixunsDetail$settin129.shixun) !== null && _shixunsDetail$settin130 !== void 0 && _shixunsDetail$settin130.linux_vnc) { - var _shixunsDetail$settin131, _shixunsDetail$settin132; - setWindowVNCTemplate((_shixunsDetail$settin131 = shixunsDetail.setting) === null || _shixunsDetail$settin131 === void 0 ? void 0 : (_shixunsDetail$settin132 = _shixunsDetail$settin131.shixun) === null || _shixunsDetail$settin132 === void 0 ? void 0 : _shixunsDetail$settin132.windows_start_template); - } else if (value === 'windows_vnc' && (_shixunsDetail$settin133 = shixunsDetail.setting) !== null && _shixunsDetail$settin133 !== void 0 && (_shixunsDetail$settin134 = _shixunsDetail$settin133.shixun) !== null && _shixunsDetail$settin134 !== void 0 && _shixunsDetail$settin134.windows_vnc) { - var _shixunsDetail$settin135, _shixunsDetail$settin136; - setWindowVNCTemplate((_shixunsDetail$settin135 = shixunsDetail.setting) === null || _shixunsDetail$settin135 === void 0 ? void 0 : (_shixunsDetail$settin136 = _shixunsDetail$settin135.shixun) === null || _shixunsDetail$settin136 === void 0 ? void 0 : _shixunsDetail$settin136.windows_start_template); - } else if (value === 'virtual_machine' && (_shixunsDetail$settin137 = shixunsDetail.setting) !== null && _shixunsDetail$settin137 !== void 0 && (_shixunsDetail$settin138 = _shixunsDetail$settin137.shixun) !== null && _shixunsDetail$settin138 !== void 0 && _shixunsDetail$settin138.virtual_machine) { - var _shixunsDetail$settin139, _shixunsDetail$settin140; - setWindowVNCTemplate((_shixunsDetail$settin139 = shixunsDetail.setting) === null || _shixunsDetail$settin139 === void 0 ? void 0 : (_shixunsDetail$settin140 = _shixunsDetail$settin139.shixun) === null || _shixunsDetail$settin140 === void 0 ? void 0 : _shixunsDetail$settin140.windows_start_template); + if (value === 'linux_vnc' && (_shixunsDetail$settin131 = shixunsDetail.setting) !== null && _shixunsDetail$settin131 !== void 0 && (_shixunsDetail$settin132 = _shixunsDetail$settin131.shixun) !== null && _shixunsDetail$settin132 !== void 0 && _shixunsDetail$settin132.linux_vnc) { + var _shixunsDetail$settin133, _shixunsDetail$settin134; + setWindowVNCTemplate((_shixunsDetail$settin133 = shixunsDetail.setting) === null || _shixunsDetail$settin133 === void 0 ? void 0 : (_shixunsDetail$settin134 = _shixunsDetail$settin133.shixun) === null || _shixunsDetail$settin134 === void 0 ? void 0 : _shixunsDetail$settin134.windows_start_template); + } else if (value === 'windows_vnc' && (_shixunsDetail$settin135 = shixunsDetail.setting) !== null && _shixunsDetail$settin135 !== void 0 && (_shixunsDetail$settin136 = _shixunsDetail$settin135.shixun) !== null && _shixunsDetail$settin136 !== void 0 && _shixunsDetail$settin136.windows_vnc) { + var _shixunsDetail$settin137, _shixunsDetail$settin138; + setWindowVNCTemplate((_shixunsDetail$settin137 = shixunsDetail.setting) === null || _shixunsDetail$settin137 === void 0 ? void 0 : (_shixunsDetail$settin138 = _shixunsDetail$settin137.shixun) === null || _shixunsDetail$settin138 === void 0 ? void 0 : _shixunsDetail$settin138.windows_start_template); + } else if (value === 'virtual_machine' && (_shixunsDetail$settin139 = shixunsDetail.setting) !== null && _shixunsDetail$settin139 !== void 0 && (_shixunsDetail$settin140 = _shixunsDetail$settin139.shixun) !== null && _shixunsDetail$settin140 !== void 0 && _shixunsDetail$settin140.virtual_machine) { + var _shixunsDetail$settin141, _shixunsDetail$settin142; + setWindowVNCTemplate((_shixunsDetail$settin141 = shixunsDetail.setting) === null || _shixunsDetail$settin141 === void 0 ? void 0 : (_shixunsDetail$settin142 = _shixunsDetail$settin141.shixun) === null || _shixunsDetail$settin142 === void 0 ? void 0 : _shixunsDetail$settin142.windows_start_template); } else { - var _shixunsDetail$settin141, _shixunsDetail$settin142, _shixunsDetail$settin143, _shixunsDetail$settin144, _shixunsDetail$settin145, _shixunsDetail$settin146; - if (value === 'linux' && !((_shixunsDetail$settin141 = shixunsDetail.setting) !== null && _shixunsDetail$settin141 !== void 0 && (_shixunsDetail$settin142 = _shixunsDetail$settin141.shixun) !== null && _shixunsDetail$settin142 !== void 0 && _shixunsDetail$settin142.linux_vnc) && !((_shixunsDetail$settin143 = shixunsDetail.setting) !== null && _shixunsDetail$settin143 !== void 0 && (_shixunsDetail$settin144 = _shixunsDetail$settin143.shixun) !== null && _shixunsDetail$settin144 !== void 0 && _shixunsDetail$settin144.windows_vnc)) setport((_shixunsDetail$settin145 = shixunsDetail.setting) === null || _shixunsDetail$settin145 === void 0 ? void 0 : (_shixunsDetail$settin146 = _shixunsDetail$settin145.shixun) === null || _shixunsDetail$settin146 === void 0 ? void 0 : _shixunsDetail$settin146.port_mapping); + var _shixunsDetail$settin143, _shixunsDetail$settin144, _shixunsDetail$settin145, _shixunsDetail$settin146, _shixunsDetail$settin147, _shixunsDetail$settin148; + if (value === 'linux' && !((_shixunsDetail$settin143 = shixunsDetail.setting) !== null && _shixunsDetail$settin143 !== void 0 && (_shixunsDetail$settin144 = _shixunsDetail$settin143.shixun) !== null && _shixunsDetail$settin144 !== void 0 && _shixunsDetail$settin144.linux_vnc) && !((_shixunsDetail$settin145 = shixunsDetail.setting) !== null && _shixunsDetail$settin145 !== void 0 && (_shixunsDetail$settin146 = _shixunsDetail$settin145.shixun) !== null && _shixunsDetail$settin146 !== void 0 && _shixunsDetail$settin146.windows_vnc)) setport((_shixunsDetail$settin147 = shixunsDetail.setting) === null || _shixunsDetail$settin147 === void 0 ? void 0 : (_shixunsDetail$settin148 = _shixunsDetail$settin147.shixun) === null || _shixunsDetail$settin148 === void 0 ? void 0 : _shixunsDetail$settin148.port_mapping); } switch (value) { case 'linux_vnc': @@ -8037,9 +8049,9 @@ function Setting(_ref) { setWebsshShow(false); setVNC(false); setVirtualMachine(true); - if ((shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin147 = shixunsDetail.setting) === null || _shixunsDetail$settin147 === void 0 ? void 0 : (_shixunsDetail$settin148 = _shixunsDetail$settin147.shixun) === null || _shixunsDetail$settin148 === void 0 ? void 0 : (_shixunsDetail$settin149 = _shixunsDetail$settin148.shixun_virtual_templates) === null || _shixunsDetail$settin149 === void 0 ? void 0 : _shixunsDetail$settin149.length) > 0) { - var _shixunsDetail$settin150, _shixunsDetail$settin151; - setshixun_virtual_templates(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_16___default()(shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin150 = shixunsDetail.setting) === null || _shixunsDetail$settin150 === void 0 ? void 0 : (_shixunsDetail$settin151 = _shixunsDetail$settin150.shixun) === null || _shixunsDetail$settin151 === void 0 ? void 0 : _shixunsDetail$settin151.shixun_virtual_templates)); + if ((shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin149 = shixunsDetail.setting) === null || _shixunsDetail$settin149 === void 0 ? void 0 : (_shixunsDetail$settin150 = _shixunsDetail$settin149.shixun) === null || _shixunsDetail$settin150 === void 0 ? void 0 : (_shixunsDetail$settin151 = _shixunsDetail$settin150.shixun_virtual_templates) === null || _shixunsDetail$settin151 === void 0 ? void 0 : _shixunsDetail$settin151.length) > 0) { + var _shixunsDetail$settin152, _shixunsDetail$settin153; + setshixun_virtual_templates(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_16___default()(shixunsDetail === null || shixunsDetail === void 0 ? void 0 : (_shixunsDetail$settin152 = shixunsDetail.setting) === null || _shixunsDetail$settin152 === void 0 ? void 0 : (_shixunsDetail$settin153 = _shixunsDetail$settin152.shixun) === null || _shixunsDetail$settin153 === void 0 ? void 0 : _shixunsDetail$settin153.shixun_virtual_templates)); } else { setshixun_virtual_templates([{ template_name: '', @@ -8463,7 +8475,7 @@ function Setting(_ref) { width: '200px' }, value: evaluationScript, - disabled: ((_shixunsDetail$settin152 = shixunsDetail.setting) === null || _shixunsDetail$settin152 === void 0 ? void 0 : (_shixunsDetail$settin153 = _shixunsDetail$settin152.shixun) === null || _shixunsDetail$settin153 === void 0 ? void 0 : _shixunsDetail$settin153.status) === 2 ? true : !editable, + disabled: ((_shixunsDetail$settin154 = shixunsDetail.setting) === null || _shixunsDetail$settin154 === void 0 ? void 0 : (_shixunsDetail$settin155 = _shixunsDetail$settin154.shixun) === null || _shixunsDetail$settin155 === void 0 ? void 0 : _shixunsDetail$settin155.status) === 2 ? true : !editable, placeholder: "\u8BF7\u9009\u62E9\u8BC4\u6D4B\u811A\u672C", onChange: function onChange(e) { handleChangeEvaluationScript(e); @@ -8513,7 +8525,7 @@ function Setting(_ref) { theme: "vs-light", value: evaluateScript, options: { - readOnly: ((_shixunsDetail$settin154 = shixunsDetail.setting) === null || _shixunsDetail$settin154 === void 0 ? void 0 : (_shixunsDetail$settin155 = _shixunsDetail$settin154.shixun) === null || _shixunsDetail$settin155 === void 0 ? void 0 : _shixunsDetail$settin155.status) === 2 ? true : !editable + readOnly: ((_shixunsDetail$settin156 = shixunsDetail.setting) === null || _shixunsDetail$settin156 === void 0 ? void 0 : (_shixunsDetail$settin157 = _shixunsDetail$settin156.shixun) === null || _shixunsDetail$settin157 === void 0 ? void 0 : _shixunsDetail$settin157.status) === 2 ? true : !editable }, onChange: function onChange(value) { return setEvaluateScript(value); @@ -8525,7 +8537,7 @@ function Setting(_ref) { className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].serviceSettingName */ .Z.serviceSettingName, children: "\u670D\u52A1\u914D\u7F6E" }), serviceConfigList === null || serviceConfigList === void 0 ? void 0 : serviceConfigList.map(function (item, index) { - var _shixunsDetail$settin156, _shixunsDetail$settin157, _shixunsDetail$settin158, _shixunsDetail$settin159, _shixunsDetail$settin160, _shixunsDetail$settin161, _shixunsDetail$settin162, _shixunsDetail$settin163; + var _shixunsDetail$settin158, _shixunsDetail$settin159, _shixunsDetail$settin160, _shixunsDetail$settin161, _shixunsDetail$settin162, _shixunsDetail$settin163, _shixunsDetail$settin164, _shixunsDetail$settin165; return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsxs)("div", { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)("div", { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)("span", { @@ -8540,7 +8552,7 @@ function Setting(_ref) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)(antd_es_input__WEBPACK_IMPORTED_MODULE_47__/* ["default"] */ .Z, { className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].serviceSetInput */ .Z.serviceSetInput, value: item.cpu_limit, - disabled: ((_shixunsDetail$settin156 = shixunsDetail.setting) === null || _shixunsDetail$settin156 === void 0 ? void 0 : (_shixunsDetail$settin157 = _shixunsDetail$settin156.shixun) === null || _shixunsDetail$settin157 === void 0 ? void 0 : _shixunsDetail$settin157.status) === 2 ? true : !editable, + disabled: ((_shixunsDetail$settin158 = shixunsDetail.setting) === null || _shixunsDetail$settin158 === void 0 ? void 0 : (_shixunsDetail$settin159 = _shixunsDetail$settin158.shixun) === null || _shixunsDetail$settin159 === void 0 ? void 0 : _shixunsDetail$settin159.status) === 2 ? true : !editable, onChange: function onChange(e) { return handleChangeSeviceConfig(e.target.value, 'cpu_limit', index); } @@ -8553,7 +8565,7 @@ function Setting(_ref) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)(antd_es_input__WEBPACK_IMPORTED_MODULE_47__/* ["default"] */ .Z, { className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].serviceSetInput */ .Z.serviceSetInput, value: item.lower_cpu_limit, - disabled: ((_shixunsDetail$settin158 = shixunsDetail.setting) === null || _shixunsDetail$settin158 === void 0 ? void 0 : (_shixunsDetail$settin159 = _shixunsDetail$settin158.shixun) === null || _shixunsDetail$settin159 === void 0 ? void 0 : _shixunsDetail$settin159.status) === 2 ? true : !editable, + disabled: ((_shixunsDetail$settin160 = shixunsDetail.setting) === null || _shixunsDetail$settin160 === void 0 ? void 0 : (_shixunsDetail$settin161 = _shixunsDetail$settin160.shixun) === null || _shixunsDetail$settin161 === void 0 ? void 0 : _shixunsDetail$settin161.status) === 2 ? true : !editable, onChange: function onChange(e) { return handleChangeSeviceConfig(e.target.value, 'lower_cpu_limit', index); } @@ -8566,7 +8578,7 @@ function Setting(_ref) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)(antd_es_input__WEBPACK_IMPORTED_MODULE_47__/* ["default"] */ .Z, { className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].serviceSetInput */ .Z.serviceSetInput, value: item.memory_limit, - disabled: ((_shixunsDetail$settin160 = shixunsDetail.setting) === null || _shixunsDetail$settin160 === void 0 ? void 0 : (_shixunsDetail$settin161 = _shixunsDetail$settin160.shixun) === null || _shixunsDetail$settin161 === void 0 ? void 0 : _shixunsDetail$settin161.status) === 2 ? true : !editable, + disabled: ((_shixunsDetail$settin162 = shixunsDetail.setting) === null || _shixunsDetail$settin162 === void 0 ? void 0 : (_shixunsDetail$settin163 = _shixunsDetail$settin162.shixun) === null || _shixunsDetail$settin163 === void 0 ? void 0 : _shixunsDetail$settin163.status) === 2 ? true : !editable, onChange: function onChange(e) { return handleChangeSeviceConfig(e.target.value, 'memory_limit', index); } @@ -8579,7 +8591,7 @@ function Setting(_ref) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)(antd_es_input__WEBPACK_IMPORTED_MODULE_47__/* ["default"] */ .Z, { className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].serviceSetMemoryInput */ .Z.serviceSetMemoryInput, value: item.request_limit, - disabled: ((_shixunsDetail$settin162 = shixunsDetail.setting) === null || _shixunsDetail$settin162 === void 0 ? void 0 : (_shixunsDetail$settin163 = _shixunsDetail$settin162.shixun) === null || _shixunsDetail$settin163 === void 0 ? void 0 : _shixunsDetail$settin163.status) === 2 ? true : !editable, + disabled: ((_shixunsDetail$settin164 = shixunsDetail.setting) === null || _shixunsDetail$settin164 === void 0 ? void 0 : (_shixunsDetail$settin165 = _shixunsDetail$settin164.shixun) === null || _shixunsDetail$settin165 === void 0 ? void 0 : _shixunsDetail$settin165.status) === 2 ? true : !editable, onChange: function onChange(e) { return handleChangeSeviceConfig(e.target.value, 'request_limit', index); } @@ -8616,6 +8628,28 @@ function Setting(_ref) { })] }) })] + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsxs)("div", { + style: { + display: "flex", + flexDirection: "row" + }, + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)("label", { + className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].label */ .Z.label, + children: "GPT\u95EE\u7B54\uFF1A" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)("div", { + className: _index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].labelContent */ .Z.labelContent, + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsxs)("div", { + children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)(antd_es_switch__WEBPACK_IMPORTED_MODULE_56__/* ["default"] */ .Z, { + checked: disableAI, + onChange: function onChange(e) { + setdisableAI(e); + } + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsx)("span", { + className: "".concat(_index_less_modules__WEBPACK_IMPORTED_MODULE_24__/* ["default"].color999 */ .Z.color999, " ml10"), + children: "\uFF08\u5F00\u542F\u540E\uFF0C\u5B66\u751F\u7684\u8BC4\u8BBA\u5C06\u7531\u667A\u80FD\u673A\u5668\u4EBA\u8FDB\u884C\u56DE\u7B54\uFF09" + })] + }) + })] })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_34__.jsxs)("div", { style: { @@ -11463,7 +11497,7 @@ var CreateEnvironment = __webpack_require__(88654); var Option = es_select/* default.Option */.Z.Option; var Environment = function Environment(_ref) { - var _shixunsDetail$detail, _shixunsDetail$detail2; + var _shixunsDetail$detail, _shixunsDetail$detail2, _shixunsDetail$detail3; var practiceSetting = _ref.practiceSetting, dispatch = _ref.dispatch, shixunsDetail = _ref.shixunsDetail, @@ -11872,7 +11906,8 @@ var Environment = function Environment(_ref) { tags: frequence_image, onChange: function onChange(id) { return setActiveId(id); - } + }, + shixun_type: ((_shixunsDetail$detail = shixunsDetail.detail) === null || _shixunsDetail$detail === void 0 ? void 0 : _shixunsDetail$detail.is_jupyter_lab) && "jupyterlab" }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: Environmentmodules.right, children: [/*#__PURE__*/(0,jsx_runtime.jsx)("header", { @@ -11928,7 +11963,7 @@ var Environment = function Environment(_ref) { }, er.id) : null; }) })] - }), !(shixunsDetail !== null && shixunsDetail !== void 0 && (_shixunsDetail$detail = shixunsDetail.detail) !== null && _shixunsDetail$detail !== void 0 && _shixunsDetail$detail.is_jupyter_lab) && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { + }), !(shixunsDetail !== null && shixunsDetail !== void 0 && (_shixunsDetail$detail2 = shixunsDetail.detail) !== null && _shixunsDetail$detail2 !== void 0 && _shixunsDetail$detail2.is_jupyter_lab) && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: Environmentmodules.title, children: "\u8BC4\u6D4B\u811A\u672C" @@ -12012,7 +12047,7 @@ var Environment = function Environment(_ref) { } })] })] - }), ((_shixunsDetail$detail2 = shixunsDetail.detail) === null || _shixunsDetail$detail2 === void 0 ? void 0 : _shixunsDetail$detail2.identity) < 3 && !!serviceConfigList.length && /*#__PURE__*/(0,jsx_runtime.jsxs)(react.Fragment, { + }), ((_shixunsDetail$detail3 = shixunsDetail.detail) === null || _shixunsDetail$detail3 === void 0 ? void 0 : _shixunsDetail$detail3.identity) < 3 && !!serviceConfigList.length && /*#__PURE__*/(0,jsx_runtime.jsxs)(react.Fragment, { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: Environmentmodules.title, children: "\u670D\u52A1\u914D\u7F6E" diff --git a/p__Shixuns__New__index.async.js b/p__Shixuns__New__index.async.js index 5bc2ca0b19..70f3f723df 100644 --- a/p__Shixuns__New__index.async.js +++ b/p__Shixuns__New__index.async.js @@ -88,7 +88,8 @@ var SelectEnvironment = function SelectEnvironment(_ref) { _ref$tags = _ref.tags, tags = _ref$tags === void 0 ? [] : _ref$tags, _ref$onChange = _ref.onChange, - onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange; + onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange, + shixun_type = _ref.shixun_type; var _useState = (0,react.useState)(''), _useState2 = slicedToArray_default()(_useState, 2), inputValue = _useState2[0], @@ -216,20 +217,22 @@ var SelectEnvironment = function SelectEnvironment(_ref) { case 7: clearTimeout(timerSearch.current); timerSearch.current = setTimeout( /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() { - var res, _res$data, _newItems, _res$data2; + var params, res, _res$data, _newItems, _res$data2; return regeneratorRuntime_default()().wrap(function _callee$(_context) { while (1) switch (_context.prev = _context.next) { case 0: - _context.next = 2; + params = { + keywords: encodeURIComponent(searchText || ''), + page: 1, + limit: 100000 + }; + shixun_type ? params["shixun_type"] = shixun_type : ""; + _context.next = 4; return (0,fetch/* default */.ZP)("/api/shixuns/search_image.json", { method: 'get', - params: { - keywords: encodeURIComponent(searchText || ''), - page: 1, - limit: 100000 - } + params: params }); - case 2: + case 4: res = _context.sent; if ((res === null || res === void 0 ? void 0 : res.status) === 0) { _newItems = listDom((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.mirrors) || []); @@ -238,7 +241,7 @@ var SelectEnvironment = function SelectEnvironment(_ref) { optionsSave.current = (0,lodash.cloneDeep)((res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.mirrors) || []); } } - case 4: + case 6: case "end": return _context.stop(); } @@ -296,7 +299,7 @@ var SelectEnvironment = function SelectEnvironment(_ref) { }; var clear = function clear() { setOptions([]); - setInputValue(''); + setInputValue(""); }; var activeClear = function activeClear(id) { onChange(id); @@ -313,7 +316,10 @@ var SelectEnvironment = function SelectEnvironment(_ref) { }); } return /*#__PURE__*/(0,jsx_runtime.jsx)("i", { - onClick: clear, + onClick: function onClick(e) { + e.stopPropagation(); + clear(); + }, className: "iconfont icon-shanchu4 c-grey-c" }); }; @@ -1149,7 +1155,8 @@ var jsx_runtime = __webpack_require__(85893); var CommonPractice = function CommonPractice(_ref) { var newShixuns = _ref.newShixuns, user = _ref.user, - dispatch = _ref.dispatch; + dispatch = _ref.dispatch, + shixun_type = _ref.shixun_type; var _useState = (0,react.useState)(null), _useState2 = slicedToArray_default()(_useState, 2), copyInfo = _useState2[0], @@ -1302,7 +1309,8 @@ var CommonPractice = function CommonPractice(_ref) { tags: frequence_image, onChange: function onChange(id) { return setActiveId(id); - } + }, + shixun_type: shixun_type }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: CommonPracticemodules.right, children: [/*#__PURE__*/(0,jsx_runtime.jsx)("header", { @@ -1944,7 +1952,9 @@ var NewShixunsPage = function NewShixunsPage() { className: Newmodules.dec, children: [radioValue === '1' && '多功能新型实战项目模式，支持图形化桌面、Web IDE、命令行、虚拟仿真等多种实验场景，适用于各类复杂工程项目研发。', radioValue === '2' && '多功能实时交互实验模式，支持实时代码、数学方程、可视化和MarkDown等。 适用于数据清理、数值模拟、统计建模、机器学习等系列实验。', radioValue === '3' && 'JupyterLab是新一代Jupyter Notebook，配置文件目录和Notebook，支持数据科学中的各种工作流程，适合中大型项目。'] })] - }), radioValue === '1' && /*#__PURE__*/(0,jsx_runtime.jsx)(components_CommonPractice, {}), (radioValue === '2' || radioValue === '3') && /*#__PURE__*/(0,jsx_runtime.jsx)(components_JupyterPractice, { + }), radioValue === '1' && /*#__PURE__*/(0,jsx_runtime.jsx)(components_CommonPractice, { + shixun_type: "normal" + }), (radioValue === '2' || radioValue === '3') && /*#__PURE__*/(0,jsx_runtime.jsx)(components_JupyterPractice, { is_jupyter_lab: radioValue === '2' ? false : true }), /*#__PURE__*/(0,jsx_runtime.jsx)(ApplyModal/* default */.Z, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(CreateEnvironment/* default */.Z, {})] }); diff --git a/p__Terminal__index.async.js b/p__Terminal__index.async.js index e9442ef4b4..1ea03bd0a0 100644 --- a/p__Terminal__index.async.js +++ b/p__Terminal__index.async.js @@ -1628,9 +1628,8 @@ function reducer(state, action) { rfbRef.current.resizeSession = true; rfbRef.current.addEventListener('disconnect', onDisconnect); rfbRef.current.addEventListener('connect', onConnect); - // rfbRef.current.addEventListener('clipboard', onClipboardReceive) + rfbRef.current.addEventListener('clipboard', onClipboardReceive); }; - function onClipboardReceive(e) { var rs = unicodeUnEscape(e.detail.text); dispatch({ diff --git a/p__Video__Detail__id.async.js b/p__Video__Detail__id.async.js index 94cf808edd..3bc1dde244 100644 --- a/p__Video__Detail__id.async.js +++ b/p__Video__Detail__id.async.js @@ -2362,7 +2362,7 @@ var VideoDetailPage = function VideoDetailPage(_ref) { }, [active.id]); console.log('---', active); (0,react.useEffect)(function () { - getdata(); + if (subject_id) getdata(); }, []); function getdata() { return _getdata.apply(this, arguments); @@ -2812,7 +2812,8 @@ var AddVideoModal = function AddVideoModal(_ref2) { name: form.getFieldValue('name'), attachment_id: form.getFieldValue('attachment_id'), description: form.getFieldValue('description'), - tags: tagsList + tags: form.getFieldValue('tag') + // tags: tagsList, })); case 9: res = _context.sent; diff --git a/p__tasks__index.async.js b/p__tasks__index.async.js index ab57c595fc..df9a51491d 100644 --- a/p__tasks__index.async.js +++ b/p__tasks__index.async.js @@ -8630,7 +8630,9 @@ function left_panel_reducer(state, action) { onEvaluateCallback = _ref.onEvaluateCallback, onGetUnity3dMessage = _ref.onGetUnity3dMessage, shixun = _ref.shixun, - taskData = _ref.taskData; + taskData = _ref.taskData, + chatgpt = _ref.chatgpt, + to_user_id = _ref.to_user_id; var _useSearchParams = (0,_umi_production_exports.useSearchParams)(), _useSearchParams2 = slicedToArray_default()(_useSearchParams, 1), searchParams = _useSearchParams2[0]; @@ -8680,6 +8682,7 @@ function left_panel_reducer(state, action) { var contentEl = (0,react.useRef)(); var open_rank = challenge.open_rank; console.log(challenge, 'challenge'); + console.log(chatgpt, "chatgpt"); var tabs = (0,react.useMemo)(function () { var rs = [{ index: 0, @@ -8699,7 +8702,7 @@ function left_panel_reducer(state, action) { } if (searchParams.get("type") !== 'exercises' && !(shixun !== null && shixun !== void 0 && shixun.is_disable_discuss)) rs.push({ index: 3, - title: '评论' + title: chatgpt ? "问答" : '评论' }); if (open_rank !== 'CLOSE') { rs.push({ @@ -9194,7 +9197,10 @@ function left_panel_reducer(state, action) { identity: user.identity, user: user, allowDisableDiscuss: allowDisableDiscuss, - taskData: taskData + taskData: taskData, + chatgpt: chatgpt, + to_user_id: to_user_id, + challengeId: challenge.id }) }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: activeIndex === 4 ? 'tab-panel-body' : 'hide', @@ -11073,8 +11079,8 @@ function TipContent() { })] }), /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { children: [(vnc_url || window_vnc_url || linux_vnc || (taskData === null || taskData === void 0 ? void 0 : taskData.virtual_machine) || (shixun === null || shixun === void 0 ? void 0 : shixun.webssh) === 3 || shixun.hide_code === 2 || unity_3d_routes) && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { - className: "flex-container", - children: [searchParams.get("type") !== 'exercises' && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { + className: "flex-container ".concat(searchParams.get("type") === 'exercises' ? "hide" : ""), + children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { children: [window_vnc_url && /*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { onClick: function onClick(e) { e.preventDefault(); @@ -11326,6 +11332,7 @@ function VncTimer(_ref3) { title: [/*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, { className: "modalIconYellow" }), time !== 0 ? '实验环境延时提醒' : '实验环境重置提醒'], + maskClosable: false, closable: false, centered: true, wrapClassName: "customModalStyle", @@ -16123,7 +16130,7 @@ var urlParams = (_getJsonFromUrl = (0,util/* getJsonFromUrl */.oP)()) !== null & } : {}; function updateSystemTip(id, myshixunId) { return (0,utils_fetch/* get */.U2)("/tasks/".concat(id, "/system_update.json"), { - myshixun_id: myshixun_id + myshixun_id: myshixunId }); } function syncCode(id) { @@ -18086,7 +18093,7 @@ function tasks_reducer(state, action) { with_code_file: with_code_file, onEvaluateCallback: onEvaluateCallback, onGetUnity3dMessage: onGetUnity3dMessage - }, defineProperty_default()(_leftPanelOption, "taskId", taskId), defineProperty_default()(_leftPanelOption, "myshixun", myshixun), defineProperty_default()(_leftPanelOption, "user", user), defineProperty_default()(_leftPanelOption, "discusses_count", discusses_count), defineProperty_default()(_leftPanelOption, "onPlusOrCancelPraise", onPlusOrCancelPraise), defineProperty_default()(_leftPanelOption, "minuxUserGrade", minuxUserGrade), defineProperty_default()(_leftPanelOption, "taskData", taskData), _leftPanelOption); + }, defineProperty_default()(_leftPanelOption, "taskId", taskId), defineProperty_default()(_leftPanelOption, "myshixun", myshixun), defineProperty_default()(_leftPanelOption, "user", user), defineProperty_default()(_leftPanelOption, "discusses_count", discusses_count), defineProperty_default()(_leftPanelOption, "onPlusOrCancelPraise", onPlusOrCancelPraise), defineProperty_default()(_leftPanelOption, "minuxUserGrade", minuxUserGrade), defineProperty_default()(_leftPanelOption, "taskData", taskData), defineProperty_default()(_leftPanelOption, "chatgpt", chatgpt), defineProperty_default()(_leftPanelOption, "to_user_id", to_user_id), _leftPanelOption); var noticeOption = { showNotice: showNotice || (tpm_cases_modified || isUpdateScript) && myshixun.system_tip === false, tpm_cases_modified: tpm_cases_modified, @@ -18856,9 +18863,8 @@ function reducer(state, action) { rfbRef.current.resizeSession = true; rfbRef.current.addEventListener('disconnect', onDisconnect); rfbRef.current.addEventListener('connect', onConnect); - // rfbRef.current.addEventListener('clipboard', onClipboardReceive) + rfbRef.current.addEventListener('clipboard', onClipboardReceive); }; - function onClipboardReceive(e) { var rs = unicodeUnEscape(e.detail.text); dispatch({ diff --git a/umi.js b/umi.js index 08f527dec2..8cd5385c4a 100644 --- a/umi.js +++ b/umi.js @@ -70505,7 +70505,7 @@ __webpack_require__.d(__webpack_exports__, { ;// CONCATENATED MODULE: ./src/utils/env/dev.ts var DEV = { - PROXY_SERVER: 'https://pre-data.educoder.net', + PROXY_SERVER: 'https://test-data.educoder.net', API_SERVER: 'http://localhost:8000', REPORT_SERVER: 'http://192.168.1.57:3001', IMG_SERVER: 'https://new-testali-cdn.educoder.net', @@ -72910,25 +72910,24 @@ var checkLocalOrPublicIp = function checkLocalOrPublicIp(v) { return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2___default()().wrap(function _callee$(_context) { while (1) switch (_context.prev = _context.next) { case 0: - console.log(12312313); if (!(v.ip_limit !== 'no' || v.ip_bind)) { - _context.next = 5; + _context.next = 4; break; } - _context.next = 4; + _context.next = 3; return (0,_components_Exercise_ip__WEBPACK_IMPORTED_MODULE_13__/* .findLocalIp */ .y)({ ip_limit: v === null || v === void 0 ? void 0 : v.ip_limit, ip_bind: v === null || v === void 0 ? void 0 : v.ip_bind }); - case 4: + case 3: ip = _context.sent; - case 5: - _context.next = 7; + case 4: + _context.next = 6; return (0,_service_exercise__WEBPACK_IMPORTED_MODULE_14__/* .checkIp */ .Cl)({ id: v.exerciseId, ip: ip }); - case 7: + case 6: res = _context.sent; if (res.status === 0) { resolve(res); @@ -72936,13 +72935,13 @@ var checkLocalOrPublicIp = function checkLocalOrPublicIp(v) { reject(res); } if (!v.errmsgHide) { - _context.next = 11; + _context.next = 10; break; } return _context.abrupt("return", true); - case 11: + case 10: if (!(res.status === -1)) { - _context.next = 16; + _context.next = 15; break; } modal = antd_es_modal__WEBPACK_IMPORTED_MODULE_23__/* ["default"].info */ .Z.info({ @@ -72968,9 +72967,9 @@ var checkLocalOrPublicIp = function checkLocalOrPublicIp(v) { okText: '我知道了' }); return _context.abrupt("return", false); - case 16: + case 15: if (!(res.status === -2)) { - _context.next = 19; + _context.next = 18; break; } modal = antd_es_modal__WEBPACK_IMPORTED_MODULE_23__/* ["default"].info */ .Z.info({ @@ -72999,7 +72998,7 @@ var checkLocalOrPublicIp = function checkLocalOrPublicIp(v) { okText: '我知道了' }); return _context.abrupt("return", false); - case 19: + case 18: case "end": return _context.stop(); } @@ -73401,14 +73400,13 @@ var educationList = [{ id: 9 }]; var setHeader = function setHeader(newOptions, url) { - try { - var _Object$keys, _Object$keys2; - var timenow = Date.now(); - var stringToSign = "method=" + newOptions.method + "&" + (!!((_Object$keys = Object.keys((newOptions === null || newOptions === void 0 ? void 0 : newOptions.params) || {})) !== null && _Object$keys !== void 0 && _Object$keys.length) && parseParams(newOptions.params) ? parseParamsStr(newOptions.params, newOptions.method) + "&" : "") + (!!((_Object$keys2 = Object.keys(JSON.parse(newOptions.body || "{}"))) !== null && _Object$keys2 !== void 0 && _Object$keys2.length) ? parseParamsStr(JSON.parse(newOptions.body)) + "&" : "") + "ak=" + aKey + "&sk=" + sKey + "&time=" + timenow; - console.log("stringToSign:", stringToSign, newOptions, url); - newOptions.headers["X-EDU-Timestamp"] = timenow; - newOptions.headers["X-EDU-Signature"] = md5__WEBPACK_IMPORTED_MODULE_17___default()(js_base64__WEBPACK_IMPORTED_MODULE_18__.Base64.encode(stringToSign)); - } catch (error) {} + var _Object$keys, _Object$keys2; + var timenow = Date.now(); + var body = typeof (newOptions === null || newOptions === void 0 ? void 0 : newOptions.body) === "string" ? JSON.parse(newOptions === null || newOptions === void 0 ? void 0 : newOptions.body) : newOptions === null || newOptions === void 0 ? void 0 : newOptions.body; + var stringToSign = "method=" + newOptions.method + "&" + (!!((_Object$keys = Object.keys((newOptions === null || newOptions === void 0 ? void 0 : newOptions.params) || {})) !== null && _Object$keys !== void 0 && _Object$keys.length) ? parseParamsStr(newOptions.params, newOptions.method) + "&" : "") + (!!((_Object$keys2 = Object.keys(body || {})) !== null && _Object$keys2 !== void 0 && _Object$keys2.length) ? parseParamsStr(JSON.parse(newOptions.body)) + "&" : "") + "ak=" + aKey + "&sk=" + sKey + "&time=" + timenow; + console.log("stringToSign:", stringToSign, url); + newOptions.headers["X-EDU-Timestamp"] = timenow; + newOptions.headers["X-EDU-Signature"] = md5__WEBPACK_IMPORTED_MODULE_17___default()(js_base64__WEBPACK_IMPORTED_MODULE_18__.Base64.encode(stringToSign)); return newOptions; }; var parseUrl = function parseUrl(url) { @@ -73430,7 +73428,7 @@ var messageInfo = function messageInfo(status, date) { antd_es_message__WEBPACK_IMPORTED_MODULE_22__/* ["default"].warn */ .ZP.warn(s); }; var base64ToBlob = function base64ToBlob(code, filename) { - var _filename$split, _filename$split2; + var _filename$split; // const parts = code.split(';base64,'); // const contentType = parts[0].split(':')[1]; var raw = window.atob(code); @@ -73439,9 +73437,8 @@ var base64ToBlob = function base64ToBlob(code, filename) { for (var i = 0; i < rawLength; ++i) { uInt8Array[i] = raw.charCodeAt(i); } - console.log('type:', _contentType__WEBPACK_IMPORTED_MODULE_15__/* .contentType */ .F[(_filename$split = filename.split('.')) === null || _filename$split === void 0 ? void 0 : _filename$split[1]] || 'application/octet-stream'); return new Blob([uInt8Array], { - type: _contentType__WEBPACK_IMPORTED_MODULE_15__/* .contentType */ .F[(_filename$split2 = filename.split('.')) === null || _filename$split2 === void 0 ? void 0 : _filename$split2[1]] || 'application/octet-stream' + type: _contentType__WEBPACK_IMPORTED_MODULE_15__/* .contentType */ .F[(_filename$split = filename.split('.')) === null || _filename$split === void 0 ? void 0 : _filename$split[1]] || 'application/octet-stream' }); }; var downloadFile = function downloadFile(fileName, content, filename) { @@ -122904,22 +122901,22 @@ function _getRoutes() { "id": "153" }, "154": { - "path": "/competitions/index/:identifier", + "path": "/competitions/:identifier/detail", "parentId": "148", "id": "154" }, "155": { - "path": "/competitions/index/:identifier/enroll", + "path": "/competitions/:identifier/detail/enroll", "parentId": "148", "id": "155" }, "156": { - "path": "/competitions/index/:identifier/UpdateTeanname/:Teannameid", + "path": "/competitions/:identifier/detail/UpdateTeanname/:Teannameid", "parentId": "148", "id": "156" }, "157": { - "path": "/competitions/index/:identifier/teamDetail/:Teamid", + "path": "/competitions/:identifier/detail/teamDetail/:Teamid", "parentId": "148", "id": "157" },