diff --git a/color.less b/color.less index 1b3b48f6ea..59c95dae86 100644 --- a/color.less +++ b/color.less @@ -89,7 +89,7 @@ html {--antd-wave-shadow-color: @primary-color;} .ant-alert-info .ant-alert-icon {color: @primary-color;} .ant-alert-warning {background-color: color(~`colorPalette("@{warning-color}", 1)`);border: 1px solid color(~`colorPalette("@{warning-color}", 3)`);} .ant-alert-warning .ant-alert-icon {color: @warning-color;} -.ant-alert-error {background-color: color(~`colorPalette("@{error-color}", 1)`);border: 1px solid color(~`colorPalette("@{error-color}", 3)`);} +.ant-alert-error {background-color: color(~`colorPalette("@{modal-close-color}", 1)`);border: 1px solid color(~`colorPalette("@{error-color}", 3)`);} .ant-alert-error .ant-alert-icon {color: @error-color;} .ant-alert-close-icon {background-color: transparent;border: none;} .ant-alert-close-icon .anticon-close {color: @text-color-secondary;} @@ -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(75, 110, 181, 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(186, 191, 127, 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(158, 170, 28, 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(228, 245, 5, 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(75, 110, 181, 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(186, 191, 127, 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(158, 170, 28, 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(228, 245, 5, 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(75, 110, 181, 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(186, 191, 127, 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(158, 170, 28, 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(228, 245, 5, 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(75, 110, 181, 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(186, 191, 127, 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(158, 170, 28, 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(228, 245, 5, 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(75, 110, 181, 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(186, 191, 127, 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(158, 170, 28, 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(228, 245, 5, 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(75, 110, 181, 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(186, 191, 127, 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(158, 170, 28, 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(228, 245, 5, 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(75, 110, 181, 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(186, 191, 127, 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(158, 170, 28, 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(228, 245, 5, 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,9 +1636,9 @@ 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("@{link-color}", 5)`);border-color: #ffadd2;} +.ant-tag-pink {color: #c41d7f;background: #fff0f6;border-color: #ffadd2;} .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-magenta {color: #c41d7f;background: color(~`colorPalette("@{link-color}", 5)`);border-color: #ffadd2;} +.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: #fff1f0;border-color: #ffa39e;} .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;} @@ -1664,7 +1664,7 @@ tr.ant-table-expanded-row:hover > td {background: #fbfbfb;} .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-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-error {color: @error-color;background: color(~`colorPalette("@{modal-close-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)`);} .ant-timeline {color: @text-color;} .ant-timeline-item-tail {border-left: 2px solid #f0f0f0;} @@ -1896,7 +1896,7 @@ a.ant-typography.ant-typography-disabled:hover, .ant-typography a.ant-typography .ant-upload-list-picture .ant-upload-list-item-error, .ant-upload-list-picture-card .ant-upload-list-item-error {border-color: @error-color;} .ant-upload-list-picture .ant-upload-list-item:hover .ant-upload-list-item-info, .ant-upload-list-picture-card .ant-upload-list-item:hover .ant-upload-list-item-info {background: transparent;} .ant-upload-list-picture .ant-upload-list-item-uploading, .ant-upload-list-picture-card .ant-upload-list-item-uploading {border-style: dashed;} -.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: color(~`colorPalette("@{error-color}", 1)`);} +.ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#e6f7ff'] {fill: color(~`colorPalette("@{modal-close-color}", 1)`);} .ant-upload-list-picture .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'], .ant-upload-list-picture-card .ant-upload-list-item-error .ant-upload-list-item-thumbnail .anticon svg path[fill='#1890ff'] {fill: @error-color;} .ant-upload-list-picture-card .ant-upload-list-item-info::before {background-color: rgba(0, 0, 0, 0.5);} .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-eye, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-download, .ant-upload-list-picture-card .ant-upload-list-item-actions .anticon-delete {color: rgba(255, 255, 255, 0.85);} diff --git a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js index eccf54c74f..47b44d621d 100644 --- a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js @@ -6160,7 +6160,7 @@ var LikeOutlined = __webpack_require__(65429); moment_default().locale('ZH-cn'); var ShixunsListPage = function ShixunsListPage(_ref) { - var _workDetail$shixun_in3, _workDetail$shixun_in5, _workDetail$shixun_in6; + var _workDetail$shixun_in3, _workDetail$shixun_in4, _workDetail$shixun_in5; var shixunHomeworks = _ref.shixunHomeworks, classroomList = _ref.classroomList, user = _ref.user, @@ -6327,18 +6327,12 @@ var ShixunsListPage = function ShixunsListPage(_ref) { value: (workDetail === null || workDetail === void 0 ? void 0 : workDetail.description) || '暂无～' }), (workDetail === null || workDetail === void 0 ? void 0 : (_workDetail$shixun_in3 = workDetail.shixun_info) === null || _workDetail$shixun_in3 === void 0 ? void 0 : _workDetail$shixun_in3.shixun_status) !== -1 && (workDetail === null || workDetail === void 0 ? void 0 : workDetail.is_shixun) && /*#__PURE__*/(0,jsx_runtime.jsxs)(es_button/* default */.Z, { onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() { - var _workDetail$shixun_in4; return regeneratorRuntime_default()().wrap(function _callee2$(_context2) { while (1) switch (_context2.prev = _context2.next) { case 0: - _context2.next = 2; - return (0,shixuns/* updateShixunStudyNum */.pJ)({ - id: workDetail === null || workDetail === void 0 ? void 0 : (_workDetail$shixun_in4 = workDetail.shixun_info) === null || _workDetail$shixun_in4 === void 0 ? void 0 : _workDetail$shixun_in4.identifier, - enter_type: 2 - }); - case 2: + // await updateShixunStudyNum({id: workDetail?.shixun_info?.identifier, enter_type: 2}); handleStartGame(); - case 3: + case 1: case "end": return _context2.stop(); } @@ -6348,7 +6342,7 @@ var ShixunsListPage = function ShixunsListPage(_ref) { type: "primary", children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", { className: "iconfont icon-jixutiaozhan mr10 font14" - }), workDetail === null || workDetail === void 0 ? void 0 : (_workDetail$shixun_in5 = workDetail.shixun_info) === null || _workDetail$shixun_in5 === void 0 ? void 0 : (_workDetail$shixun_in6 = _workDetail$shixun_in5.task_operation) === null || _workDetail$shixun_in6 === void 0 ? void 0 : _workDetail$shixun_in6[0]] + }), workDetail === null || workDetail === void 0 ? void 0 : (_workDetail$shixun_in4 = workDetail.shixun_info) === null || _workDetail$shixun_in4 === void 0 ? void 0 : (_workDetail$shixun_in5 = _workDetail$shixun_in4.task_operation) === null || _workDetail$shixun_in5 === void 0 ? void 0 : _workDetail$shixun_in5[0]] })] }), /*#__PURE__*/(0,jsx_runtime.jsx)(FileDownloadList/* default */.Z, { authority: (0,authority/* isAdmin */.GJ)(), diff --git a/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js b/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js index b9f1a4b1b1..043ae7b607 100644 --- a/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js +++ b/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js @@ -8022,14 +8022,10 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { } return _context4.abrupt("return"); case 2: - _context4.next = 4; - return (0,shixuns/* updateShixunStudyNum */.pJ)({ - id: workList.shixun_identifier, - enter_type: 2 - }); - case 4: + // await updateShixunStudyNum({id: workList.shixun_identifier, enter_type: 2}); + (_shixunHomeworks$work5 = shixunHomeworks.workList) !== null && _shixunHomeworks$work5 !== void 0 && (_shixunHomeworks$work6 = _shixunHomeworks$work5.task_operation) !== null && _shixunHomeworks$work6 !== void 0 && (_shixunHomeworks$work7 = _shixunHomeworks$work6[1]) !== null && _shixunHomeworks$work7 !== void 0 && _shixunHomeworks$work7.includes('/') ? handleStartShixun((_shixunHomeworks$work8 = shixunHomeworks.workList) === null || _shixunHomeworks$work8 === void 0 ? void 0 : (_shixunHomeworks$work9 = _shixunHomeworks$work8.task_operation) === null || _shixunHomeworks$work9 === void 0 ? void 0 : _shixunHomeworks$work9[1]) : (0,util/* openNewWindow */.xg)("/tasks/".concat((_shixunHomeworks$work10 = shixunHomeworks.workList) === null || _shixunHomeworks$work10 === void 0 ? void 0 : (_shixunHomeworks$work11 = _shixunHomeworks$work10.task_operation) === null || _shixunHomeworks$work11 === void 0 ? void 0 : _shixunHomeworks$work11[1])); - case 5: + case 3: case "end": return _context4.stop(); } @@ -8094,22 +8090,13 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) { return regeneratorRuntime_default()().wrap(function _callee5$(_context5) { while (1) switch (_context5.prev = _context5.next) { case 0: - if (!(0,authority/* isStudent */.dE)()) { - _context5.next = 6; - break; + if ((0,authority/* isStudent */.dE)()) { + // await updateShixunStudyNum({id: workList.shixun_identifier, enter_type: 2}); + handleStartShixun((_shixunHomeworks$work20 = shixunHomeworks.workList) === null || _shixunHomeworks$work20 === void 0 ? void 0 : (_shixunHomeworks$work21 = _shixunHomeworks$work20.task_operation) === null || _shixunHomeworks$work21 === void 0 ? void 0 : _shixunHomeworks$work21[1]); + } else { + (0,util/* openNewWindow */.xg)("/shixuns/".concat(workList.shixun_identifier, "/challenges")); } - _context5.next = 3; - return (0,shixuns/* updateShixunStudyNum */.pJ)({ - id: workList.shixun_identifier, - enter_type: 2 - }); - case 3: - handleStartShixun((_shixunHomeworks$work20 = shixunHomeworks.workList) === null || _shixunHomeworks$work20 === void 0 ? void 0 : (_shixunHomeworks$work21 = _shixunHomeworks$work20.task_operation) === null || _shixunHomeworks$work21 === void 0 ? void 0 : _shixunHomeworks$work21[1]); - _context5.next = 7; - break; - case 6: - (0,util/* openNewWindow */.xg)("/shixuns/".concat(workList.shixun_identifier, "/challenges")); - case 7: + case 1: case "end": return _context5.stop(); } diff --git a/p__Classrooms__Lists__ShixunHomeworks__index.async.js b/p__Classrooms__Lists__ShixunHomeworks__index.async.js index 905f641edd..cf33286302 100644 --- a/p__Classrooms__Lists__ShixunHomeworks__index.async.js +++ b/p__Classrooms__Lists__ShixunHomeworks__index.async.js @@ -3351,8 +3351,6 @@ var TooltipTags = __webpack_require__(21470); var exercise = __webpack_require__(51412); // EXTERNAL MODULE: ./src/utils/shixunExec.tsx var shixunExec = __webpack_require__(76943); -// EXTERNAL MODULE: ./src/service/shixuns.ts -var shixuns = __webpack_require__(56088); ;// CONCATENATED MODULE: ./src/pages/Classrooms/Lists/ShixunHomeworks/components/ShixunList.tsx @@ -3383,7 +3381,6 @@ var shixuns = __webpack_require__(56088); - var ShixunList = function ShixunList(_ref) { @@ -3672,12 +3669,8 @@ var ShixunList = function ShixunList(_ref) { } return _context3.abrupt("return"); case 3: - _context3.next = 5; - return (0,shixuns/* updateShixunStudyNum */.pJ)({ - id: v.shixun_identifier, - enter_type: 2 - }); - case 5: + // await updateShixunStudyNum({id: v.shixun_identifier, enter_type: 2}); + if (v.redo) { modal/* default.info */.Z.info({ width: 530, @@ -3732,7 +3725,7 @@ var ShixunList = function ShixunList(_ref) { courseId: params.coursesId }); } - case 6: + case 4: case "end": return _context3.stop(); } diff --git a/p__Shixuns__Detail__id.async.js b/p__Shixuns__Detail__id.async.js index f704efe465..2adfd1223c 100644 --- a/p__Shixuns__Detail__id.async.js +++ b/p__Shixuns__Detail__id.async.js @@ -1529,24 +1529,19 @@ var Banner = function Banner(_ref) { case 0: setShowStatrButton(false); if (!(execRes !== null && execRes !== void 0 && execRes.game_identifier)) { - _context5.next = 6; + _context5.next = 4; break; } - _context5.next = 4; - return (0,shixuns/* updateShixunStudyNum */.pJ)({ - id: shixunId.current, - enter_type: 1 - }); - case 4: + // await updateShixunStudyNum({id: shixunId.current, enter_type: 1}); window.location.href = "/tasks/".concat(execRes.game_identifier); return _context5.abrupt("return"); - case 6: + case 4: if ((execRes === null || execRes === void 0 ? void 0 : execRes.status) === 2) { handleResetGame(execRes === null || execRes === void 0 ? void 0 : execRes.message); } else if ((execRes === null || execRes === void 0 ? void 0 : execRes.status) === 3) { handleInBeta(execRes === null || execRes === void 0 ? void 0 : execRes.message); } - case 7: + case 5: case "end": return _context5.stop(); } diff --git a/umi.js b/umi.js index 8390542f07..89986c7aba 100644 --- a/umi.js +++ b/umi.js @@ -65748,7 +65748,6 @@ function _getFileRepeatDetail() { /* harmony export */ "n5": function() { return /* binding */ getChallengesData; }, /* harmony export */ "nu": function() { return /* binding */ getFileContents; }, /* harmony export */ "p0": function() { return /* binding */ deleteGitFiles; }, -/* harmony export */ "pJ": function() { return /* binding */ updateShixunStudyNum; }, /* harmony export */ "q0": function() { return /* binding */ getChallengesEdit; }, /* harmony export */ "q9": function() { return /* binding */ activeWithTPM; }, /* harmony export */ "qA": function() { return /* binding */ saveWithTPM; }, @@ -65769,7 +65768,7 @@ function _getFileRepeatDetail() { /* harmony export */ "zD": function() { return /* binding */ challengeMoveUp; }, /* harmony export */ "zH": function() { return /* binding */ resetWithTPM; } /* harmony export */ }); -/* unused harmony exports mirrorAppliesDeleteImage, mirrorAppliesExtendVnc, mirrorAppliesResetVncLink */ +/* unused harmony exports mirrorAppliesDeleteImage, mirrorAppliesExtendVnc, mirrorAppliesResetVncLink, updateShixunStudyNum */ /* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/regeneratorRuntime.js */ 17061); /* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_objectSpread2_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/objectSpread2.js */ 42122); @@ -67959,13 +67958,13 @@ function updateShixunStudyNum(_x106) { return _updateShixunStudyNum.apply(this, arguments); } function _updateShixunStudyNum() { - _updateShixunStudyNum = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_2___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee106(params) { - return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().wrap(function _callee106$(_context106) { + _updateShixunStudyNum = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee106(params) { + return _regeneratorRuntime().wrap(function _callee106$(_context106) { while (1) switch (_context106.prev = _context106.next) { case 0: - return _context106.abrupt("return", (0,_utils_fetch__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP)("/api/shixuns/".concat(params.id, "/update_shixun_study_num.json"), { + return _context106.abrupt("return", Fetch("/api/shixuns/".concat(params.id, "/update_shixun_study_num.json"), { method: 'post', - body: _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_helpers_objectSpread2_js__WEBPACK_IMPORTED_MODULE_1___default()({}, params) + body: _objectSpread({}, params) })); case 1: case "end":