diff --git a/nezha-fronted/src/assets/css/components/cli/webSSHNew.scss b/nezha-fronted/src/assets/css/components/cli/webSSHNew.scss index 33500031a..770d8caea 100644 --- a/nezha-fronted/src/assets/css/components/cli/webSSHNew.scss +++ b/nezha-fronted/src/assets/css/components/cli/webSSHNew.scss @@ -96,6 +96,64 @@ } } } + + .webshell-selectAsset{ + .el-dialog__header{ + box-sizing: border-box; + height: 48px; + padding: 0 20px; + display: flex; + align-items: center; + position: relative; + border-bottom: 1px solid $--web-ssh-border-bottom-color2; + .el-dialog__headerbtn{ + top: 0; + bottom: 0; + margin: auto; + display: flex; + align-items: center; + } + } + .header-el-dropdown{ + width: 86px; + height: 32px; + line-height: 32px; + border: 1px solid $--border-color-light; + border-right: none; + box-sizing: border-box; + padding: 0 8px; + .el-dropdown-link{ + width: 100%; + display: flex; + justify-content: space-between; + & span:first-of-type{ + color: $--color-text-primary; + } + i.el-icon--right{ + margin-left: 0; + color: #999; + } + } + } + .header-el-dropdown+.el-input{ + border-radius: 0 2px 2px 0; + } + .el-dialog__footer{ + padding: 15px 20px; + border-top: 1px solid $--web-ssh-border-bottom-color2; + .footer__btn{ + margin: 0; + &.webshell-btn-disable{ + background: $--background-color-base; + color: $--web-ssh-color-text-disable; + cursor: default; + } + } + .footer__btn--light{ + margin-right: 10px; + } + } + } } .webTerminal{ diff --git a/nezha-fronted/src/assets/css/components/common/selectTable.scss b/nezha-fronted/src/assets/css/components/common/selectTable.scss new file mode 100644 index 000000000..4226e96b5 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/selectTable.scss @@ -0,0 +1,62 @@ +.selectTable{ + .selectTable-search-input{ + margin-top: 20px; + margin-bottom: 10px; + display: flex; + .el-input{ + position: relative; + flex: 1; + input{ + border: 1px solid $--border-color-light; + box-sizing: border-box; + padding-right: 36px; + } + .el-input__suffix{ + right: 0; + .el-input__suffix-inner{ + width: 36px; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + font-size: 18px; + color: #999; + } + } + } + } + .el-table { + border: 0; + background-color: transparent; + th,tr,td{ + border: 0; + background-color: transparent; + } + th.is-leaf{ + border-bottom: none; + } + th.gutter { + display: table-cell !important; + } + &::before { + height: 0px; + } + &::after { + width: 0; + } + .el-table__fixed:before { + height: 0; + } + &.el-table--enable-row-hover .el-table__body tr:hover>td{ + background-color: $--table-row-hover-background-color; + } + .el-table__row.row-selected{ + background-color: $--table-row-hover-background-color; + color: #FA901C; + } + } + .pagination{ + padding: 5px 0; + border-top: 1px solid $--select-table-border-color; + } +} \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 494289b96..b07f48f12 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -120,6 +120,7 @@ @import './page/tool/trace.scss'; @import './common/v-selectpagenew/selectpage.scss'; +@import './common/selectTable.scss'; @import './common/paramBpx/paramBox.scss'; @import './common/picker/picker.scss'; @import './common/threshold/threshold.scss'; diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index 6ae44a8d7..f2bb0529c 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -235,6 +235,11 @@ $--alert-rule-color: $--background-color-base; /* webSSH */ $--web-ssh-background-color: $--background-color-disabled; $--web-ssh-border-bottom-color: $--background-color-copy; +$--web-ssh-border-bottom-color2: #19191C; +$--web-ssh-color-text-disable: #666666; + +/* selectTable */ +$--select-table-border-color:rgba(0,0,0,0.18); /* 图表弹框 */ $--chart-background-color: $--background-color-empty; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index 531eb0589..ece50d853 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -231,6 +231,11 @@ $--alert-rule-color: $--overview-icon-color; /* webSSH */ $--web-ssh-background-color: $--color-text-label; $--web-ssh-border-bottom-color: transparent; +$--web-ssh-border-bottom-color2: #E7EAED; +$--web-ssh-color-text-disable: #BEBEBE; + +/* selectTable */ +$--select-table-border-color:rgba(0,0,0,0.03); /* 图表弹框 */ $--chart-background-color: #dde4ed; diff --git a/nezha-fronted/src/components/cli/webSSHNew.vue b/nezha-fronted/src/components/cli/webSSHNew.vue index cdc433c2b..ba841e95c 100644 --- a/nezha-fronted/src/components/cli/webSSHNew.vue +++ b/nezha-fronted/src/components/cli/webSSHNew.vue @@ -88,44 +88,39 @@ - -
{{$t('webshell.connect')}}
-
- - - - - {{selectValue}} - - - - {{item.label}} - - - - - - + +
{{$t('webshell.selAsset')}}
+ + + +
+ +
- + +
{{$t('webshell.connect')}}
@@ -185,16 +180,19 @@
+
diff --git a/nezha-fronted/src/components/page/tool/ping.vue b/nezha-fronted/src/components/page/tool/ping.vue index c375eab11..8a9c6781a 100644 --- a/nezha-fronted/src/components/page/tool/ping.vue +++ b/nezha-fronted/src/components/page/tool/ping.vue @@ -230,13 +230,11 @@ export default { // 防止标签输入框失去焦点校验和开始任务校验重复(连续两次message提示) validateHost: bus.debounce(function () { this.$message.error(this.$t('validate.host')) - }, - 50), + }, 50), // 防止标签输入框失去焦点校验和开始任务校验重复(连续两次message提示) validateDuplicate: bus.debounce(function () { this.$message.error(this.$t('ping.duplicate') + ' IP') - }, - 50), + }, 50), // 添加标签之前 beforeAddTag ({ tag, addTag }) { if (!ipv4.test(tag.text) && !ipv6.test(tag.text)) { @@ -395,7 +393,3 @@ export default { } } - - diff --git a/nezha-fronted/src/components/page/tool/trace.vue b/nezha-fronted/src/components/page/tool/trace.vue index 524f4f961..ae5c55b4a 100644 --- a/nezha-fronted/src/components/page/tool/trace.vue +++ b/nezha-fronted/src/components/page/tool/trace.vue @@ -221,13 +221,11 @@ export default { // 防止标签输入框失去焦点校验和开始任务校验重复(连续两次message提示) validateHost: bus.debounce(function () { this.$message.error(this.$t('validate.host')) - }, - 50), + }, 50), // 防止标签输入框失去焦点校验和开始任务校验重复(连续两次message提示) validateDuplicate: bus.debounce(function () { this.$message.error(this.$t('ping.duplicate') + ' IP') - }, - 50), + }, 50), // 添加标签之前 beforeAddTag ({ tag, addTag }) { if (!ipv4.test(tag.text) && !ipv6.test(tag.text)) { @@ -386,7 +384,3 @@ export default { } } - - diff --git a/nezha-fronted/src/store/terminalFile.js b/nezha-fronted/src/store/terminalFile.js index 7c5fc7e81..b59478e58 100644 --- a/nezha-fronted/src/store/terminalFile.js +++ b/nezha-fronted/src/store/terminalFile.js @@ -26,10 +26,12 @@ const terminalFile = { if (!state.messageFunction) { state.messageFunction = true window.addEventListener('message', function (e) { - const data = JSON.parse(e.data) // e.data 里面有自己所传的所有参数 可以根据参数做自己的判断 - if (data.close) { - state.externalTerminal = false - } + try { + const data = JSON.parse(e.data) // e.data 里面有自己所传的所有参数 可以根据参数做自己的判断 + if (data.close) { + state.externalTerminal = false + } + } catch (error) {} }) window.addEventListener('unload', () => { state.externalTerminal = false diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js index f08818873..5d680d3e8 100644 --- a/nezha-fronted/src/store/user.js +++ b/nezha-fronted/src/store/user.js @@ -93,7 +93,6 @@ const user = { localStorage.setItem(`nz-user-${res.data.user.id}-theme`, currentTheme) const body = document.getElementsByTagName('body')[0] body.setAttribute('class', `theme-${currentTheme}`) - console.log(res) localStorage.setItem('timezoneOffset', moment.tz(res.data.timezone || defaultAppearance.timezone).format('Z')) localStorage.setItem('nz-sys-default-cabinet-usize', res.data.defaultCabinetUsize) localStorage.setItem('nz-sys-max-terminal-num', res.data.maxTerminalNum)