diff --git a/color.less b/color.less index be0af7e7db..f023060b02 100644 --- a/color.less +++ b/color.less @@ -45,7 +45,7 @@ button::-moz-focus-inner, [type='submit']::-moz-focus-inner {border-style: none;} fieldset {border: 0;} legend {color: inherit;} -mark {background-color: #feffe6;} +mark {background-color: color(~`colorPalette("@{modal-close-color}", 1)`);} ::selection {color: #fff;background: @primary-color;} .anticon {color: inherit;} .ant-fade-enter, .ant-fade-appear {animation-fill-mode: both;} @@ -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(201, 75, 135, 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(195, 166, 189, 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(233, 231, 17, 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(235, 12, 29, 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(201, 75, 135, 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(195, 166, 189, 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(233, 231, 17, 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(235, 12, 29, 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(201, 75, 135, 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(195, 166, 189, 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(233, 231, 17, 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(235, 12, 29, 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(201, 75, 135, 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(195, 166, 189, 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(233, 231, 17, 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(235, 12, 29, 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(201, 75, 135, 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(195, 166, 189, 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(233, 231, 17, 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(235, 12, 29, 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(201, 75, 135, 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(195, 166, 189, 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(233, 231, 17, 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(235, 12, 29, 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("@{modal-heading-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("@{modal-heading-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(201, 75, 135, 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(195, 166, 189, 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(233, 231, 17, 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(235, 12, 29, 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;} @@ -1636,17 +1636,17 @@ tr.ant-table-expanded-row:hover > td {background: #fbfbfb;} .ant-tag-checkable:active, .ant-tag-checkable-checked {color: #fff;} .ant-tag-checkable-checked {background-color: @primary-color;} .ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);} -.ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{modal-mask-bg}", 1)`);border-color: #ffadd2;} +.ant-tag-pink {color: #c41d7f;background: color(~`colorPalette("@{modal-mask-bg}", 3)`);border-color: #ffadd2;} .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{modal-mask-bg}", 1)`);border-color: #ffadd2;} +.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{modal-mask-bg}", 3)`);border-color: #ffadd2;} .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-red {color: #cf1322;background: color(~`colorPalette("@{modal-heading-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;} .ant-tag-orange {color: #d46b08;background: #fff7e6;border-color: #ffd591;} .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;} -.ant-tag-yellow {color: #d4b106;background: #feffe6;border-color: #fffb8f;} +.ant-tag-yellow {color: #d4b106;background: color(~`colorPalette("@{modal-close-color}", 1)`);border-color: #fffb8f;} .ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;} .ant-tag-gold {color: #d48806;background: #fffbe6;border-color: #ffe58f;} .ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;} diff --git a/p__Competitions__Detail__index.async.js b/p__Competitions__Detail__index.async.js index 2dc3c147c8..43e15e60b3 100644 --- a/p__Competitions__Detail__index.async.js +++ b/p__Competitions__Detail__index.async.js @@ -10683,28 +10683,25 @@ var competitionDetails = function competitionDetails(_ref) { while (1) switch (_context4.prev = _context4.next) { case 0: e.stopPropagation(); - if (item.invite_code) { - _context4.next = 4; - break; - } - message/* default.info */.ZP.info('本竞赛只面向部分学校/单位开放，你暂时没有参赛资格'); - return _context4.abrupt("return"); - case 4: + // if (!item.invite_code) { + // message.info('本竞赛只面向部分学校/单位开放，你暂时没有参赛资格'); + // return; + // } if (!(HeaderDetail.teacher_need_phone || HeaderDetail.member_need_phone)) { - _context4.next = 7; + _context4.next = 4; break; } setshowphone(true); return _context4.abrupt("return"); - case 7: + case 4: if ((0,verifyLogin/* handleVerify */.tJ)(dispatch)) { - _context4.next = 9; + _context4.next = 6; break; } return _context4.abrupt("return"); - case 9: + case 6: if (!(HeaderDetail !== null && HeaderDetail !== void 0 && HeaderDetail.is_authentication && !(user !== null && user !== void 0 && (_user$userInfo4 = user.userInfo) !== null && _user$userInfo4 !== void 0 && _user$userInfo4.authentication))) { - _context4.next = 12; + _context4.next = 9; break; } dispatch({ @@ -10714,41 +10711,41 @@ var competitionDetails = function competitionDetails(_ref) { } }); return _context4.abrupt("return"); - case 12: + case 9: if (!(HeaderDetail !== null && HeaderDetail !== void 0 && HeaderDetail.enroll_url)) { - _context4.next = 15; + _context4.next = 12; break; } (0,util/* openNewWindow */.xg)(HeaderDetail === null || HeaderDetail === void 0 ? void 0 : HeaderDetail.enroll_url); return _context4.abrupt("return"); - case 15: + case 12: if (!(url === "ismodel")) { - _context4.next = 32; + _context4.next = 29; break; } if (item.invite_code) { - _context4.next = 19; + _context4.next = 16; break; } message/* default.info */.ZP.info('本竞赛只面向部分学校/单位开放，你暂时没有参赛资格'); return _context4.abrupt("return"); - case 19: + case 16: if (!(item.member_of_course === true)) { - _context4.next = 23; + _context4.next = 20; break; } (0,util/* openNewWindow */.xg)("/classrooms/".concat(item.course_id)); - _context4.next = 30; + _context4.next = 27; break; - case 23: + case 20: if (item.invite_code) { - _context4.next = 26; + _context4.next = 23; break; } message/* default.info */.ZP.info('本竞赛只面向部分学校/单位开放，你暂时没有参赛资格'); return _context4.abrupt("return"); - case 26: - _context4.next = 28; + case 23: + _context4.next = 25; return dispatch({ type: 'competitions/addApplytojoincourse', payload: { @@ -10756,24 +10753,24 @@ var competitionDetails = function competitionDetails(_ref) { student: 1 } }); - case 28: + case 25: result = _context4.sent; if (result.status === 0) { (0,util/* openNewWindow */.xg)("/classrooms/".concat(item.course_id)); } - case 30: - _context4.next = 36; + case 27: + _context4.next = 33; break; - case 32: + case 29: if (!(StaffDetail.enrolled === true)) { - _context4.next = 35; + _context4.next = 32; break; } (0,util/* openNewWindow */.xg)(url); return _context4.abrupt("return"); - case 35: + case 32: setisshowmodal(true); - case 36: + case 33: case "end": return _context4.stop(); } diff --git a/p__Competitions__Detail__index.chunk.css b/p__Competitions__Detail__index.chunk.css index 2d8d56244d..0f7c4732ef 100644 --- a/p__Competitions__Detail__index.chunk.css +++ b/p__Competitions__Detail__index.chunk.css @@ -395,6 +395,7 @@ li:last-child > .ant-breadcrumb-separator { .PerfectCent___HD3Id .PerfectCentName___smdJX { width: 56px; text-align: right; + color: #5f6368; } .teamItem___mx2f3 { display: flex; diff --git a/p__Competitions__Edit__index.async.js b/p__Competitions__Edit__index.async.js index f9b8a59afa..1dc3d07227 100644 --- a/p__Competitions__Edit__index.async.js +++ b/p__Competitions__Edit__index.async.js @@ -7946,7 +7946,7 @@ var informationPage = function informationPage(_ref) { } }); } else if ((params === null || params === void 0 ? void 0 : params.identifier) != form.getFieldValue('identifier')) { - _umi_production_exports.history.push("/competitions/detaol/".concat(form.getFieldValue('identifier'), "?type=4")); + _umi_production_exports.history.push("/competitions/detail/".concat(form.getFieldValue('identifier'), "?type=4")); } } else { // message.error(res?.message) @@ -12476,17 +12476,17 @@ var Ranking_competitionsPage = function competitionsPage(_ref) { return _getdatas.apply(this, arguments); } function _getdatas() { - _getdatas = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() { + _getdatas = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() { var res, _res$data, _res$data$, _res$data2, _res$data2$, _res$data3, list; - return regeneratorRuntime_default()().wrap(function _callee3$(_context3) { - while (1) switch (_context3.prev = _context3.next) { + return regeneratorRuntime_default()().wrap(function _callee2$(_context2) { + while (1) switch (_context2.prev = _context2.next) { case 0: - _context3.next = 2; + _context2.next = 2; return (0,fetch/* default */.ZP)("/api/competitions/".concat(identifier, "/competition_questions.json"), { method: 'get' }); case 2: - res = _context3.sent; + res = _context2.sent; if ((res === null || res === void 0 ? void 0 : res.status) === 0) { setselectedKeys(res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$ = _res$data[0]) === null || _res$data$ === void 0 ? void 0 : _res$data$.identifier); getrank(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$ = _res$data2[0]) === null || _res$data2$ === void 0 ? void 0 : _res$data2$.identifier); @@ -12495,24 +12495,10 @@ var Ranking_competitionsPage = function competitionsPage(_ref) { label: item === null || item === void 0 ? void 0 : item.name, key: item === null || item === void 0 ? void 0 : item.identifier, className: Rankingmodules.muitem, - onClick: function () { - var _onClick = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() { - return regeneratorRuntime_default()().wrap(function _callee2$(_context2) { - while (1) switch (_context2.prev = _context2.next) { - case 0: - setselectedKeys(item.identifier); - getrank(item.identifier); - case 2: - case "end": - return _context2.stop(); - } - }, _callee2); - })); - function onClick() { - return _onClick.apply(this, arguments); - } - return onClick; - }() + onClick: function onClick() { + setselectedKeys(item.identifier); + getrank(item.identifier); + } }); }); setitems(list); @@ -12521,9 +12507,9 @@ var Ranking_competitionsPage = function competitionsPage(_ref) { } case 4: case "end": - return _context3.stop(); + return _context2.stop(); } - }, _callee3); + }, _callee2); })); return _getdatas.apply(this, arguments); } @@ -12534,14 +12520,14 @@ var Ranking_competitionsPage = function competitionsPage(_ref) { return _getrank.apply(this, arguments); } function _getrank() { - _getrank = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4(id) { + _getrank = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3(id) { var url, res, _res$data4; - return regeneratorRuntime_default()().wrap(function _callee4$(_context4) { - while (1) switch (_context4.prev = _context4.next) { + return regeneratorRuntime_default()().wrap(function _callee3$(_context3) { + while (1) switch (_context3.prev = _context3.next) { case 0: // question _identifier url = Header !== null && Header !== void 0 && Header.personal ? "/api/competitions/".concat(identifier, "/competition_charts/person_ranking.json") : "/api/competitions/".concat(identifier, "/competition_charts/team_ranking.json"); - _context4.next = 3; + _context3.next = 3; return (0,fetch/* default */.ZP)(url, { method: 'get', params: objectSpread2_default()(objectSpread2_default()({}, param), {}, { @@ -12549,16 +12535,16 @@ var Ranking_competitionsPage = function competitionsPage(_ref) { }) }); case 3: - res = _context4.sent; + res = _context3.sent; if ((res === null || res === void 0 ? void 0 : res.status) === 0) { setRanKingList(res === null || res === void 0 ? void 0 : res.data); setDefaultcontent(res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.description); } case 5: case "end": - return _context4.stop(); + return _context3.stop(); } - }, _callee4); + }, _callee3); })); return _getrank.apply(this, arguments); } @@ -12566,10 +12552,10 @@ var Ranking_competitionsPage = function competitionsPage(_ref) { return _getexerport.apply(this, arguments); } function _getexerport() { - _getexerport = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5(id) { + _getexerport = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4(id) { var url; - return regeneratorRuntime_default()().wrap(function _callee5$(_context5) { - while (1) switch (_context5.prev = _context5.next) { + return regeneratorRuntime_default()().wrap(function _callee4$(_context4) { + while (1) switch (_context4.prev = _context4.next) { case 0: url = Header !== null && Header !== void 0 && Header.personal ? "/api/competitions/".concat(identifier, "/competition_charts/person_ranking.xlsx") : "/api/competitions/".concat(identifier, "/competition_charts/team_ranking.xlsx"); (0,util/* downLoadFile */.FH)('', (0,util/* setUrlQuery */.NY)({ @@ -12580,9 +12566,9 @@ var Ranking_competitionsPage = function competitionsPage(_ref) { })); case 2: case "end": - return _context5.stop(); + return _context4.stop(); } - }, _callee5); + }, _callee4); })); return _getexerport.apply(this, arguments); } @@ -12836,9 +12822,7 @@ var Ranking_competitionsPage = function competitionsPage(_ref) { className: Rankingmodules.left, children: /*#__PURE__*/(0,jsx_runtime.jsx)(menu/* default */.Z, { style: { - border: 'none', - width: 200, - overflow: 'auto' + border: 'none' }, mode: "horizontal", selectedKeys: ["".concat(selectedKeys)], @@ -13580,19 +13564,17 @@ var Team_competitionsPage = function competitionsPage(_ref) { children: "\u5BFC\u51FA" })] })] - }), /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomTable */.Gi, { - children: /*#__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 - }) + }), /*#__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 }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: Teammodules.countWrap, style: { @@ -13697,7 +13679,6 @@ var StudentTeam_excluded = ["competitions", "globalSetting", "loading", "dispatc - var StudentTeam_competitionsPage = function competitionsPage(_ref) { var _Header$permission, _Header$permission2, _competition_team$my_, _competition_team$my_2, _competition_team$my_3, _competition_team$my_4, _competition_team$com, _competition_team$my_5, _competition_team$com2, _TeamItem$team_member, _Team$name, _Team$name2; var competitions = _ref.competitions, @@ -14455,111 +14436,109 @@ var StudentTeam_competitionsPage = function competitionsPage(_ref) { className: "iconfont icon-danchuangguanbi" }) })] - }), /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomTable */.Gi, { + }), /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, { + dataSource: TeamItem === null || TeamItem === void 0 ? void 0 : TeamItem.team_members, + pagination: false, style: { marginTop: 30 }, - children: /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, { - dataSource: TeamItem === null || TeamItem === void 0 ? void 0 : TeamItem.team_members, - pagination: false, - scroll: { - y: 300 + scroll: { + y: 300 + }, + columns: [{ + title: '头像', + align: 'left', + dataIndex: 'image_url', + render: function render(text, item) { + return /*#__PURE__*/(0,jsx_runtime.jsx)("img", { + className: Teammodules.loaderimg, + src: env/* default.IMG_SERVER */.Z.IMG_SERVER + "/images/" + "".concat(text) + }); + } + }, { + title: '姓名', + align: 'left', + dataIndex: 'name', + render: function render(text) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + title: text, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: (text === null || text === void 0 ? void 0 : text.length) > 6 ? (text === null || text === void 0 ? void 0 : text.substring(0, 6)) + '...' : text || '- -' + }) + }); + } + }, { + title: '手机', + align: 'left', + dataIndex: 'phone', + ellipsis: { + showTitle: true }, - columns: [{ - title: '头像', - align: 'left', - dataIndex: 'image_url', - render: function render(text, item) { - return /*#__PURE__*/(0,jsx_runtime.jsx)("img", { - className: Teammodules.loaderimg, - src: env/* default.IMG_SERVER */.Z.IMG_SERVER + "/images/" + "".concat(text) - }); - } - }, { - title: '姓名', - align: 'left', - dataIndex: 'name', - render: function render(text) { - return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - title: text, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: (text === null || text === void 0 ? void 0 : text.length) > 6 ? (text === null || text === void 0 ? void 0 : text.substring(0, 6)) + '...' : text || '- -' - }) - }); - } - }, { - title: '手机', - align: 'left', - dataIndex: 'phone', - ellipsis: { - showTitle: true - }, - render: function render(text) { - return /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: text || '- -' - }); - } - }, { - title: '学校/单位', - align: 'left', - dataIndex: 'school_name', - render: function render(text, item) { - return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - title: text, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: (text === null || text === void 0 ? void 0 : text.length) > 6 ? (text === null || text === void 0 ? void 0 : text.substring(0, 6)) + '...' : text || '- -' - }) - }); - } - }, { - title: '职业', - align: 'left', - ellipsis: { - showTitle: true - }, - dataIndex: 'identity', - render: function render(text, item) { - return text || '- -'; - } - }, { - title: '学号', - align: 'left', - ellipsis: { - showTitle: true - }, - dataIndex: 'student_id', - render: function render(text, item) { - return text || '- -'; - } - }, { - title: '角色', - align: 'left', - dataIndex: 'role', - render: function render(text, item) { - return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + render: function render(text) { + return /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: text || '- -' + }); + } + }, { + title: '学校/单位', + align: 'left', + dataIndex: 'school_name', + render: function render(text, item) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + title: text, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: (text === null || text === void 0 ? void 0 : text.length) > 6 ? (text === null || text === void 0 ? void 0 : text.substring(0, 6)) + '...' : text || '- -' + }) + }); + } + }, { + title: '职业', + align: 'left', + ellipsis: { + showTitle: true + }, + dataIndex: 'identity', + render: function render(text, item) { + return text || '- -'; + } + }, { + title: '学号', + align: 'left', + ellipsis: { + showTitle: true + }, + dataIndex: 'student_id', + render: function render(text, item) { + return text || '- -'; + } + }, { + title: '角色', + align: 'left', + dataIndex: 'role', + render: function render(text, item) { + return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + style: { + color: text === 'leader' ? '#3061D0' : '#01795D' + }, + children: [text === "leader" ? '队长' : '队员', (item === null || item === void 0 ? void 0 : item.creator) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { style: { - color: text === 'leader' ? '#3061D0' : '#01795D' + color: '#FA6400', + display: 'inline-flex', + width: 48, + height: 22, + borderRadius: 4, + lineHeight: '22px', + background: '#FEEADC', + textAlign: 'center', + marginLeft: 10, + justifyContent: 'center', + fontSize: 12 }, - children: [text === "leader" ? '队长' : '队员', (item === null || item === void 0 ? void 0 : item.creator) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - style: { - color: '#FA6400', - display: 'inline-flex', - width: 48, - height: 22, - borderRadius: 4, - lineHeight: '22px', - background: '#FEEADC', - textAlign: 'center', - marginLeft: 10, - justifyContent: 'center', - fontSize: 12 - }, - children: "\u521B\u5EFA\u8005" - })] - }); - } - }] - }) + children: "\u521B\u5EFA\u8005" + })] + }); + } + }] })] }), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { title: false, @@ -14940,150 +14919,148 @@ var StudentTeam_competitionsPage = function competitionsPage(_ref) { children: [Staff && Staff.member_staff.minimum, "-", Staff && Staff.member_staff.maximum, "\u540D\u5B66\u751F"] }) : ''] }) - }), /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomTable */.Gi, { + }), /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, { + dataSource: EditTeamItem, + pagination: false, style: { marginTop: '-10px', padding: '0 8px' }, - children: /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, { - dataSource: EditTeamItem, - pagination: false, - scroll: { - y: 300 - }, - columns: [{ - title: '头像', - align: 'left', - width: 60, - dataIndex: 'image_url', - render: function render(text, item) { - return /*#__PURE__*/(0,jsx_runtime.jsx)("img", { - className: Teammodules.loaderimg, - src: env/* default.IMG_SERVER */.Z.IMG_SERVER + "/images/" + "".concat(text) - }); - } - }, { - title: '姓名', - align: 'left', - dataIndex: 'name', - render: function render(text) { - return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - title: text, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: (text === null || text === void 0 ? void 0 : text.length) > 6 ? (text === null || text === void 0 ? void 0 : text.substring(0, 6)) + '...' : text || '- -' - }) - }); - } - }, { - title: '手机', - align: 'left', - width: 130, - dataIndex: 'phone', - render: function render(text) { - return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - title: text, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: text || '- -' - }) - }); - } - }, { - title: '学校/单位', - align: 'left', - dataIndex: 'school_name', - render: function render(text, item) { - return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { - title: text, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: (text === null || text === void 0 ? void 0 : text.length) > 6 ? (text === null || text === void 0 ? void 0 : text.substring(0, 6)) + '...' : text || '- -' - }) - }); - } - }, { - title: '职业', - align: 'left', - dataIndex: 'identity', - render: function render(text, item) { - return text || '- -'; - } - }, { - title: '学号', - align: 'left', - dataIndex: 'student_id', - render: function render(text, item) { - return text || '- -'; - } - }, { - title: '角色', - align: 'left', - dataIndex: 'role', - render: function render(text, item) { - return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + scroll: { + y: 300 + }, + columns: [{ + title: '头像', + align: 'left', + width: 60, + dataIndex: 'image_url', + render: function render(text, item) { + return /*#__PURE__*/(0,jsx_runtime.jsx)("img", { + className: Teammodules.loaderimg, + src: env/* default.IMG_SERVER */.Z.IMG_SERVER + "/images/" + "".concat(text) + }); + } + }, { + title: '姓名', + align: 'left', + dataIndex: 'name', + render: function render(text) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + title: text, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: (text === null || text === void 0 ? void 0 : text.length) > 6 ? (text === null || text === void 0 ? void 0 : text.substring(0, 6)) + '...' : text || '- -' + }) + }); + } + }, { + title: '手机', + align: 'left', + width: 130, + dataIndex: 'phone', + render: function render(text) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + title: text, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: text || '- -' + }) + }); + } + }, { + title: '学校/单位', + align: 'left', + dataIndex: 'school_name', + render: function render(text, item) { + return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, { + title: text, + children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", { + children: (text === null || text === void 0 ? void 0 : text.length) > 6 ? (text === null || text === void 0 ? void 0 : text.substring(0, 6)) + '...' : text || '- -' + }) + }); + } + }, { + title: '职业', + align: 'left', + dataIndex: 'identity', + render: function render(text, item) { + return text || '- -'; + } + }, { + title: '学号', + align: 'left', + dataIndex: 'student_id', + render: function render(text, item) { + return text || '- -'; + } + }, { + title: '角色', + align: 'left', + dataIndex: 'role', + render: function render(text, item) { + return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + style: { + color: text === 'leader' ? '#3061D0' : '#01795D' + }, + children: [text === "leader" ? '队长' : '队员', (item === null || item === void 0 ? void 0 : item.creator) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { style: { - color: text === 'leader' ? '#3061D0' : '#01795D' + color: '#FA6400', + display: 'inline-flex', + width: 48, + height: 22, + borderRadius: 4, + lineHeight: '22px', + background: '#FEEADC', + textAlign: 'center', + marginLeft: 10, + justifyContent: 'center', + fontSize: 12 + }, + children: "\u521B\u5EFA\u8005" + })] + }); + } + }, { + title: '操作', + align: 'right', + width: 150, + dataIndex: 'role', + render: function render(text, items, index) { + return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { + style: { + color: '#3061D0' + }, + children: [text != "leader" && /*#__PURE__*/(0,jsx_runtime.jsx)("a", { + onClick: function onClick() { + var data = EditTeamItem; + var leaderindex = EditTeamItem && EditTeamItem.findIndex(function (item) { + return item.role === 'leader'; + }); + data[index].role = 'leader'; + data[leaderindex].role = data && data[leaderindex].is_teacher ? 'teacher' : 'member'; + //排序 规则为 队长永远只第一位 创建者只第二位 + var datas = data.sort(function (item, item1) { + return item.creator ? -1 : 1; + }).sort(function (item, item1) { + return item.role === 'leader' ? -1 : 1; + }); + setEditTeamItem(toConsumableArray_default()(datas)); + leaderidRef.current = items.id; + }, + children: "\u8BBE\u7F6E\u961F\u957F" + }), text != "leader" && /*#__PURE__*/(0,jsx_runtime.jsx)("a", { + onClick: function onClick() { + var data = EditTeamItem && EditTeamItem.filter(function (item) { + return item.id != items.id; + }); + setEditTeamItem(toConsumableArray_default()(data)); }, - children: [text === "leader" ? '队长' : '队员', (item === null || item === void 0 ? void 0 : item.creator) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - style: { - color: '#FA6400', - display: 'inline-flex', - width: 48, - height: 22, - borderRadius: 4, - lineHeight: '22px', - background: '#FEEADC', - textAlign: 'center', - marginLeft: 10, - justifyContent: 'center', - fontSize: 12 - }, - children: "\u521B\u5EFA\u8005" - })] - }); - } - }, { - title: '操作', - align: 'right', - width: 150, - dataIndex: 'role', - render: function render(text, items, index) { - return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", { style: { - color: '#3061D0' + marginLeft: 20 }, - children: [text != "leader" && /*#__PURE__*/(0,jsx_runtime.jsx)("a", { - onClick: function onClick() { - var data = EditTeamItem; - var leaderindex = EditTeamItem && EditTeamItem.findIndex(function (item) { - return item.role === 'leader'; - }); - data[index].role = 'leader'; - data[leaderindex].role = data && data[leaderindex].is_teacher ? 'teacher' : 'member'; - //排序 规则为 队长永远只第一位 创建者只第二位 - var datas = data.sort(function (item, item1) { - return item.creator ? -1 : 1; - }).sort(function (item, item1) { - return item.role === 'leader' ? -1 : 1; - }); - setEditTeamItem(toConsumableArray_default()(datas)); - leaderidRef.current = items.id; - }, - children: "\u8BBE\u7F6E\u961F\u957F" - }), text != "leader" && /*#__PURE__*/(0,jsx_runtime.jsx)("a", { - onClick: function onClick() { - var data = EditTeamItem && EditTeamItem.filter(function (item) { - return item.id != items.id; - }); - setEditTeamItem(toConsumableArray_default()(data)); - }, - style: { - marginLeft: 20 - }, - children: "\u5220\u9664" - })] - }); - } - }] - }) + children: "\u5220\u9664" + })] + }); + } + }] }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: Teammodules.bottom, children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.Z, { @@ -15467,7 +15444,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { }, [Header]); var columns = [{ title: '序号', - align: 'center', + align: 'left', dataIndex: 'name', width: 80, render: function render(text, item, index) { @@ -15477,7 +15454,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { } }, { title: '参赛人', - align: 'center', + align: 'left', dataIndex: 'name', width: 120, ellipsis: { @@ -15492,7 +15469,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { } }, { title: '个人成绩', - align: 'center', + align: 'left', width: 100, dataIndex: 'score', render: function render(text) { @@ -15502,7 +15479,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { } }, { title: '角色', - align: 'center', + align: 'left', width: 100, dataIndex: 'identity', render: function render(text) { @@ -15512,7 +15489,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { } }, { title: '手机号', - align: 'center', + align: 'left', width: 120, dataIndex: 'phone', render: function render(text) { @@ -15522,7 +15499,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { } }, { title: '学号/工号', - align: 'center', + align: 'left', dataIndex: 'student_id', width: 120, ellipsis: { @@ -15537,7 +15514,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { } }, { title: '学校/单位', - align: 'center', + align: 'left', dataIndex: 'school', ellipsis: { showTitle: false @@ -15551,7 +15528,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { } }, { title: '地区', - align: 'center', + align: 'left', dataIndex: 'province', width: 100, ellipsis: { @@ -15566,7 +15543,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { } }, { title: '操作', - align: 'center', + align: 'right', dataIndex: 'is_cancel_score', width: 100, render: function render(text, item) { @@ -15715,7 +15692,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { }, children: [Header !== null && Header !== void 0 && Header.personal ? /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { - padding: '20px 30px', + padding: '20px', width: '100%' }, children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", { @@ -15763,6 +15740,7 @@ var Edit_Team_competitionsPage = function competitionsPage(_ref) { marginTop: 20 }, columns: columns, + bordered: false, dataSource: userList === null || userList === void 0 ? void 0 : userList.data, pagination: false }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { diff --git a/p__Competitions__Edit__index.chunk.css b/p__Competitions__Edit__index.chunk.css index cc1933fcaa..d7764ef196 100644 --- a/p__Competitions__Edit__index.chunk.css +++ b/p__Competitions__Edit__index.chunk.css @@ -4476,6 +4476,7 @@ span.CodeMirror-selectedtext { .PerfectCent___HD3Id .PerfectCentName___smdJX { width: 56px; text-align: right; + color: #5f6368; } .teamItem___mx2f3 { display: flex; diff --git a/p__Competitions__Index__index.async.js b/p__Competitions__Index__index.async.js index e3d98ba292..954816193e 100644 --- a/p__Competitions__Index__index.async.js +++ b/p__Competitions__Index__index.async.js @@ -1287,7 +1287,7 @@ var Index_competitionsPage = function competitionsPage(_ref) { _context3.next = 31; break; } - (0,util/* openNewWindow */.xg)(url); + (0,util/* openNewWindow */.xg)("/competitions/detail/".concat(item.identifier, "?type=1")); return _context3.abrupt("return"); case 31: if (!(item.teacher_need_phone || item.member_need_phone)) { @@ -1755,7 +1755,7 @@ var Index_competitionsPage = function competitionsPage(_ref) { tab: "\u8FDB\u884C\u4E2D" }, "progressing"), /*#__PURE__*/(0,jsx_runtime.jsx)(Index_TabPane, { tab: "\u5F80\u671F\u6BD4\u8D5B" - }, "ended"), /*#__PURE__*/(0,jsx_runtime.jsx)(Index_TabPane, { + }, "ended"), user.userInfo.user_id !== 2 && /*#__PURE__*/(0,jsx_runtime.jsx)(Index_TabPane, { tab: "\u6211\u7684\u7ADE\u8D5B" }, "mine"), (0,authority/* isSuperAdmins */.Ny)() && /*#__PURE__*/(0,jsx_runtime.jsx)(Index_TabPane, { tab: "\u6570\u636E\u7EDF\u8BA1"