diff --git a/color.less b/color.less index 039ea4ebc1..4d7f94beaf 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(154, 183, 154, 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(115, 166, 116, 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(95, 146, 48, 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(246, 208, 100, 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(154, 183, 154, 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(115, 166, 116, 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(95, 146, 48, 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(246, 208, 100, 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(154, 183, 154, 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(115, 166, 116, 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(95, 146, 48, 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(246, 208, 100, 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(154, 183, 154, 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(115, 166, 116, 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(95, 146, 48, 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(246, 208, 100, 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(154, 183, 154, 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(115, 166, 116, 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(95, 146, 48, 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(246, 208, 100, 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(154, 183, 154, 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(115, 166, 116, 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(95, 146, 48, 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(246, 208, 100, 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(154, 183, 154, 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(115, 166, 116, 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(95, 146, 48, 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(246, 208, 100, 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__Competitions__Edit__index.async.js b/p__Competitions__Edit__index.async.js index 7f6936db43..8fea1dc090 100644 --- a/p__Competitions__Edit__index.async.js +++ b/p__Competitions__Edit__index.async.js @@ -13786,12 +13786,6 @@ var Team_competitionsPage = function competitionsPage(_ref) { })] }), /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, { loading: isloading, - style: { - marginTop: 20 - }, - scroll: { - y: 300 - }, columns: params.isteam === 'mine' ? columns1 : columns, dataSource: params.isteam === 'mine' ? userList === null || userList === void 0 ? void 0 : userList.competition_teams : userList === null || userList === void 0 ? void 0 : userList.data, pagination: false @@ -15560,6 +15554,8 @@ var Edit_Team_excluded = ["competitions", "globalSetting", "loading", "dispatch" + + var dropMenu = [{ id: '', name: '全部' @@ -15680,11 +15676,22 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { ellipsis: { showTitle: false }, - render: function render(text) { - return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - placement: "topLeft", - title: text, - children: text + render: function render(text, record) { + return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { + children: [/*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + placement: "topLeft", + title: text, + children: text + }), (record === null || record === void 0 ? void 0 : record.authentication) && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + title: "\u5DF2\u5B9E\u540D\u8BA4\u8BC1", + children: /*#__PURE__*/(0,jsx_runtime.jsx)("img", { + src: isrenzheng, + style: { + marginLeft: 5, + marginTop: '-2px' + } + }) + })] }); } }, { @@ -15702,9 +15709,18 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { align: 'left', width: 100, dataIndex: 'identity', - render: function render(text) { - return /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: Team_identityMap[text] + render: function render(text, record) { + return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + children: [Team_identityMap[text], (record === null || record === void 0 ? void 0 : record.professional_certification) && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + title: "\u5DF2\u804C\u4E1A\u8BA4\u8BC1", + children: /*#__PURE__*/(0,jsx_runtime.jsx)("img", { + src: isrenzheng, + style: { + marginLeft: 5, + marginTop: '-2px' + } + }) + })] }); } }, { diff --git a/p__Competitions__Edit__index.chunk.css b/p__Competitions__Edit__index.chunk.css index 4d35d4374e..8eaeb5f278 100644 --- a/p__Competitions__Edit__index.chunk.css +++ b/p__Competitions__Edit__index.chunk.css @@ -5412,6 +5412,9 @@ span.CodeMirror-selectedtext { padding: 11px 0; border-bottom: none; } +.drawer_style___aspKt div[class~='ant-drawer-body'] { + padding-top: 9px; +} .drawer_style___aspKt button[class~='ant-drawer-close'] { position: absolute; right: calc((100% - 1200px)/2); diff --git a/p__tasks__index.async.js b/p__tasks__index.async.js index 0e89fee8dc..741a5eae4a 100644 --- a/p__tasks__index.async.js +++ b/p__tasks__index.async.js @@ -10369,7 +10369,6 @@ var vnc_setting = __webpack_require__(32171); - var _excluded = ["userDetail", "user", "globalSetting", "loading", "dispatch", "onClose", "shixun"]; @@ -10398,7 +10397,7 @@ var Banner = function Banner(_ref) { shixun = _ref.shixun, props = objectWithoutProperties_default()(_ref, _excluded); var params = (0,_umi_production_exports.useParams)(); - var _useState = (0,react.useState)([]), + var _useState = (0,react.useState)(null), _useState2 = slicedToArray_default()(_useState, 2), dataList = _useState2[0], setDataList = _useState2[1]; @@ -10441,9 +10440,9 @@ var Banner = function Banner(_ref) { case 2: res = _context.sent; if (res) { - setDataList(toConsumableArray_default()(res.data_sets)); + setDataList(res.data_sets); setCount(res.data_sets_count); - setFolderName(res.folder_name); + setFolderName(res.folder_name || ""); } case 4: case "end": @@ -10464,34 +10463,7 @@ var Banner = function Banner(_ref) { closable: false, onClose: onClose, open: visible(), - children: [!!(dataList !== null && dataList !== void 0 && dataList.length) && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, { - children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { - className: "c-grey-999 font14 ml5 mb5", - children: "\u6570\u636E\u96C6\u8DEF\u5F84" - }), /*#__PURE__*/(0,jsx_runtime.jsxs)("dl", { - className: data_setsmodules.list, - children: [/*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - title: folderName, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("dt", { - children: folderName - }) - }), /*#__PURE__*/(0,jsx_runtime.jsx)("dd", { - children: /*#__PURE__*/(0,jsx_runtime.jsx)(lib.CopyToClipboard, { - text: folderName, - onCopy: function onCopy() { - return es_message/* default.success */.ZP.success('复制成功'); - }, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - className: "".concat(data_setsmodules.copy, " current"), - children: "\u70B9\u51FB\u590D\u5236" - }) - }) - })] - }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { - className: "c-grey-999 font14 ml5 mb5", - children: "\u6587\u4EF6\u8DEF\u5F84" - })] - }), !(dataList !== null && dataList !== void 0 && dataList.length) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + children: [!(dataList !== null && dataList !== void 0 && dataList.length) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "tc c-grey-999", children: "\u6B64\u5B9E\u8DF5\u9879\u76EE\u6682\u65E0\u6570\u636E\u96C6" }), dataList === null || dataList === void 0 ? void 0 : dataList.map(function (item, key) { @@ -10516,7 +10488,7 @@ var Banner = function Banner(_ref) { }) }) })] - }); + }, key); }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "tc", children: /*#__PURE__*/(0,jsx_runtime.jsx)(pagination/* default */.Z, { @@ -16096,10 +16068,13 @@ function code_repository_reducer(state, action) { }; }(); var settingNotification = function settingNotification(item) { - var uinKey = "".concat(game.identifier, "-").concat(userInfo.login); - var tipsItem = localStorage.getItem("save-shixuns-tips"); + var uinKey = "".concat(shixun.identifier, "-").concat(userInfo.login); + var timeKey = "".concat(shixun.identifier, "-").concat(userInfo.login, "-time"); + var timeValue = localStorage.getItem(timeKey) || ''; + var now = new Date().getTime(); + var tipsItem = localStorage.getItem("records-shixuns-tips"); tipsItem = tipsItem ? JSON.parse(tipsItem) : []; - if (!initTips.current[0] && item.resource_type === 1 && [3, 4].includes(item.tab_type) && !tipsItem.includes(uinKey)) { + if (!initTips.current[0] && item.resource_type === 1 && [3, 4].includes(item.tab_type) && !tipsItem.includes(uinKey) && now > timeValue) { var _userInfo$shixun; initTips.current[0] = true; var standing = 1; // 1: 学生(包括考试) 2: 超管、运营、实训管理员和合作者 3: 普通教师 @@ -16150,6 +16125,7 @@ function code_repository_reducer(state, action) { return notification/* default.open */.Z.open({ message: '提示', closeIcon: /*#__PURE__*/(0,jsx_runtime.jsx)("i", {}), + duration: null, description: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: [start_permanent ? /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "c-grey-333 font14", @@ -16169,7 +16145,7 @@ function code_repository_reducer(state, action) { return e !== uinKey; }); } - localStorage.setItem('save-shixuns-tips', JSON.stringify(tipsItem)); + localStorage.setItem('records-shixuns-tips', JSON.stringify(tipsItem)); }, className: "c-grey-999 font12 mt10", children: "\u4E0D\u518D\u63D0\u9192" @@ -16178,7 +16154,10 @@ function code_repository_reducer(state, action) { btn: /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { onClick: function onClick() { - return notification/* default.close */.Z.close(key); + var currentTime = new Date(); + var savedTime = currentTime.getTime() + 24 * 60 * 60 * 1000; + localStorage.setItem(timeKey, savedTime); + notification/* default.close */.Z.close(key); }, children: "\u77E5\u9053\u4E86" }), standing === 2 && /*#__PURE__*/(0,jsx_runtime.jsxs)(es_button/* default */.Z, { diff --git a/umi.js b/umi.js index f00465ffa0..6e6ecab302 100644 --- a/umi.js +++ b/umi.js @@ -71422,7 +71422,7 @@ __webpack_require__.d(__webpack_exports__, { ;// CONCATENATED MODULE: ./src/utils/env/dev.ts var DEV = { - PROXY_SERVER: 'https://data.educoder.net', + PROXY_SERVER: 'https://pre-data.educoder.net', API_SERVER: '', REPORT_SERVER: 'http://192.168.1.57:3001', IMG_SERVER: 'https://new-testali-cdn.educoder.net',