From 8cb4c343793f5d0b9175c4ac693966c7b7a4728e Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 13 Jan 2021 16:55:13 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E6=89=93=E5=8C=85=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/build/webpack.prod.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js index 26e2477ea..df141c528 100644 --- a/nezha-fronted/build/webpack.prod.conf.js +++ b/nezha-fronted/build/webpack.prod.conf.js @@ -149,7 +149,7 @@ const webpackConfig = merge(baseWebpackConfig, { initialFile: './dist', endPath: './dist', zipName: 'nz-gui.zip', - behindShell: 'cd '+path.join(__dirname,'../dist/')+";md5=`md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8`;mv nz-gui.zip nz-gui-${md5}.zip"+(process.env.BUILD_MODE=='all'?'mkdir -p dist/static;cp -r ../static/Tiles dist/static/;zip -gr nz-gui-${md5}.zip dist/static/Tiles;rm -rf dist;':'') + behindShell: 'cd '+path.join(__dirname,'../dist/')+";md5=`md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8`;mv nz-gui.zip nz-gui-${md5}.zip"+(env.BUILD_MODE=='"all"'?'mkdir -p dist/static;cp -r ../static/Tiles dist/static/;zip -gr nz-gui-${md5}.zip dist/static/Tiles;rm -rf dist;':'') }), new fileManagerPlugin({ onStart:[ From 118a8ecc5ead6daaffb82084609894c435b2cd24 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 13 Jan 2021 17:10:39 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E6=89=93=E5=8C=85=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/build/webpack.prod.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js index df141c528..caf1cd74e 100644 --- a/nezha-fronted/build/webpack.prod.conf.js +++ b/nezha-fronted/build/webpack.prod.conf.js @@ -149,7 +149,7 @@ const webpackConfig = merge(baseWebpackConfig, { initialFile: './dist', endPath: './dist', zipName: 'nz-gui.zip', - behindShell: 'cd '+path.join(__dirname,'../dist/')+";md5=`md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8`;mv nz-gui.zip nz-gui-${md5}.zip"+(env.BUILD_MODE=='"all"'?'mkdir -p dist/static;cp -r ../static/Tiles dist/static/;zip -gr nz-gui-${md5}.zip dist/static/Tiles;rm -rf dist;':'') + behindShell: 'cd '+path.join(__dirname,'../dist/')+";md5=`md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8`;mv nz-gui.zip nz-gui-${md5}.zip;"+(env.BUILD_MODE=='"all"'?'mkdir -p ./dist/static;cp -r ../static/Tiles dist/static/;zip -gr nz-gui-${md5}.zip dist/static/Tiles;rm -rf dist;':'') }), new fileManagerPlugin({ onStart:[ From 0504296213f463dbfd97201b5a12b4606efbdff4 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Wed, 13 Jan 2021 17:28:11 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/build/webpack.prod.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/build/webpack.prod.conf.js b/nezha-fronted/build/webpack.prod.conf.js index caf1cd74e..9c28608a5 100644 --- a/nezha-fronted/build/webpack.prod.conf.js +++ b/nezha-fronted/build/webpack.prod.conf.js @@ -149,7 +149,7 @@ const webpackConfig = merge(baseWebpackConfig, { initialFile: './dist', endPath: './dist', zipName: 'nz-gui.zip', - behindShell: 'cd '+path.join(__dirname,'../dist/')+";md5=`md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8`;mv nz-gui.zip nz-gui-${md5}.zip;"+(env.BUILD_MODE=='"all"'?'mkdir -p ./dist/static;cp -r ../static/Tiles dist/static/;zip -gr nz-gui-${md5}.zip dist/static/Tiles;rm -rf dist;':'') + behindShell: 'cd '+path.join(__dirname,'../dist/')+";md5=`md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8`;mv nz-gui.zip nz-gui-${md5}.zip;"+(env.BUILD_MODE=='"all"'?'mkdir -p ./dist/static;echo "start add map picture to zip file,it will table a few moment,please wait...";cp -r ../static/Tiles dist/static/;zip -gr nz-gui-${md5}.zip dist/static/Tiles>/dev/null;rm -rf dist;':'') }), new fileManagerPlugin({ onStart:[ From 1b75ab629ca02612122f7aad2366dbca69b69ca4 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 13 Jan 2021 18:58:50 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix=EF=BC=9A=E5=B1=85=E4=B8=AD=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=A0=8F=E5=9B=BE=E6=A0=87=20=E4=BB=A5=E5=8F=8A=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=87=E6=8D=A2=E5=90=8Eproject=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BE=9D=E6=97=A7=E8=A2=AB=E7=9A=84=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/alert/alertMessageTable.vue | 4 +++- .../common/bottomBox/tabs/panelTab.vue | 4 +++- .../src/components/common/header.vue | 2 +- .../src/components/common/leftMenu.vue | 4 ++++ .../src/components/page/alert/config.vue | 4 +++- .../src/components/page/asset/asset.vue | 4 +++- .../src/components/page/config/account.vue | 4 +++- .../src/components/page/config/dc.vue | 4 +++- .../src/components/page/config/menus.vue | 4 +++- .../src/components/page/config/mib.vue | 4 +++- .../src/components/page/config/model.vue | 4 +++- .../components/page/config/operationlog.vue | 4 +++- .../src/components/page/config/promServer.vue | 4 +++- .../src/components/page/config/roles.vue | 4 +++- .../components/page/config/terminallog.vue | 4 +++- .../src/components/page/dashboard/panel.vue | 4 +++- .../src/components/page/project/project.vue | 21 ++++++++++++++++--- 17 files changed, 65 insertions(+), 18 deletions(-) diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue index 31cba4354..b78b402a1 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue @@ -903,7 +903,9 @@ }, beforeDestroy(){ if(this.scrollbarWrap){ - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; } } } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue index 1304e198a..1f1b69e1b 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue @@ -488,7 +488,9 @@ beforeDestroy(){ document.querySelector("#tableList").removeEventListener("mouseenter", this.tableListEnter); document.querySelector("#tableList").removeEventListener("mouseleave", this.tableListLeave); - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; } } diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index ccfa1be89..db1a20340 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -611,7 +611,7 @@ } .header .el-menu--horizontal>.icon-menu-item .el-submenu__title { min-width: 50px !important; - line-height: 46px; + line-height: 50px; /*margin-right:20px;*/ } .header .vertical-line{ diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue index 390281ec2..68f18efb2 100644 --- a/nezha-fronted/src/components/common/leftMenu.vue +++ b/nezha-fronted/src/components/common/leftMenu.vue @@ -218,6 +218,7 @@ if (this.currentProject && this.currentProject.id && this.showProjectPanel) { this.detailProject(this.currentProject); } + this.changeCurrentModule(''); } }, }, @@ -258,6 +259,9 @@ getParentMenu(route) { let parentMenu = ""; let end = false; + if (route != '/project'){ + this.changeCurrentModule(''); + } if (route != '/project' && route != '/asset') { this.$store.getters.menuList.forEach(menu => { if (!end) { diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 77391157b..2172c78e7 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -524,7 +524,9 @@ bus.$off("alert-rule-list-change"); bus.$off("dc-list-change"); bus.$off('alert-message-change'); - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; }, created(){ //是否存在分页缓存 diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index ffa9523a6..04813944d 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -851,7 +851,9 @@ beforeDestroy() { bus.$off("asset-filter-change"); bus.$off('alert-message-change'); - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; } } diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index 7b7a6ebd1..9fff39d79 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -436,7 +436,9 @@ } }, beforeDestroy() { - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; }, computed: { isCurrentUser() { diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 2c2a91e86..50d65c3ed 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -531,7 +531,9 @@ }, beforeDestroy(){ bus.$off("dc-list-change"); - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; }, created(){ //是否存在分页缓存 diff --git a/nezha-fronted/src/components/page/config/menus.vue b/nezha-fronted/src/components/page/config/menus.vue index c6d4a0068..6f617a517 100644 --- a/nezha-fronted/src/components/page/config/menus.vue +++ b/nezha-fronted/src/components/page/config/menus.vue @@ -342,7 +342,9 @@ this.getTableData(); }, beforeDestroy() { - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; } } diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue index 449a7b20a..c5ded4cfd 100644 --- a/nezha-fronted/src/components/page/config/mib.vue +++ b/nezha-fronted/src/components/page/config/mib.vue @@ -380,7 +380,9 @@ this.getTableData(); }, beforeDestroy() { - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; } } diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index 35ecd98a9..9998e950b 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -383,7 +383,9 @@ } }, beforeDestroy() { - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; } } diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue index 8340b857d..25ee3db77 100644 --- a/nezha-fronted/src/components/page/config/operationlog.vue +++ b/nezha-fronted/src/components/page/config/operationlog.vue @@ -281,7 +281,9 @@ }, }, beforeDestroy() { - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; }, computed: { isCurrentUser() { diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index cd71a4e0e..b6f484524 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -434,7 +434,9 @@ } }, beforeDestroy() { - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; }, watch: { diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue index 1035ef240..df406aad4 100644 --- a/nezha-fronted/src/components/page/config/roles.vue +++ b/nezha-fronted/src/components/page/config/roles.vue @@ -319,7 +319,9 @@ } }, beforeDestroy() { - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; }, mounted() { //初始化表头 diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue index ba4003415..227e55b24 100644 --- a/nezha-fronted/src/components/page/config/terminallog.vue +++ b/nezha-fronted/src/components/page/config/terminallog.vue @@ -289,7 +289,9 @@ }, }, beforeDestroy() { - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; }, created(){ //是否存在分页缓存 diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 17e319f37..6e9ccea86 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -770,7 +770,9 @@ document.querySelector("#tableList").removeEventListener("mouseenter", this.tableListEnter); document.querySelector("#tableList").removeEventListener("mouseleave", this.tableListLeave); } - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; } } diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index 1f0f182c3..d3648303d 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -226,6 +226,11 @@ facade, 'delete-button':deleteButton, }, + computed:{ + currentProjectChange() { + return this.$store.state.currentProject; + } + }, data(){ return { rightBox:{ @@ -844,13 +849,21 @@ if (n.length === 0 && this.endpointPageObj.pageNo > 1) { this.endpointPageNo(this.endpointPageObj.pageNo-1); } - if(!this.delFlag){ // 不是删除时回到顶部 以及修改时 + if(!this.delFlag&&this.pageType==='endpoint'){ // 不是删除时回到顶部 以及修改时 this.$refs.endpointTable.bodyWrapper.scrollTop = 0 }else{ this.delFlag=false; } } - } + }, + currentProject: { + handler(n, o) { + console.log(n); + if (n && o.id != this.currentProject.id) { + this.pageType='project'; + } + }, + }, }, beforeDestroy() { bus.$off("project-page-type"); @@ -860,7 +873,9 @@ bus.$off("module-list-change"); bus.$off("endpoint-list-change"); bus.$off('alert-message-change'); - this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + if(this.scrollbarWrap){ + this.scrollbarWrap.removeEventListener('scroll', bus.debounce); + }; }, } From 085073d0be70719443725e003101eb94c1e5e921 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 14 Jan 2021 11:49:54 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=8D?= =?UTF-8?q?=E7=82=B9=E5=87=BBproject=20=E7=9B=B4=E6=8E=A5=E7=82=B9?= =?UTF-8?q?=E5=87=BBmodule=E5=88=97=E8=A1=A8=20=E8=A1=A8=E6=A0=BC=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/header.vue | 3 +++ nezha-fronted/src/components/common/leftMenu.vue | 4 +++- nezha-fronted/src/components/page/project/project.vue | 8 -------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index db1a20340..652f48873 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -365,6 +365,9 @@ return; } this.currentProject = p; + if(p.id!==this.$store.state.currentProject.id){ + bus.$emit("project-page-type", "project"); + } this.$store.commit("currentProjectChange", p); this.activeItemIndex = p.id; this.jumpTo('/project'); diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue index 68f18efb2..1959e0556 100644 --- a/nezha-fronted/src/components/common/leftMenu.vue +++ b/nezha-fronted/src/components/common/leftMenu.vue @@ -4,7 +4,7 @@
{{$t(parentMenu.i18n)}}