From 27ea915b23671a7295883b923722986d5a5008d8 Mon Sep 17 00:00:00 2001 From: autosubmit Date: Mon, 29 May 2023 20:01:37 +0800 Subject: [PATCH] Auto Submit --- 78806.async.js | 94 ++++++++++++++++++++++++++++++++++---------------- color.less | 38 ++++++++++---------- umi.js | 41 +++++++++++----------- 3 files changed, 104 insertions(+), 69 deletions(-) diff --git a/78806.async.js b/78806.async.js index 1c2f2f9e46..bb1630e5cf 100644 --- a/78806.async.js +++ b/78806.async.js @@ -300,12 +300,12 @@ var RecordScreen = function RecordScreen(_ref) { var handleRecordScreenFinish = /*#__PURE__*/function () { var _ref5 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5(num) { var _exercise$exerciseUse5; - var res; + var commitAtData, res; return regeneratorRuntime_default()().wrap(function _callee5$(_context5) { while (1) switch (_context5.prev = _context5.next) { case 0: if (!((_exercise$exerciseUse5 = exercise.exerciseUserInfo) !== null && _exercise$exerciseUse5 !== void 0 && _exercise$exerciseUse5.screen_at)) { - _context5.next = 3; + _context5.next = 6; break; } _context5.next = 3; @@ -313,25 +313,32 @@ var RecordScreen = function RecordScreen(_ref) { reset: true })); case 3: - _context5.next = 5; + commitAtData = _context5.sent; + if (!((commitAtData === null || commitAtData === void 0 ? void 0 : commitAtData.status) === -6)) { + _context5.next = 6; + break; + } + return _context5.abrupt("return"); + case 6: + _context5.next = 8; return (0,service_exercise/* recordScreen */.oy)({ id: params.categoryId }); - case 5: + case 8: res = _context5.sent; if (!(res !== null && res !== void 0 && res.is_commit)) { - _context5.next = 14; + _context5.next = 17; break; } es_modal/* default.destroyAll */.Z.destroyAll(); - _context5.next = 10; + _context5.next = 13; return recordExitTimes(); - case 10: + case 13: autoSubmitToDetail(true); return _context5.abrupt("return"); - case 14: + case 17: exitFullScreenTip(num + 1); - case 15: + case 18: case "end": return _context5.stop(); } @@ -640,12 +647,12 @@ var RecordScreen = function RecordScreen(_ref) { var handleFinish = /*#__PURE__*/function () { var _ref10 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee10() { var _exercise$exerciseUse10; - var res, resUser; + var commitAtData, res, resUser; return regeneratorRuntime_default()().wrap(function _callee10$(_context10) { while (1) switch (_context10.prev = _context10.next) { case 0: if (!((_exercise$exerciseUse10 = exercise.exerciseUserInfo) !== null && _exercise$exerciseUse10 !== void 0 && _exercise$exerciseUse10.screen_at)) { - _context10.next = 3; + _context10.next = 6; break; } _context10.next = 3; @@ -653,25 +660,32 @@ var RecordScreen = function RecordScreen(_ref) { reset: true })); case 3: - _context10.next = 5; + commitAtData = _context10.sent; + if (!((commitAtData === null || commitAtData === void 0 ? void 0 : commitAtData.status) === -6)) { + _context10.next = 6; + break; + } + return _context10.abrupt("return"); + case 6: + _context10.next = 8; return (0,service_exercise/* recordScreen */.oy)({ id: params.categoryId }); - case 5: + case 8: res = _context10.sent; if (!(res !== null && res !== void 0 && res.is_commit)) { - _context10.next = 9; + _context10.next = 12; break; } autoSubmitToDetail(); return _context10.abrupt("return"); - case 9: - _context10.next = 11; + case 12: + _context10.next = 14; return getExerciseUserInfo(); - case 11: + case 14: resUser = _context10.sent; return _context10.abrupt("return", resUser); - case 13: + case 16: case "end": return _context10.stop(); } @@ -683,44 +697,64 @@ var RecordScreen = function RecordScreen(_ref) { }(); var fullscreenchangeIn = /*#__PURE__*/function () { var _ref11 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee11() { - var showHeader, _exercise$exerciseUse11, res; + var showHeader, _exercise$exerciseUse11, _commitAtData, commitAtData, _commitAtData2, res; return regeneratorRuntime_default()().wrap(function _callee11$(_context11) { while (1) switch (_context11.prev = _context11.next) { case 0: (0,util/* copyTextFuc */.RG)(" ", true); showHeader = false; if (!(0,fullscreen/* IsFull */.vp)()) { - _context11.next = 6; + _context11.next = 11; + break; + } + if (!((_exercise$exerciseUse11 = exercise.exerciseUserInfo) !== null && _exercise$exerciseUse11 !== void 0 && _exercise$exerciseUse11.screen_at)) { + _context11.next = 9; break; } - if ((_exercise$exerciseUse11 = exercise.exerciseUserInfo) !== null && _exercise$exerciseUse11 !== void 0 && _exercise$exerciseUse11.screen_at) (0,service_exercise/* commitScreenAt */.ck)(objectSpread2_default()(objectSpread2_default()({}, params), {}, { + _context11.next = 6; + return (0,service_exercise/* commitScreenAt */.ck)(objectSpread2_default()(objectSpread2_default()({}, params), {}, { reset: true })); - _context11.next = 15; - break; case 6: + commitAtData = _context11.sent; + if (!(((_commitAtData = commitAtData) === null || _commitAtData === void 0 ? void 0 : _commitAtData.status) === -6)) { + _context11.next = 9; + break; + } + return _context11.abrupt("return"); + case 9: + _context11.next = 23; + break; + case 11: if (hasModal.current) { - _context11.next = 15; + _context11.next = 23; break; } showHeader = true; - _context11.next = 10; + _context11.next = 15; return (0,service_exercise/* commitScreenAt */.ck)(objectSpread2_default()({}, params)); - case 10: - _context11.next = 12; + case 15: + commitAtData = _context11.sent; + if (!(((_commitAtData2 = commitAtData) === null || _commitAtData2 === void 0 ? void 0 : _commitAtData2.status) === -6)) { + _context11.next = 18; + break; + } + return _context11.abrupt("return"); + case 18: + _context11.next = 20; return getExerciseUserInfo(); - case 12: + case 20: res = _context11.sent; exitFullScreenTip(res.used_screen_num + 1); if (window.frames.length != parent.frames.length) { window.parent.postMessage('backExercise', '*'); } - case 15: + case 23: dispatch({ type: "globalSetting/headerFooterToggle", payload: showHeader }); - case 16: + case 24: case "end": return _context11.stop(); } diff --git a/color.less b/color.less index 0c4809be17..faee60426b 100644 --- a/color.less +++ b/color.less @@ -83,7 +83,7 @@ html {--antd-wave-shadow-color: @primary-color;} .ant-zoom-right-enter, .ant-zoom-right-appear {animation-fill-mode: both;} .ant-zoom-right-leave {animation-fill-mode: both;} .ant-alert {color: @text-color;border-radius: 2px;} -.ant-alert-success {background-color: color(~`colorPalette("@{success-color}", 1)`);border: 1px solid color(~`colorPalette("@{success-color}", 3)`);} +.ant-alert-success {background-color: color(~`colorPalette("@{error-color}", 1)`);border: 1px solid color(~`colorPalette("@{success-color}", 3)`);} .ant-alert-success .ant-alert-icon {color: @success-color;} .ant-alert-info {background-color: color(~`colorPalette("@{primary-color}", 1)`);border: 1px solid color(~`colorPalette("@{primary-color}", 3)`);} .ant-alert-info .ant-alert-icon {color: @primary-color;} @@ -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(29, 122, 68, 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(220, 102, 34, 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(153, 136, 191, 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(196, 130, 65, 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(29, 122, 68, 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(220, 102, 34, 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(153, 136, 191, 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(196, 130, 65, 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(29, 122, 68, 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(220, 102, 34, 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(153, 136, 191, 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(196, 130, 65, 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(29, 122, 68, 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(220, 102, 34, 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(153, 136, 191, 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(196, 130, 65, 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(29, 122, 68, 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(220, 102, 34, 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(153, 136, 191, 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(196, 130, 65, 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(29, 122, 68, 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(220, 102, 34, 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(153, 136, 191, 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(196, 130, 65, 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;} @@ -1058,10 +1058,10 @@ tr > .ant-picker-cell-in-view.ant-picker-cell-range-hover-start:last-child::afte .ant-mentions-dropdown-menu-item-active {background-color: #f5f5f5;} .ant-menu-item-danger.ant-menu-item {color: @error-color;} .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-item-danger.ant-menu-item-active {color: @error-color;} -.ant-menu-item-danger.ant-menu-item:active {background: color(~`colorPalette("@{success-color}", 1)`);} +.ant-menu-item-danger.ant-menu-item:active {background: #fff1f0;} .ant-menu-item-danger.ant-menu-item-selected {color: @error-color;} .ant-menu-item-danger.ant-menu-item-selected > a, .ant-menu-item-danger.ant-menu-item-selected > a:hover {color: @error-color;} -.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: color(~`colorPalette("@{success-color}", 1)`);} +.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {background-color: #fff1f0;} .ant-menu-inline .ant-menu-item-danger.ant-menu-item::after {border-right-color: @error-color;} .ant-menu-dark .ant-menu-item-danger.ant-menu-item, .ant-menu-dark .ant-menu-item-danger.ant-menu-item:hover, .ant-menu-dark .ant-menu-item-danger.ant-menu-item > a {color: @error-color;} .ant-menu-dark.ant-menu-dark:not(.ant-menu-horizontal) .ant-menu-item-danger.ant-menu-item-selected {color: #fff;background-color: @error-color;} @@ -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(29, 122, 68, 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(220, 102, 34, 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(153, 136, 191, 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(196, 130, 65, 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;} @@ -1640,7 +1640,7 @@ tr.ant-table-expanded-row:hover > td {background: #fbfbfb;} .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} .ant-tag-magenta {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;} .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{success-color}", 1)`);border-color: #ffa39e;} +.ant-tag-red {color: #cf1322;background: #fff1f0;border-color: #ffa39e;} .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;} .ant-tag-volcano {color: #d4380d;background: #fff2e8;border-color: #ffbb96;} .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;} @@ -1662,7 +1662,7 @@ tr.ant-table-expanded-row:hover > td {background: #fbfbfb;} .ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;} .ant-tag-purple {color: #531dab;background: #f9f0ff;border-color: #d3adf7;} .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;} -.ant-tag-success {color: @success-color;background: color(~`colorPalette("@{success-color}", 1)`);border-color: color(~`colorPalette("@{success-color}", 3)`);} +.ant-tag-success {color: @success-color;background: color(~`colorPalette("@{error-color}", 1)`);border-color: color(~`colorPalette("@{success-color}", 3)`);} .ant-tag-processing {color: @primary-color;background: color(~`colorPalette("@{primary-color}", 1)`);border-color: color(~`colorPalette("@{primary-color}", 3)`);} .ant-tag-error {color: @error-color;background: color(~`colorPalette("@{error-color}", 1)`);border-color: color(~`colorPalette("@{error-color}", 3)`);} .ant-tag-warning {color: @warning-color;background: color(~`colorPalette("@{warning-color}", 1)`);border-color: color(~`colorPalette("@{warning-color}", 3)`);} diff --git a/umi.js b/umi.js index a09befa667..fd7dedca5c 100644 --- a/umi.js +++ b/umi.js @@ -73008,7 +73008,7 @@ var getMessagesUrl = function getMessagesUrl(item) { } }; var checkLocalOrPublicIp = /*#__PURE__*/function () { - var _ref = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_6___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2___default()().mark(function _callee2(v) { + var _ref = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_6___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2___default()().mark(function _callee2(v, hideTip) { var ip, modal; return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2___default()().wrap(function _callee2$(_context2) { while (1) switch (_context2.prev = _context2.next) { @@ -73067,7 +73067,7 @@ var checkLocalOrPublicIp = /*#__PURE__*/function () { case 16: resolve(res); case 17: - if (!v.errmsgHide) { + if (!(v.errmsgHide || hideTip)) { _context.next = 19; break; } @@ -73137,7 +73137,7 @@ var checkLocalOrPublicIp = /*#__PURE__*/function () { } }, _callee); })); - return function (_x2, _x3) { + return function (_x3, _x4) { return _ref2.apply(this, arguments); }; }())); @@ -73147,7 +73147,7 @@ var checkLocalOrPublicIp = /*#__PURE__*/function () { } }, _callee2); })); - return function checkLocalOrPublicIp(_x) { + return function checkLocalOrPublicIp(_x, _x2) { return _ref.apply(this, arguments); }; }(); @@ -73182,7 +73182,7 @@ var checkDisabledExam = function checkDisabledExam(v) { } }, _callee3); })); - return function (_x4, _x5) { + return function (_x5, _x6) { return _ref3.apply(this, arguments); }; }()); @@ -73196,7 +73196,7 @@ var isKepuKehuan = function isKepuKehuan() { }; var startExercise = /*#__PURE__*/function () { var _ref4 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_6___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2___default()().mark(function _callee4(v) { - var modal; + var modal, res; return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_2___default()().wrap(function _callee4$(_context4) { while (1) switch (_context4.prev = _context4.next) { case 0: @@ -73210,19 +73210,20 @@ var startExercise = /*#__PURE__*/function () { }); return _context4.abrupt("return"); case 4: - _context4.next = 6; - return checkDisabledExam(v); - case 6: copyTextFuc(" ", true); + _context4.next = 7; + return checkDisabledExam(v); + case 7: if (!(v.ip_limit !== 'no' || v.ip_bind)) { - _context4.next = 13; + _context4.next = 14; break; } _context4.next = 10; - return checkLocalOrPublicIp(v); + return checkLocalOrPublicIp(v, true); case 10: + res = _context4.sent; if (isChrome()) { - _context4.next = 13; + _context4.next = 14; break; } antd_es_modal__WEBPACK_IMPORTED_MODULE_22__/* ["default"].info */ .Z.info({ @@ -73241,13 +73242,13 @@ var startExercise = /*#__PURE__*/function () { }) }); return _context4.abrupt("return"); - case 13: + case 14: if (!(v.open_camera || v.screen_open || v.ip_limit !== 'no' || v.identity_verify)) { - _context4.next = 20; + _context4.next = 21; break; } if (isChromeOrFirefox()) { - _context4.next = 17; + _context4.next = 18; break; } antd_es_modal__WEBPACK_IMPORTED_MODULE_22__/* ["default"].info */ .Z.info({ @@ -73272,7 +73273,7 @@ var startExercise = /*#__PURE__*/function () { }) }); return _context4.abrupt("return", false); - case 17: + case 18: modal = antd_es_modal__WEBPACK_IMPORTED_MODULE_22__/* ["default"].info */ .Z.info({ title: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_20__.jsxs)(antd_es_row__WEBPACK_IMPORTED_MODULE_23__/* ["default"] */ .Z, { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_20__.jsx)(antd_es_col__WEBPACK_IMPORTED_MODULE_24__/* ["default"] */ .Z, { @@ -73422,21 +73423,21 @@ var startExercise = /*#__PURE__*/function () { disabled: true } }); - _context4.next = 21; + _context4.next = 22; break; - case 20: + case 21: if (v.identity_verify && v.current_status === 2) { window.location.href = "/classrooms/".concat(v.coursesId, "/exercise/").concat(v.exerciseId, "/users/").concat(v.login, "/check"); } else { window.location.href = "/classrooms/".concat(v.coursesId, "/exercise/").concat(v.exerciseId, "/users/").concat(v.login); } - case 21: + case 22: case "end": return _context4.stop(); } }, _callee4); })); - return function startExercise(_x6) { + return function startExercise(_x7) { return _ref4.apply(this, arguments); }; }();