gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1

Browse Source
This commit is contained in:
@changcode
2021-11-11 17:12:24 +08:00
parent 5e7f21c9f8 11a05c0505
commit e616322f05
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/login.vue
View File

@@ -127,7 +127,7 @@ export default {
license: { license: {
warnInfo: '', warnInfo: '',
token: '', token: '',
valid: false valid: true
}, },
uploadFileList: [], uploadFileList: [],
uploadFile: { file: '', path: '', uuid: '' }, uploadFile: { file: '', path: '', uuid: '' },
@@ -148,7 +148,7 @@ export default {
methods: { methods: {
...mapActions(['loginSuccess']), ...mapActions(['loginSuccess']),
login () { login () {
if (this.loading || !this.license.valid) { if (this.loading || !this.license.valid || !this.license.token) {
return return
} }
if (this.validateLogin() && (this.$route.path == '/' || this.$route.path == '/login')) { if (this.validateLogin() && (this.$route.path == '/' || this.$route.path == '/login')) {

5
nezha-fronted/src/components/common/table/settings/endpointTable.vue
View File

@@ -110,7 +110,7 @@
<template v-else-if="item.prop === 'state'"> <template v-else-if="item.prop === 'state'">
<!-- metrics--> <!-- metrics-->
<span style="width: auto;display: inline-block" <span style="width: auto;display: inline-block;cursor: pointer"
@mouseenter="labelHoverConfigs(scope.row, 0, true, $event)" @mouseenter="labelHoverConfigs(scope.row, 0, true, $event)"
@mouseleave="labelHoverConfigs(scope.row, 0, false, $event)" @mouseleave="labelHoverConfigs(scope.row, 0, false, $event)"
> >
@@ -131,7 +131,7 @@
</div> </div>
</nz-tooltip> </nz-tooltip>
<!-- logs--> <!-- logs-->
<span style="width: auto;display: inline-block" <span style="width: auto;display: inline-block;cursor: pointer"
@mouseenter="labelHoverConfigs(scope.row, 1, true, $event)" @mouseenter="labelHoverConfigs(scope.row, 1, true, $event)"
@mouseleave="labelHoverConfigs(scope.row, 1, false, $event)"> @mouseleave="labelHoverConfigs(scope.row, 1, false, $event)">
<span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs colorFA901C" /> {{$t('project.endpoint.logs')}} </span> <span class="endpoint-cell-left" style="margin-left: 10px"><i class="nz-icon nz-icon-logs colorFA901C" /> {{$t('project.endpoint.logs')}} </span>
@@ -380,6 +380,7 @@ export default {
color: #3C92F1; color: #3C92F1;
position: relative; position: relative;
display: inline-block; display: inline-block;
cursor: pointer;
} }
.configs-endpoint .endpointConfigsTips { .configs-endpoint .endpointConfigsTips {
display: none; display: none;