Skip to content

GitLab

Unverified Commit 3ec26b40 authored by liuzhe-lz's avatar liuzhe-lz Committed by GitHub
Browse files

Merge master into dev-retiarii (#3178)

parent d165905d
Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 250 deletions
ts/webui/src/static/model/trialmanager.ts
View file @ 3ec26b40
...@@ -171,6 +171,7 @@ class TrialManager { ...@@ -171,6 +171,7 @@ class TrialManager {
let updated = false; let updated = false;
requestAxios(`${MANAGER_IP}/trial-jobs`) requestAxios(`${MANAGER_IP}/trial-jobs`)
.then(data => { .then(data => {
this.trialJobList = data;
for (const trialInfo of data as TrialJobInfo[]) { for (const trialInfo of data as TrialJobInfo[]) {
if (this.trials.has(trialInfo.trialJobId)) { if (this.trials.has(trialInfo.trialJobId)) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
......
ts/webui/src/static/style/overview/command.scss
View file @ 3ec26b40
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.basic { .basic {
.lineMargin { .lineMargin {
margin-top: 20px; margin-top: 24px;
font-weight: normal; font-weight: normal;
} }
} }
ts/webui/src/static/style/overview/count.scss
View file @ 3ec26b40
$seriesIconMargin: 10px; $seriesIconMargin: 10px;
$margin: 24px;
.marginTop {
margin-top: $margin;
}
.ExpDuration { .ExpDuration {
margin-top: 20px; margin-top: $margin;
.maxTrialNum { .maxTrialNum {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.exp-progress { .exp-progress {
margin-top: 16px; margin-top: 9px;
.bold {
font-weight: 500;
}
.bold { .joiner {
font-weight: 500; padding: 0 3px;
} }
}
.joiner { .status-count {
padding: 0 3px; span {
} font-size: 14px;
color: #8f8f8f;
}
p {
font-size: 16px;
font-weight: 500;
color: #484848;
}
} }
.maxTrialNum { .maxTrialNum {
.editparam { .editparam {
position: relative; position: relative;
top: -7px; top: -7px;
} }
} }
.noEditDuration { .noEditDuration {
position: relative; position: relative;
top: -7px; top: -7px;
} }
.editDuration { .editDuration {
position: relative; position: relative;
top: -17px; top: -4px;
} }
.concurrency {
.editparam {
margin-top: 5px;
}
}
.editparam { .editparam {
&-Input { &-Input {
width: 42px; width: 42px;
height: 32px; height: 32px;
padding-right: 5px; padding-right: 5px;
text-align: right; text-align: right;
outline: none; outline: none;
border: none; border: none;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.maxExecDuration { .maxExecDuration {
width: 36px; width: 36px;
} }
&-dropdown { &-dropdown {
width: 65px; width: 65px;
display: inline-block; display: inline-block;
position: relative; position: relative;
top: 13px; top: 13px;
left: 4px; left: 4px;
margin-right: 3px; margin-right: 3px;
.ms-Dropdown-title { .ms-Dropdown-title {
padding-right: 0; padding-right: 0;
} }
} }
} }
.series { .series {
position: relative; position: relative;
top: 5px; top: 5px;
i { i {
font-size: 20px; font-size: 20px;
font-weight: 700; font-weight: 700;
} }
.confirm { .confirm {
margin: 0 $seriesIconMargin; margin: 0 $seriesIconMargin;
i { i {
color: green; color: green;
} }
} }
} }
.cancel i { .cancel i {
color: red; color: red;
font-size: 16px; font-size: 16px;
} }
.edit i { .edit i {
margin-left: 4px; margin-left: 4px;
} }
.overview input:disabled { .overview input:disabled {
background: transparent; background: transparent;
border: none; border: none;
} }
.info { .info {
position: absolute; position: absolute;
z-index: 999; z-index: 999;
left: 0; left: 0;
}
.mess {
margin-top: 20px;
.basic p {
margin-top: 0;
}
p.margin {
margin-top: 20px;
}
}
.trialStatus {
margin-top: 8px;
} }
ts/webui/src/static/style/overview/overview.scss
View file @ 3ec26b40
$boxPadding: 20px; $boxPadding: 24px;
$boxBorderRadius: 5px; $boxBorderRadius: 5px;
$boxGapPadding: 10px; $boxGapPadding: 10px;
.wrapper { .wrapper {
display: grid; display: grid;
grid-template-columns: repeat(8, 1fr); grid-template-columns: repeat(8, 1fr);
grid-auto-rows: 93px; grid-auto-rows: 102px;
> div { > div {
background: #fff; background: #fff;
padding: $boxPadding; padding: $boxPadding;
border-radius: $boxBorderRadius; border-radius: $boxBorderRadius;
box-sizing: border-box; box-sizing: border-box;
} }
.duration, .duration,
.trialCount { .trialCount {
grid-column: 1 / 5; grid-column: 1 / 5;
background: #fff; background: #fff;
padding: $boxPadding; padding: $boxPadding;
border-radius: $boxBorderRadius; border-radius: $boxBorderRadius;
box-sizing: border-box; box-sizing: border-box;
margin-top: $boxGapPadding; margin-top: $boxGapPadding;
/* for alert message tooltip position */ /* for alert message tooltip position */
position: relative; position: relative;
} }
.duration { .duration {
grid-row: 3 / 5; grid-row: 3 / 5;
height: 138px; height: 158px;
} }
.trialCount { .trialCount {
grid-row: 4 / 6; grid-row: 5 / 8;
margin-top: 65px; margin-top: -26px;
height: 239px; height: 273px;
} }
.overviewCommand1, .overviewCommand {
.overviewCommand2 { grid-column: 1 / 5;
grid-row-start: 8; grid-row-start: 8;
margin-top: -59px; margin-top: -50px;
margin-right: $boxGapPadding; height: 158px;
border-radius: 0; margin-right: $boxGapPadding;
} border-radius: $boxBorderRadius;
}
.overviewCommand1 {
grid-column: 1 / 5;
border-radius: $boxBorderRadius 0 0 $boxBorderRadius;
}
.overviewCommand2 {
grid-column: 2 / 5;
margin-right: $boxGapPadding;
padding-left: 30px;
border-radius: 0 $boxBorderRadius $boxBorderRadius 0;
}
} }
.overviewBasicInfo { .overviewBasicInfo {
grid-column: 1 / 5; grid-column: 1 / 5;
grid-row: 1 / 3; grid-row: 1 / 3;
z-index: 2; z-index: 2;
} }
.overviewBasicInfo, .overviewBasicInfo,
.duration, .duration,
.trialCount { .trialCount {
margin-right: $boxGapPadding; margin-right: $boxGapPadding;
} }
.basic { .basic {
line-height: 21px; line-height: 21px;
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif; font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
p { p {
font-size: 14px; color: #8f8f8f;
color: #8f8f8f; font-size: 14px;
margin-top: 20px; font-weight: normal;
span { span {
color: #484848; color: #484848;
} }
} }
div { div {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: #484848; color: #484848;
} }
.nowrap { .nowrap {
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
} }
.overviewBestMetric { .overviewBestMetric {
grid-column: 5 / 9; grid-column: 5 / 9;
grid-row: 1 / 9; grid-row: 1 / 10;
max-height: 736px; max-height: 822px;
overflow: hidden; overflow: hidden;
.topTrialTitle { .topTrialTitle {
width: 72%; width: 72%;
} }
.active { .active {
background: #d2d0ce; background: #d2d0ce;
} }
.max { .max {
margin-left: 7px; margin-left: 7px;
} }
.mincenter { .mincenter {
margin: 0 13px 0 $boxGapPadding; margin: 0 13px 0 $boxGapPadding;
} }
.chooseEntry { .chooseEntry {
margin-right: $boxGapPadding; margin-right: $boxGapPadding;
line-height: 30px; line-height: 30px;
} }
} }
.overviewCommand1, .overviewCommand1,
.overviewCommand2 { .overviewCommand2 {
grid-row: 7 / 9; grid-row: 7 / 9;
height: 144px; height: 144px;
overflow: hidden; overflow: hidden;
margin-top: $boxGapPadding; margin-top: $boxGapPadding;
} }
.overviewChart { .overviewChart {
margin-top: 20px; margin-top: 20px;
} }
.defaultMetricContainer { .defaultMetricContainer {
position: relative; position: relative;
.showMess { .showMess {
position: absolute; position: absolute;
top: 42%; top: 42%;
left: 48%; left: 48%;
} }
} }
ts/webui/src/static/style/overview/panel.scss
View file @ 3ec26b40
$buttonBorderRadius: 23px; $buttonBorderRadius: 23px;
.config { .config {
position: fixed; position: fixed;
right: 0; right: 0;
z-index: 1000; z-index: 1000;
.ms-Button--default {
padding: 0 8px;
margin-bottom: 12px;
border: none;
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.08);
border-radius: $buttonBorderRadius 0 0 $buttonBorderRadius;
font-size: 12px;
text-align: left;
.ms-Button-label {
font-weight: normal;
}
}
.integralBtn { .ms-Button--default {
display: none; padding: 0 8px;
} margin-bottom: 12px;
border: none;
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.08);
border-radius: $buttonBorderRadius 0 0 $buttonBorderRadius;
font-size: 12px;
text-align: left;
.ms-Button-label {
font-weight: normal;
}
}
.integralBtn {
display: none;
}
.margin {
margin-left: 10px;
}
.margin {
margin-left: 10px;
}
} }
.container { .container {
text-align: right; text-align: right;
.icon { .icon {
min-width: 50px; min-width: 50px;
i { i {
font-size: 16px; font-size: 16px;
} }
} }
&:hover { .maxScrBtn {
.icon { width: 150px;
display: none;
} &:hover {
color: #fff;
.integralBtn { border: 1px solid blue;
display: block; background-color: #0071bc;
color: #fff; }
border: 1px solid blue; }
background-color: #0071bc;
.configBtn i{
i { margin-left: -40px;
font-size: 14px;
}
}
} }
.logBtn i {
margin-left: -25px;
}
&:hover {
.icon {
display: none;
}
.integralBtn {
display: block;
color: #fff;
border: 1px solid blue;
background-color: #0071bc;
i {
font-size: 14px;
}
}
}
} }
.ms-Fabric { .ms-Fabric {
.ms-Panel-commands { .ms-Panel-commands {
margin: 0; margin: 0;
} }
} }
ts/webui/src/static/style/succTable.scss
View file @ 3ec26b40
$tableHeight: 381px; $tableHeight: 432px;
.scrollPanel { .scrollPanel {
height: $tableHeight; height: $tableHeight;
......
ts/webui/yarn.lock
View file @ 3ec26b40
...@@ -4067,6 +4067,11 @@ css-loader@2.1.1: ...@@ -4067,6 +4067,11 @@ css-loader@2.1.1:
postcss-value-parser "^3.3.0" postcss-value-parser "^3.3.0"
schema-utils "^1.0.0" schema-utils "^1.0.0"
   
css-mediaquery@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/css-mediaquery/-/css-mediaquery-0.1.2.tgz#6a2c37344928618631c54bd33cedd301da18bea0"
integrity sha1-aiw3NEkoYYYxxUvTPO3TAdoYvqA=
css-prefers-color-scheme@^3.1.1: css-prefers-color-scheme@^3.1.1:
version "3.1.1" version "3.1.1"
resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4" resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4"
...@@ -6574,6 +6579,11 @@ humanize-ms@^1.2.1: ...@@ -6574,6 +6579,11 @@ humanize-ms@^1.2.1:
dependencies: dependencies:
ms "^2.0.0" ms "^2.0.0"
   
hyphenate-style-name@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.5: iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.5:
version "0.4.24" version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
...@@ -8495,6 +8505,13 @@ markdown-table@^2.0.0: ...@@ -8495,6 +8505,13 @@ markdown-table@^2.0.0:
dependencies: dependencies:
repeat-string "^1.0.0" repeat-string "^1.0.0"
   
matchmediaquery@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/matchmediaquery/-/matchmediaquery-0.3.1.tgz#8247edc47e499ebb7c58f62a9ff9ccf5b815c6d7"
integrity sha512-Hlk20WQHRIm9EE9luN1kjRjYXAQToHOIAHPJn9buxBwuhfTHoKUcX+lXBbxc85DVQfXYbEQ4HcwQdd128E3qHQ==
dependencies:
css-mediaquery "^0.1.2"
mathml-tag-names@^2.1.3: mathml-tag-names@^2.1.3:
version "2.1.3" version "2.1.3"
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
...@@ -11117,6 +11134,16 @@ react-pagination@^1.0.0: ...@@ -11117,6 +11134,16 @@ react-pagination@^1.0.0:
dependencies: dependencies:
react "^0.13.3" react "^0.13.3"
   
react-responsive@^8.1.1:
version "8.1.1"
resolved "https://registry.yarnpkg.com/react-responsive/-/react-responsive-8.1.1.tgz#e4b1bd677798deecb4f1c3cff35a020ca0abdb27"
integrity sha512-kvgOGU4m64ALsDiNKgImW6xtbdx/aSuw8sTCHC8RsBlkXsDA/gMoZkYboZuk4V9DhX6bCFh4gBH2UqlYVPLvcA==
dependencies:
hyphenate-style-name "^1.0.0"
matchmediaquery "^0.3.0"
prop-types "^15.6.1"
shallow-equal "^1.1.0"
react-router-dom@^5.2.0: react-router-dom@^5.2.0:
version "5.2.0" version "5.2.0"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662" resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.2.0.tgz#9e65a4d0c45e13289e66c7b17c7e175d0ea15662"
...@@ -12049,6 +12076,11 @@ shallow-clone@^1.0.0: ...@@ -12049,6 +12076,11 @@ shallow-clone@^1.0.0:
kind-of "^5.0.0" kind-of "^5.0.0"
mixin-object "^2.0.1" mixin-object "^2.0.1"
   
shallow-equal@^1.1.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
integrity sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==
shebang-command@^1.2.0: shebang-command@^1.2.0:
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment