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

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

Browse Source
This commit is contained in:
zhangyu
2021-01-22 16:22:27 +08:00
parent e8906c7ba6 960f11e05b
commit c74ea9e355
25 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nezha-fronted/src/components/common/js/tools.js
View File

@@ -1,6 +1,7 @@
import PerfectScrollbar from "perfect-scrollbar";
import {getChart} from "./common";
import MessageBox from "element-ui/packages/message-box/src/main";
import vuex from 'vuex'
import i18n from "../i18n";
/*弹窗点击外部后关闭*/
const exceptClassName = ["config-dropdown", "nz-pop", "el-picker", "chart-box-dropdown", 'metric-dropdown', 'el-cascader__dropdown', "asset-dropdown", "no-style-class", 'el-message-box','nz-dashboard-dropdown', "el-autocomplete-suggestion"]; //clickoutside排除的class(白名单) no-style-class：没有任何样式的class
@@ -8,6 +9,7 @@ export const clickoutside = {
// 初始化指令
bind(el, binding, vnode) {
if(!binding.expression) return;
let unsavedChange = localStorage.getItem('nz-unnsaved-change');
let oldValue;
try{
oldValue= JSON.parse(JSON.stringify(binding.value.obj));
@@ -33,7 +35,7 @@ export const clickoutside = {
}
if(oldValue){
let newValue = JSON.parse(JSON.stringify(binding.value.obj));
if(!isEqual(oldValue,newValue)){
if(unsavedChange=='on'&&!isEqual(oldValue,newValue)){
MessageBox.confirm(i18n.t("tip.confirmCancel"), {
confirmButtonText: i18n.t("tip.yes"),
cancelButtonText: i18n.t("tip.no"),
@@ -69,7 +71,6 @@ export const clickoutside = {
},
};
function isEqual (o1, o2) {
console.log(o1,o2)
var isEqualForInner = function (obj1, obj2) {
var o1 = obj1 instanceof Object;
var o2 = obj2 instanceof Object;
@@ -99,10 +100,11 @@ function isEqual (o1, o2) {
export const cancelWithChange={
bind:function(el,binding){
if(!binding.value||!binding.value.obj) return;
let unsavedChange = localStorage.getItem('nz-unnsaved-change');
let oldValue = JSON.parse(JSON.stringify(binding.value.obj));
function domClick(e){
let newValue = JSON.parse(JSON.stringify(binding.value.obj));
if(!isEqual(oldValue,newValue)){
if(unsavedChange=='on'&&!isEqual(oldValue,newValue)){
MessageBox.confirm(i18n.t("tip.confirmCancel"), {
confirmButtonText: i18n.t("tip.yes"),
cancelButtonText: i18n.t("tip.no"),

3
nezha-fronted/src/components/common/language/cn.js
View File

@@ -586,7 +586,7 @@ const cn = {
roles:{
roles:"角色",
name:"名称",
remark:"备注",
description:"描述",
option: '操作',//"操作"
permission:"权限",
menu:"菜单",
@@ -743,6 +743,7 @@ const cn = {
second:'秒',
day:'天',
maxSeries:'Query max series',
unsaved:'未保存提示'
},
email: {
email: "邮件",

3
nezha-fronted/src/components/common/language/en.js
View File

@@ -589,7 +589,7 @@ const en = {
roles:{
roles:"Roles",
name:"Name",
remark:"Remark",
description:"Description",
option: 'Operation',//"操作"
permission:"Permission",
menu:"Menu",
@@ -747,6 +747,7 @@ const en = {
second:'second',
day:'day',
maxSeries:'Query max series',
unsaved:'Unsaved tip'
},
email:{
email:'Email',

2
nezha-fronted/src/components/common/project/visNetwork.vue
View File

@@ -24,7 +24,7 @@
<!--<span class="chart-title-icon"><i class="nz-icon nz-icon-caret-bottom el-icon&#45;&#45;right" :class="{'visible':caretShow,'hidden':!caretShow}"></i></span>-->
</span>
<div style="height: 34px">
<button @click="editVisNetworkChange(true)" class="nz-btn nz-btn-size-normal nz-btn-style-light float-right pickTime" style="border-right: 1px solid rgba(162,162,162,0.50);margin-right: 12px" type="button" v-has="'project_topo_edit'" v-show="!editVisNetwork">
<button @click="editVisNetworkChange(true)" class="nz-btn nz-btn-size-normal nz-btn-style-light float-right pickTime" style="border-right: 1px solid rgba(162,162,162,0.50);margin-right: 12px" type="button" v-show="!editVisNetwork">
<i class="nz-icon nz-icon-edit" :title="$t('project.topology.edit')"></i>
</button>
<pick-time v-show="!editVisNetwork" :showTimePicker="false" class="float-right pickTime" :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false" ref="pickTime"></pick-time>

2
nezha-fronted/src/components/common/rightBox/accountBox.vue
View File

@@ -79,7 +79,7 @@
class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" id="account-save" v-has="'account_save'"
<button @click="save" id="account-save"
class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new"
:disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}"
>

2
nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
View File

@@ -294,7 +294,7 @@
<button v-cancel="{obj:endpoint,func:esc}" id="ep-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="ep-add" v-has="['asset_endpoint_save', 'project_endpoint_save']">
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="ep-add">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
View File

@@ -111,7 +111,7 @@
<button v-cancel="{obj:editAlertRule,func:esc}" id="alert-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="alert-box-save" v-has="'rule_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="alert-box-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/assetBox.vue
View File

@@ -154,7 +154,7 @@
<button v-cancel="{obj:editAsset,func:esc}" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" id="asset-edit-cancel">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="asset-edit-save" v-has="'asset_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="asset-edit-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/batchEditAsset.vue
View File

@@ -250,7 +250,7 @@
<button v-cancel="{obj:editAsset,func:esc}" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" id="asset-edit-cancel">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="asset-edit-save" v-has="'asset_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="asset-edit-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/cabinetBox.vue
View File

@@ -36,7 +36,7 @@
<button v-cancel="{obj:editCabinet,func:esc}" id="cab-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="cab-box-save" v-has="'dc_cabinet_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="cab-box-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/dcBox.vue
View File

@@ -82,7 +82,7 @@
<button v-cancel="{obj:editDc,func:esc}" id="dc-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="dc-box-save" v-has="'dc_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="dc-box-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/editEndpointBox.vue
View File

@@ -127,7 +127,7 @@
<button v-cancel="{obj:editEndpoint,func:esc}" id="ep-edit-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="ep-edit-save" v-has="['asset_endpoint_save', 'project_endpoint_save']" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="ep-edit-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/mibBox.vue
View File

@@ -51,7 +51,7 @@
<button v-cancel="{obj:editMib,func:esc}" id="model-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="model-box-save" v-has="'snmp_file_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="model-box-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/modelBox.vue
View File

@@ -76,7 +76,7 @@
<button v-cancel="{obj:editModel,func:esc}" id="model-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="model-box-save" v-has="['model_save', 'asset_vendor_save']" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="model-box-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/moduleBox.vue
View File

@@ -308,7 +308,7 @@
<button v-cancel="{obj:editModule,func:esc}" id="module-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="module-box-save" v-has="'project_module_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="module-box-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/panelBox.vue
View File

@@ -29,7 +29,7 @@
<button v-cancel="{obj:panel,func:esc}" id="module-box-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="module-box-save" v-has="'panel_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="module-box-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/projectBox.vue
View File

@@ -28,7 +28,7 @@
<button v-cancel="{obj:editProject,func:esc}" id="project-esc" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="project-save" v-has="'project_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" id="project-save">
<span>{{$t('overall.save')}}</span>
</button>
</div>

2
nezha-fronted/src/components/common/rightBox/promServerBox.vue
View File

@@ -57,7 +57,7 @@
class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" id="prom-save" v-has="'prom_save'"
<button @click="save" id="prom-save"
class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}">
<span>{{$t('overall.save')}}</span>
</button>

6
nezha-fronted/src/components/common/rightBox/roleBox.vue
View File

@@ -51,7 +51,7 @@
id="roles-esc">
<span>{{$t('overall.cancel')}}</span>
</button>
<button @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new" v-has="'role_save'" :disabled="prevent_opt.save" :class="{'nz-btn-disabled':prevent_opt.save}"
<button :class="{'nz-btn-disabled':prevent_opt.save}" :disabled="prevent_opt.save" @click="save" class="nz-btn nz-btn-size-normal-new nz-btn-style-normal-new"
id="roles-save">
<span>{{$t('overall.save')}}</span>
</button>
@@ -180,7 +180,9 @@
this.getMenus();
},
mounted() {
if(this.$refs.menuTree&&this.editRole.menuIds&&this.editRole.menuIds.length>0){
this.$refs.menuTree.setCheckedKeys(this.editRole.menuIds,true);
}
},
watch: {
//将prop里的user转为组件内部对象

2
nezha-fronted/src/components/page/config/account.vue
View File

@@ -108,7 +108,7 @@
active-value="1"
inactive-value="0"
active-color="#ee9d3f"
:disabled="isCurrentUser(scope.row.username) || !hasButton('account_toEdit') || !hasButton('account_save') || (scope.row.username==='admin' && scope.row.userId==1)"
:disabled="isCurrentUser(scope.row.username) || !hasButton('account_toEdit') || !hasButton('account_toAdd') || (scope.row.username==='admin' && scope.row.userId==1)"
@change="(val)=>{statusChange(scope.row)}">
</el-switch>
</span>

2
nezha-fronted/src/components/page/config/dc.vue
View File

@@ -82,7 +82,7 @@
v-model="scope.row.state"
active-value="ON"
inactive-value="OFF"
:disabled="!hasButton('dc_toEdit') || !hasButton('dc_save')"
:disabled="!hasButton('dc_toEdit') || !hasButton('dc_toEdit')"
active-color="#ee9d3f"
@change="(val)=>{statusChange(scope.row)}"
/>

2
nezha-fronted/src/components/page/config/roles.vue
View File

@@ -158,7 +158,7 @@
prop: 'name',
show: true,
}, {
label: this.$t("config.roles.remark"),
label: this.$t("config.roles.description"),
prop: 'remark',
show: true,
}, {

8
nezha-fronted/src/components/page/config/system.vue
View File

@@ -38,6 +38,10 @@
<el-option v-for="(item,index) in timezoneOption" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('config.system.basic.unsaved')" prop="unsaved_change">
<el-switch v-model.number="basic.unsaved_change" active-color="rgb(238, 157, 63)" active-value='on' inactive-value='off'>
</el-switch>
</el-form-item>
<el-form-item>
<button
@click="resetForm('basicForm','basic')" class="nz-btn nz-btn-size-normal-new nz-btn-style-light-new" type="button"
@@ -362,7 +366,8 @@
current_site_url:'',
timezone:'',
default_cabinet_usize:'',
query_max_series:''
query_max_series:'',
unsaved_change:'on',
},
basicCopy:null,
basicRules:{
@@ -553,6 +558,7 @@
localStorage.setItem('nz-sys-timezone',this.basic.timezone);
localStorage.setItem('nz-sys-asset-ping-switch',this.basic.asset_ping_switch);
localStorage.setItem('nz-sys-default-cabinet-usize',this.basic.default_cabinet_usize);
localStorage.setItem('nz-unnsaved-change',this.basic.unsaved_change)
}else if(type == 'terminal'){
localStorage.setItem('nz-sys-max-terminal-num',this.terminal.max_terminal_num);
}

6
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -64,7 +64,7 @@
height: 100vh;
top: 0;
left: 0;
/*z-index: 2100;*/
z-index: 1;
}
/deep/ .el-color-picker{
position: absolute;
@@ -352,7 +352,7 @@
<i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</el-popover>
</span>
<span class="float-right" @click="addMapping"><i style="font-size: 16px; cursor: pointer;" class="nz-icon nz-icon-create-square"></i></span>
<span class="float-right" @click="addMapping"><i style="font-size: 16px; cursor: pointer;" class="nz-icon nz-icon-create-square"></i></span>
</div>
<div style="margin-bottom: 20px; width: 100%" v-if="editChart.type == 'singleStat'||editChart.type == 'table'"></div>
<el-form-item :label="$t('dashboard.panel.chartForm.type')" prop="span" v-if="editChart.type == 'singleStat'||editChart.type == 'table'">
@@ -1247,6 +1247,8 @@
this.$refs.alertParamBox.setData(data)
})
//this.elements=[1];
}else if(this.editChart.type==='singleStat'){
this.setIsSingleStat();
}else{
if((this.editChart.type==='line'||this.editChart.type==='bar'||this.editChart.type==='stackArea'||this.editChart.type==='singleStat')&&data.param){
this.editChart.param.threshold=data.param.threshold;

4
nezha-fronted/src/store/user.js
View File

@@ -8,7 +8,7 @@ const user = {
state: {
menuList: [],
buttonList: [],
roleList: []
roleList: [],
},
mutations: {
setMenuList(state, menuList) {
@@ -45,7 +45,7 @@ const user = {
localStorage.setItem('nz-sys-default-cabinet-usize',res.data.defaultCabinetUsize);
localStorage.setItem('nz-sys-max-terminal-num',res.data.maxTerminalNum);
localStorage.setItem('nz-sys-asset-ping-switch',res.data.assetPingSwitch);
localStorage.setItem('nz-unnsaved-change',res.data.unsavedChange)
post("/sys/user/permissions", {token: res.data.token}).then(res => {
let menuList = sortByOrderNum(res.data.menus);
store.commit("setMenuList", menuList);