diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 834265944..95cc402c4 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -306,13 +306,13 @@ li{
background: $btn-normal-background-color-hover-new;
color: $btn-normal-txt-color-new;
//box-shadow: $btn-normal-shadow;
- border: 0px;
+ border: 1px solid $btn-normal-background-color-hover-new;
}
.nz-btn.nz-btn-style-error-new:hover:not(.nz-btn-disabled) { /* 新版红色按钮hover */
background: $btn-error-background-color-hover-new;
color: $btn-error-txt-color-new;
//box-shadow: $btn-normal-shadow;
- border: 0px;
+ border: 1px solid $btn-error-background-color-hover-new;
}
.nz-btn.nz-btn-style-light-new:hover:not(.nz-btn-disabled) { /* 新版浅色按钮hover */
border: 1px solid $btn-light-border-color-hover-new;
@@ -324,13 +324,13 @@ li{
background: $btn-normal-background-color-active-new;
color: $btn-normal-txt-color-new;
//box-shadow: $btn-normal-shadow;
- border: 0px;
+ border-color: $btn-normal-background-color-active-new;
}
.nz-btn.nz-btn-style-error-new:active:not(.nz-btn-disabled) { /* 新版红色按钮active' */
background: $btn-error-background-color-active-new;
color: $btn-error-txt-color-new;
//box-shadow: $btn-normal-shadow;
- border: 0px;
+ border-color: $btn-error-background-color-active-new;
}
.nz-btn.nz-btn-style-light-new:active:not(.nz-btn-disabled) { /* 新版浅色按钮active*/
border: 1px solid $btn-light-border-color-active-new;
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 8d9de3c8b..a5286dc55 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -1307,7 +1307,7 @@
this.seriesItemScreen = this.seriesItem;
this.screenModal = true;
*/
- //this.dateChange();
+ // this.dateChange();
},
duplicate(){
this.dropdownMenuShow=false;
diff --git a/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue b/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue
index 3774bec57..211bc189a 100644
--- a/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue
+++ b/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue
@@ -470,7 +470,8 @@
hover.hide();
}
},
- hexagonSvgClearScale(){
+ hexagonSvgClearScale(e){
+ window.event? window.event.cancelBubble = true:e.stopPropagation();
if(this.firstInit){return}
if(this.group){
this.group.off('dblclick',this.hexagonSvgClearScale);
diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue
index fc5561c5f..21c36b488 100644
--- a/nezha-fronted/src/components/common/project/topology.vue
+++ b/nezha-fronted/src/components/common/project/topology.vue
@@ -12,7 +12,7 @@
-
+
{{$t('project.topology.selTwoNode')}} {{$t('project.topology.cancel')}}
@@ -300,10 +300,13 @@
},
methods:{// 保存拓扑图数据
saveTopology(){
+ if(this.prevent_opt.save){ return } ;
+ this.prevent_opt.save=true;
this.$emit('topologyLoad');
let nodes=this.formatNodes([...this.nodesArray]);
let edges=this.formatEdges([...this.edgesArray]);
this.$put('/project/topo',{topo:JSON.stringify({nodes:nodes,lines:edges,viewsCenter:this.viewsCenter,zoom:(this.zoom*1920/this.screenX)}),projectId:this.allModuleInfo.basic.id}).then(res=>{
+ this.prevent_opt.save=false;
if(res.code===200){
this.$message({
message: this.$t("tip.saveSuccess"),
@@ -312,6 +315,7 @@
this.$emit('reload');
}
}).catch(res=>{
+ this.prevent_opt.save=false;
this.$message({
message: res.msg,
type: 'error'
diff --git a/nezha-fronted/src/components/common/rightBox/accountBox.vue b/nezha-fronted/src/components/common/rightBox/accountBox.vue
index e19d99b5f..f50624bbb 100644
--- a/nezha-fronted/src/components/common/rightBox/accountBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/accountBox.vue
@@ -75,7 +75,9 @@
{{$t('overall.cancel')}}
@@ -121,12 +123,12 @@
editUser: {},
scripts: [],
selectableScripts: [],
- roles:[],
}
},
methods: {
/*关闭弹框*/
esc(refresh) {
+ this.prevent_opt.save=false;
this.$emit("close", refresh);
},
clickOutside() {
@@ -134,11 +136,14 @@
},
/*保存*/
save() {
+ if(this.prevent_opt.save){ return } ;
+ this.prevent_opt.save=true;
this.$refs.accountForm.validate(valid => {
if (valid) {
let editUser = JSON.parse(JSON.stringify(this.editUser))
editUser.roleIds = [editUser.roleIds]
if (this.editUser.userId) {
+ this.prevent_opt.save=false;
this.$put('sys/user/update',editUser).then(response => {
if (response.code === 200) {
this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
@@ -149,6 +154,7 @@
});
} else {
this.$post('sys/user/save', editUser).then(response => {
+ this.prevent_opt.save=false;
if (response.code === 200) {
this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
this.esc(true);
@@ -158,12 +164,15 @@
});
}
} else {
+ this.prevent_opt.save=false;
return false;
}
})
},
/*删除*/
del() {
+ if(this.prevent_opt.save){ return }
+ this.prevent_opt.save=true;
this.$confirm(this.$t("tip.confirmDelete"), {
confirmButtonText: this.$t("tip.yes"),
cancelButtonText: this.$t("tip.no"),
@@ -177,6 +186,9 @@
this.$message.error(response.msg);
}
});
+ this.prevent_opt.save=false;
+ }).catch(()=>{
+ this.prevent_opt.save=false;
});
},
diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
index be52a5742..fb43364c6 100644
--- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue
@@ -414,7 +414,7 @@
assetListHalf:false,
typeList: [],
dcList: [],
- modelList: []
+ modelList: [],
}
},
methods: {
@@ -514,6 +514,7 @@
/*关闭弹框*/
esc(refresh) {
+ this.prevent_opt.save=false;
this.$emit("close", refresh);
},
@@ -848,6 +849,8 @@
//保存endpoint
save() {
+ if(this.prevent_opt.save){ return } ;
+ this.prevent_opt.save=true;
this.endpoint.projectId = this.currentProjectCopy.id;
this.endpoint.moduleId = this.currentModuleCopy.id;
if (this.endpointList.length == 0) {
@@ -864,6 +867,7 @@
this.$refs.addEndpoint.validate((valid) => {
if (valid) {
this.$post('endpoint', endpointList).then(response => {
+ this.prevent_opt.save=false;
if (response.code === 200) {
this.$message({duration: 1000, type: 'success', message: this.$t("tip.saveSuccess")});
this.esc(true);
@@ -872,6 +876,7 @@
}
});
} else {
+ this.prevent_opt.save=false;
return false;
}
})
@@ -894,12 +899,15 @@
//删除endpoint
del() {
+ if(this.prevent_opt.save){ return } ;
+ this.prevent_opt.save=true;
this.$confirm(this.$t("tip.confirmDelete"), {
confirmButtonText: this.$t("tip.yes"),
cancelButtonText: this.$t("tip.no"),
type: 'warning'
}).then(() => {
this.$delete("endpoint?ids=" + this.endpoint.id).then(response => {
+ this.prevent_opt.save=false;
if (response.code === 200) {
this.$message({duration: 1000, type: 'success', message: this.$t("tip.deleteSuccess")});
this.esc(true);
@@ -907,6 +915,8 @@
this.$message.error(response.msg);
}
});
+ }).catch(()=>{
+ this.prevent_opt.save=false;
});
},
// endpoint弹框的asset子弹框顶部搜索条件选中事件
diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
index bfe9fa32e..d682b3b7d 100644
--- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
@@ -111,7 +111,7 @@
-