From 1803f9cf67658cde8675266153de4238010f51ad Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 5 Aug 2020 17:00:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B5=8F=E8=A7=88=E5=99=A8=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=E5=85=B3=E9=97=AD=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/components/ApiEnvironmentConfig.vue  |  5 +++-
 .../api/test/components/import/ApiImport.vue  |  4 +++
 .../common/components/MsScheduleEdit.vue      |  3 +++
 .../business/components/project/MsProject.vue | 10 ++++++--
 .../organization/OrganizationMember.vue       |  9 +++++--
 .../organization/OrganizationWorkspace.vue    | 21 ++++++++++------
 .../settings/personal/PersonSetting.vue       |  7 +++++-
 .../settings/system/LdapSetting.vue           |  8 +++++-
 .../settings/system/Organization.vue          | 23 +++++++++++++----
 .../settings/system/SystemWorkspace.vue       | 25 +++++++++++++++----
 .../settings/system/TestResourcePool.vue      |  6 +++++
 .../components/settings/system/User.vue       |  9 ++++++-
 .../settings/workspace/WorkspaceMember.vue    |  7 +++++-
 .../track/case/components/BatchEdit.vue       |  3 +++
 .../track/case/components/TestCaseEdit.vue    | 17 ++++++-------
 .../track/case/components/TestCaseImport.vue  | 14 +++++++----
 .../track/case/components/TestCaseList.vue    | 12 ---------
 .../track/case/components/TestCaseMove.vue    |  3 +++
 .../components/track/common/NodeEdit.vue      |  4 ++-
 .../track/plan/components/TestPlanEdit.vue    |  7 ++++++
 .../view/comonents/TestPlanTestCaseEdit.vue   | 16 +++---------
 frontend/src/common/js/utils.js               | 14 +++++++++++
 22 files changed, 160 insertions(+), 67 deletions(-)

diff --git a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
index 0bb0fa5c5d..f7f84b005c 100644
--- a/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
+++ b/frontend/src/business/components/api/test/components/ApiEnvironmentConfig.vue
@@ -18,6 +18,7 @@
     import MsMainContainer from "../../../common/components/MsMainContainer";
     import MsAsideItem from "../../../common/components/MsAsideItem";
     import EnvironmentEdit from "./environment/EnvironmentEdit";
+    import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
 
     export default {
       name: "ApiEnvironmentConfig",
@@ -45,10 +46,11 @@
         }
       },
       methods: {
-        open(projectId) {
+        open: function (projectId) {
           this.visible = true;
           this.projectId = projectId;
           this.getEnvironments();
+          listenGoBack(this.close);
         },
         deleteEnvironment(environment, index) {
           if (environment.id) {
@@ -134,6 +136,7 @@
           this.$emit('close');
           this.visible = false;
           this.$refs.environmentEdit.clearValidate();
+          removeGoBackListener(this.close);
         }
       }
     }
diff --git a/frontend/src/business/components/api/test/components/import/ApiImport.vue b/frontend/src/business/components/api/test/components/import/ApiImport.vue
index be6572e96a..6d939fcab6 100644
--- a/frontend/src/business/components/api/test/components/import/ApiImport.vue
+++ b/frontend/src/business/components/api/test/components/import/ApiImport.vue
@@ -95,6 +95,7 @@
 <script>
     import MsDialogFooter from "../../../../common/components/MsDialogFooter";
     import ApiEnvironmentConfig from "../ApiEnvironmentConfig";
+    import {listenGoBack, removeGoBackListener} from "../../../../../../common/js/utils";
     export default {
       name: "ApiImport",
       components: {ApiEnvironmentConfig, MsDialogFooter},
@@ -174,6 +175,7 @@
       methods: {
         open() {
           this.visible = true;
+          listenGoBack(this.close);
         },
         upload(file) {
           this.formData.file = file.file;
@@ -255,6 +257,8 @@
             swaggerUrl: ''
           };
           this.fileList = [];
+          removeGoBackListener(this.close);
+          this.visible = false;
         }
       }
     }
diff --git a/frontend/src/business/components/common/components/MsScheduleEdit.vue b/frontend/src/business/components/common/components/MsScheduleEdit.vue
index 530428507b..c75224158b 100644
--- a/frontend/src/business/components/common/components/MsScheduleEdit.vue
+++ b/frontend/src/business/components/common/components/MsScheduleEdit.vue
@@ -25,6 +25,7 @@
     import Crontab from "../cron/Crontab";
     import CrontabResult from "../cron/CrontabResult";
     import {cronValidate} from "../../../../common/js/cron";
+    import {listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
 
     function defaultCustomValidate() {return {pass: true};}
 
@@ -80,6 +81,7 @@
         open() {
           this.dialogVisible = true;
           this.form.cronValue = this.schedule.value;
+          listenGoBack(this.close);
         },
         crontabFill(value, resultList) {
           //确定后回传的值
@@ -108,6 +110,7 @@
           if (!this.schedule.value) {
             this.$refs.crontabResult.resultList = [];
           }
+          removeGoBackListener(this.close);
         },
         intervalShortValidate() {
           if (this.getIntervalTime() < 3*60*1000) {
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index 61f6c991bf..8b8b4b7b6e 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -48,7 +48,7 @@
       </el-card>
     </ms-main-container>
 
-    <el-dialog :title="title" :visible.sync="createVisible" destroy-on-close>
+    <el-dialog :title="title" :visible.sync="createVisible" destroy-on-close @close="handleClose">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"></el-input>
@@ -80,7 +80,7 @@
   import MsTableHeader from "../common/components/MsTableHeader";
   import MsTableOperator from "../common/components/MsTableOperator";
   import MsDialogFooter from "../common/components/MsDialogFooter";
-  import {_sort, getCurrentUser} from "../../../common/js/utils";
+  import {_sort, getCurrentUser, listenGoBack, removeGoBackListener} from "../../../common/js/utils";
   import MsContainer from "../common/components/MsContainer";
   import MsMainContainer from "../common/components/MsMainContainer";
   import MsDeleteConfirm from "../common/components/MsDeleteConfirm";
@@ -162,12 +162,14 @@
           return false;
         }
         this.title = this.$t('project.create');
+        listenGoBack(this.handleClose);
         this.createVisible = true;
         this.form = {};
       },
       edit(row) {
         this.title = this.$t('project.edit');
         this.createVisible = true;
+        listenGoBack(this.handleClose);
         this.form = Object.assign({}, row);
       },
       submit(formName) {
@@ -207,6 +209,10 @@
           });
         });
       },
+      handleClose() {
+        removeGoBackListener(this.handleClose);
+        this.createVisible = false;
+      },
       search() {
         this.list();
       },
diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index 2e6a026b86..efb5ba166f 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -116,7 +116,7 @@
   import MsRolesTag from "../../common/components/MsRolesTag";
   import MsTableOperator from "../../common/components/MsTableOperator";
   import MsDialogFooter from "../../common/components/MsDialogFooter";
-  import {getCurrentUser} from "../../../../common/js/utils";
+  import {getCurrentUser, listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
 
   export default {
     name: "MsOrganizationMember",
@@ -177,6 +177,9 @@
       handleClose() {
         this.form = {};
         this.options = [];
+        removeGoBackListener(this.handleClose);
+        this.updateVisible = false;
+        this.createVisible = false;
       },
       edit(row) {
         this.updateVisible = true;
@@ -187,6 +190,7 @@
         });
         // 编辑使填充角色信息
         this.$set(this.form, 'roleIds', roleIds);
+        listenGoBack(this.handleClose);
       },
       updateOrgMember(formName) {
         let param = {
@@ -231,7 +235,8 @@
         this.createVisible = true;
         this.result = this.$get('/role/list/org', response => {
           this.$set(this.form, "roles", response.data);
-        })
+        });
+        listenGoBack(this.handleClose);
       },
       submitForm(formName) {
         this.$refs[formName].validate((valid) => {
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 890af868c3..b418029a0f 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -24,7 +24,7 @@
                            :total="total"/>
     </el-card>
 
-    <el-dialog :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%">
+    <el-dialog :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%" @close="close">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -56,7 +56,7 @@
     </el-dialog>
 
     <!-- dialog of workspace member -->
-    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc"
+    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="close"
                class="dialog-css">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="$t('member.create')" :title="$t('commons.member')"/>
@@ -178,8 +178,8 @@
   import {
     getCurrentOrganizationId,
     getCurrentUser,
-    getCurrentWorkspaceId,
-    refreshSessionAndCookies
+    getCurrentWorkspaceId, listenGoBack,
+    refreshSessionAndCookies, removeGoBackListener
   } from "../../../../common/js/utils";
   import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
 
@@ -299,6 +299,7 @@
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.memberForm, "roles", response.data);
         })
+        listenGoBack(this.close);
       },
       cellClick(row) {
         // 保存当前点击的组织信息到currentRow
@@ -346,10 +347,6 @@
       closeFunc() {
         this.form = {};
       },
-      closeMemberFunc() {
-        this.memberLineData = [];
-        this.list();
-      },
       submitForm(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -388,6 +385,7 @@
         })
         // 编辑时填充角色信息
         this.$set(this.memberForm, 'roleIds', roleIds);
+        listenGoBack(this.close);
       },
       delMember(row) {
         this.$confirm(this.$t('member.remove_member'), '', {
@@ -422,6 +420,13 @@
           }
         })
       },
+      close: function () {
+        removeGoBackListener(this.close);
+        this.dialogWsMemberUpdateVisible = false;
+        this.dialogWsMemberAddVisible = false;
+        this.memberLineData = [];
+        this.list();
+      },
       buildPagePath(path) {
         return path + "/" + this.dialogCurrentPage + "/" + this.dialogPageSize;
       },
diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 3f87d6273f..13d32d33bd 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -81,7 +81,7 @@
 <script>
   import {TokenKey} from "../../../../common/js/constants";
   import MsDialogFooter from "../../common/components/MsDialogFooter";
-  import {getCurrentUser} from "../../../../common/js/utils";
+  import {getCurrentUser, listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
   import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 
   export default {
@@ -154,9 +154,11 @@
       edit(row) {
         this.updateVisible = true;
         this.form = Object.assign({}, row);
+        listenGoBack(this.handleClose);
       },
       editPassword(row) {
         this.editPasswordVisible = true;
+        listenGoBack(this.handleClose);
       },
       cancel(){
         this.editPasswordVisible = false;
@@ -209,6 +211,9 @@
       handleClose() {
         this.form = {};
         this.ruleForm = {};
+        removeGoBackListener(this.handleClose);
+        this.editPasswordVisible = false;
+        this.updateVisible = false;
       }
     }
   }
diff --git a/frontend/src/business/components/settings/system/LdapSetting.vue b/frontend/src/business/components/settings/system/LdapSetting.vue
index b2eb58ddba..4ce9cf6a7b 100644
--- a/frontend/src/business/components/settings/system/LdapSetting.vue
+++ b/frontend/src/business/components/settings/system/LdapSetting.vue
@@ -38,7 +38,7 @@
       </div>
 
       <el-dialog :title="$t('ldap.test_login')" :visible.sync="loginVisible" width="30%" destroy-on-close
-                 v-loading="result.loading">
+                 v-loading="result.loading" @close="close">
         <el-form :model="loginForm" :rules="loginFormRules" ref="loginForm" label-width="90px">
           <el-form-item :label="$t('commons.username')" prop="username">
             <el-input v-model="loginForm.username" autocomplete="off" :placeholder="$t('ldap.input_username')"/>
@@ -61,6 +61,7 @@
 
 <script>
   import MsDialogFooter from "../../common/components/MsDialogFooter";
+  import {listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
 
   export default {
     name: "LdapSetting",
@@ -118,6 +119,10 @@
         this.show = true;
         this.init();
       },
+      close() {
+        removeGoBackListener(this.close);
+        this.loginVisible =  false;
+      },
       testConnection() {
         if (!this.checkParam()) {
           return false;
@@ -151,6 +156,7 @@
 
         this.loginForm = {};
         this.loginVisible = true;
+        listenGoBack(this.close);
       },
       checkParam() {
         if (!this.form.url) {
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index bf223872c1..695c52153f 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -27,7 +27,7 @@
     </el-card>
 
     <!-- dialog of organization member -->
-    <el-dialog :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc" class="dialog-css">
+    <el-dialog :visible.sync="dialogOrgMemberVisible" width="70%" :destroy-on-close="true" @close="closeFunc" class="dialog-css">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       <!-- organization member table -->
@@ -178,7 +178,12 @@
   import MsTableOperator from "../../common/components/MsTableOperator";
   import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
   import MsDialogFooter from "../../common/components/MsDialogFooter";
-  import {getCurrentOrganizationId, getCurrentUser, refreshSessionAndCookies} from "../../../../common/js/utils";
+  import {
+    getCurrentOrganizationId,
+    getCurrentUser, listenGoBack,
+    refreshSessionAndCookies,
+    removeGoBackListener
+  } from "../../../../common/js/utils";
   import {DEFAULT, ORGANIZATION} from "../../../../common/js/constants";
   import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
 
@@ -251,6 +256,7 @@
     methods: {
       create() {
         this.dialogOrgAddVisible = true;
+        listenGoBack(this.closeFunc);
       },
       addMember() {
         this.dialogOrgMemberAddVisible = true;
@@ -265,6 +271,7 @@
       edit(row) {
         this.dialogOrgUpdateVisible = true;
         this.form = Object.assign({}, row);
+        listenGoBack(this.closeFunc);
       },
       editMember(row) {
         this.dialogOrgMemberUpdateVisible = true;
@@ -275,6 +282,7 @@
         })
         // 编辑时填充角色信息
         this.$set(this.memberForm, 'roleIds', roleIds);
+        listenGoBack(this.closeFunc);
       },
       cellClick(row) {
         // 保存当前点击的组织信息到currentRow
@@ -297,6 +305,7 @@
           }
           this.dialogTotal = data.itemCount;
         });
+        listenGoBack(this.closeFunc);
       },
       dialogSearch() {
         let row = this.currentRow;
@@ -409,11 +418,15 @@
         })
       },
       closeFunc() {
-        this.form = {};
-      },
-      closeMemberFunc() {
         this.memberLineData = [];
         this.initTableData();
+        this.form = {};
+        removeGoBackListener(this.closeFunc);
+        this.dialogOrgAddVisible = false;
+        this.dialogOrgUpdateVisible = false;
+        this.dialogOrgMemberVisible = false;
+        this.dialogOrgMemberAddVisible = false;
+        this.dialogOrgMemberUpdateVisible = false;
       },
       handleSelectionChange(val) {
         this.multipleSelection = val;
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index cc85d4c990..cdb8a365db 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -28,7 +28,7 @@
     </el-card>
 
     <!-- add workspace dialog -->
-    <el-dialog :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%">
+    <el-dialog :title="$t('workspace.create')" :visible.sync="dialogWsAddVisible" width="30%" @close="close">
       <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -56,7 +56,7 @@
     </el-dialog>
 
     <!-- update workspace dialog -->
-    <el-dialog :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%">
+    <el-dialog :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%" @close="close">
       <el-form :model="form" :rules="rules" ref="updateForm" label-position="right" label-width="100px" size="small">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off"/>
@@ -202,8 +202,8 @@
   import {
     getCurrentOrganizationId,
     getCurrentUser,
-    getCurrentWorkspaceId,
-    refreshSessionAndCookies
+    getCurrentWorkspaceId, listenGoBack,
+    refreshSessionAndCookies, removeGoBackListener
   } from "../../../../common/js/utils";
   import {DEFAULT, WORKSPACE} from "../../../../common/js/constants";
   import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
@@ -230,6 +230,7 @@
         this.$get("/organization/list", response => {
           this.$set(this.form, "orgList", response.data);
         })
+        listenGoBack(this.close);
       },
       submit(formName) {
         this.$refs[formName].validate((valid) => {
@@ -255,7 +256,8 @@
         });
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.memberForm, "roles", response.data);
-        })
+        });
+        listenGoBack(this.handleClose);
       },
       cellClick(row) {
         // 保存当前点击的组织信息到currentRow
@@ -279,6 +281,7 @@
           }
           this.dialogTotal = data.itemCount;
         });
+        listenGoBack(this.closeWsMemberDialog);
       },
       dialogSearch() {
         let row = this.currentWorkspaceRow;
@@ -307,6 +310,12 @@
         this.$get("/organization/list", response => {
           this.$set(this.form, "orgList1", response.data);
         })
+        listenGoBack(this.close);
+      },
+      close() {
+        this.dialogWsAddVisible = false;
+        this.dialogWsUpdateVisible = false;
+        removeGoBackListener(this.close);
       },
       updateWorkspace(updateForm) {
         this.$refs[updateForm].validate(valid => {
@@ -323,10 +332,15 @@
       },
       handleClose() {
         this.memberForm = {};
+        this.dialogWsMemberAddVisible = false;
+        this.dialogWsMemberUpdateVisible = false;
+        removeGoBackListener(this.handleClose);
       },
       closeWsMemberDialog() {
         this.memberLineData = [];
         this.list();
+        removeGoBackListener(this.closeWsMemberDialog);
+        this.dialogWsMemberVisible = false;
       },
       list() {
         let url = '/workspace/list/all/' + this.currentPage + '/' + this.pageSize;
@@ -373,6 +387,7 @@
         })
         // 编辑时填充角色信息
         this.$set(this.memberForm, 'roleIds', roleIds);
+        listenGoBack(this.handleClose);
       },
       handleDelete(workspace) {
         this.$refs.deleteConfirm.open(workspace);
diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index 2ec9f74d97..6deb11b4ae 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -178,6 +178,7 @@
   import MsTableHeader from "../../common/components/MsTableHeader";
   import MsTableOperator from "../../common/components/MsTableOperator";
   import MsDialogFooter from "../../common/components/MsDialogFooter";
+  import {listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
 
   export default {
     name: "MsTestResourcePool",
@@ -272,11 +273,13 @@
       },
       create() {
         this.createVisible = true;
+        listenGoBack(this.closeFunc);
       },
       edit(row) {
         this.updateVisible = true;
         this.form = JSON.parse(JSON.stringify(row));
         this.convertResources();
+        listenGoBack(this.closeFunc);
       },
       convertResources() {
         let resources = [];
@@ -364,6 +367,9 @@
       },
       closeFunc() {
         this.form = {};
+        this.updateVisible = false;
+        this.createVisible = false;
+        removeGoBackListener(this.closeFunc);
       },
       changeSwitch(row) {
         this.result.loading = true;
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 685a1c989f..8f78c666f5 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -296,7 +296,7 @@
   import MsTableOperator from "../../common/components/MsTableOperator";
   import MsDialogFooter from "../../common/components/MsDialogFooter";
   import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
-  import {getCurrentUser} from "../../../../common/js/utils";
+  import {getCurrentUser, listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
   import MsRolesTag from "../../common/components/MsRolesTag";
 
   export default {
@@ -404,6 +404,7 @@
         this.createVisible = true;
         this.getOrgList();
         this.getWsList();
+        listenGoBack(this.handleClose);
       },
       edit(row) {
         this.updateVisible = true;
@@ -418,10 +419,12 @@
           let data = response.data;
           this.$set(this.form, "roles", data);
         });
+        listenGoBack(this.handleClose);
       },
       editPassword(row) {
         this.editPasswordVisible = true;
         this.ruleForm = Object.assign({}, row);
+        listenGoBack(this.handleClose);
       },
       del(row) {
         this.$confirm(this.$t('user.delete_confirm'), '', {
@@ -497,6 +500,10 @@
       handleClose() {
         this.form = {roles: [{id: ''}]};
         this.btnAddRole = false;
+        removeGoBackListener(this.handleClose);
+        this.editPasswordVisible =  false;
+        this.createVisible =  false;
+        this.updateVisible =  false;
       },
       changeSwitch(row) {
         this.$post('/user/special/update_status', row, () => {
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index ecb508387b..293b12f4da 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -108,7 +108,7 @@
   import MsRolesTag from "../../common/components/MsRolesTag";
   import MsTableOperator from "../../common/components/MsTableOperator";
   import MsDialogFooter from "../../common/components/MsDialogFooter";
-  import {getCurrentUser} from "../../../../common/js/utils";
+  import {getCurrentUser, listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
 
   export default {
     name: "MsMember",
@@ -173,6 +173,9 @@
       },
       handleClose() {
         this.form = {};
+        this.createVisible = false;
+        this.updateVisible = false;
+        removeGoBackListener(this.handleClose);
       },
       del(row) {
         this.$confirm(this.$t('member.remove_member'), '', {
@@ -197,6 +200,7 @@
         })
         // 编辑使填充角色信息
         this.$set(this.form, 'roleIds', roleIds);
+        listenGoBack(this.handleClose);
       },
       updateWorkspaceMember(formName) {
         let param = {
@@ -239,6 +243,7 @@
         this.result = this.$get('/role/list/test', response => {
           this.$set(this.form, "roles", response.data);
         })
+        listenGoBack(this.handleClose);
       },
       submitForm(formName) {
         this.$refs[formName].validate((valid) => {
diff --git a/frontend/src/business/components/track/case/components/BatchEdit.vue b/frontend/src/business/components/track/case/components/BatchEdit.vue
index 4ced43a5b2..aaa84a7503 100644
--- a/frontend/src/business/components/track/case/components/BatchEdit.vue
+++ b/frontend/src/business/components/track/case/components/BatchEdit.vue
@@ -36,6 +36,7 @@
 <script>
   import MsDialogFooter from "../../../common/components/MsDialogFooter";
   import {WORKSPACE_ID} from "../../../../../common/js/constants";
+  import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
 
   export default {
     name: "BatchEdit",
@@ -88,9 +89,11 @@
       open() {
         this.dialogVisible = true;
         this.size = this.$parent.selectRows.size;
+        listenGoBack(this.handleClose);
       },
       handleClose() {
         this.form = {};
+        removeGoBackListener(this.handleClose);
       },
       changeType(val) {
         this.$set(this.form, "value", "");
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 31813ab50a..207be036ad 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -224,6 +224,7 @@
 
   import {WORKSPACE_ID, TokenKey} from '../../../../../common/js/constants';
   import MsDialogFooter from '../../../common/components/MsDialogFooter'
+  import {listenGoBack, removeGoBackListener, removeListenGoBack} from "../../../../../common/js/utils";
 
   export default {
     name: "TestCaseEdit",
@@ -302,7 +303,12 @@
     methods: {
       open(testCase) {
         this.resetForm();
-        this.listenGoBack();
+
+        if (window.history && window.history.pushState) {
+          history.pushState(null, null, document.URL);
+          window.addEventListener('popstate', this.close);
+        }
+        listenGoBack(this.close);
         this.operationType = 'add';
         if (testCase) {
           //修改
@@ -354,16 +360,9 @@
           }
         });
       },
-      listenGoBack() {
-        //监听浏览器返回操作，关闭该对话框
-        if (window.history && window.history.pushState) {
-          history.pushState(null, null, document.URL);
-          window.addEventListener('popstate', this.close, false);
-        }
-      },
       close() {
         //移除监听，防止监听其他页面
-        window.removeEventListener('popstate', this.goBack, false);
+        removeGoBackListener(this.close);
         this.dialogFormVisible = false;
       },
       saveCase() {
diff --git a/frontend/src/business/components/track/case/components/TestCaseImport.vue b/frontend/src/business/components/track/case/components/TestCaseImport.vue
index 5e20a7f7ff..303f0a77ed 100644
--- a/frontend/src/business/components/track/case/components/TestCaseImport.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseImport.vue
@@ -1,6 +1,6 @@
 <template>
     <el-dialog class="testcase-import" :title="$t('test_track.case.import.case_import')" :visible.sync="dialogVisible"
-               @close="init">
+               @close="close">
 
       <el-row>
         <el-link type="primary" class="download-template"
@@ -44,6 +44,7 @@
 <script>
     import ElUploadList from "element-ui/packages/upload/src/upload-list";
     import MsTableButton from '../../../../components/common/components/MsTableButton';
+    import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
 
     export default {
       name: "TestCaseImport",
@@ -85,13 +86,16 @@
           this.isLoading = false;
           this.$error(err.message);
         },
-        init() {
+        open() {
+          listenGoBack(this.close);
+          this.dialogVisible = true;
+        },
+        close() {
+          removeGoBackListener(this.close);
+          this.dialogVisible = false;
           this.fileList = [];
           this.errList = [];
         },
-        open() {
-          this.dialogVisible = true;
-        },
         downloadTemplate() {
           this.$fileDownload('/test/case/export/template');
         },
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 3877c3c8ed..759b21a22b 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -172,7 +172,6 @@
         currentPage: 1,
         pageSize: 10,
         total: 0,
-        // selectIds: new Set(),
         selectRows: new Set(),
         priorityFilters: [
           {text: 'P0', value: 'P0'},
@@ -274,14 +273,8 @@
           confirmButtonText: this.$t('commons.confirm'),
           callback: (action) => {
             if (action === 'confirm') {
-              // this.$post('/test/case/batch/delete', {ids: [...this.selectIds]}, () => {
-              //   this.selectIds.clear();
-              //   this.$emit("refresh");
-              //   this.$success(this.$t('commons.delete_success'));
-              // });
               let ids = Array.from(this.selectRows).map(row => row.id);
               this.$post('/test/case/batch/delete', {ids: ids}, () => {
-                // this.selectIds.clear();
                 this.selectRows.clear();
                 this.$emit("refresh");
                 this.$success(this.$t('commons.delete_success'));
@@ -375,17 +368,12 @@
         });
       },
       handleBatch(type) {
-        // if (this.selectIds.size < 1) {
-        //   this.$warning(this.$t('test_track.plan_view.select_manipulate'));
-        //   return;
-        // }
         if (this.selectRows.size < 1) {
           this.$warning(this.$t('test_track.plan_view.select_manipulate'));
           return;
         }
         if (type === 'move') {
           let ids = Array.from(this.selectRows).map(row => row.id);
-          // this.$emit('moveToNode', this.selectIds);
           this.$emit('moveToNode', ids);
         } else if (type === 'delete') {
           this.handleDeleteBatch();
diff --git a/frontend/src/business/components/track/case/components/TestCaseMove.vue b/frontend/src/business/components/track/case/components/TestCaseMove.vue
index 8f1e6ef5bb..caecefd1cc 100644
--- a/frontend/src/business/components/track/case/components/TestCaseMove.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseMove.vue
@@ -25,6 +25,7 @@
 
 <script>
   import MsDialogFooter from '../../../common/components/MsDialogFooter';
+  import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
 
   export default {
     name: "TestCaseMove",
@@ -62,11 +63,13 @@
         this.moduleOptions = moduleOptions;
         this.selectIds = selectIds;
         this.dialogVisible = true;
+        listenGoBack(this.close);
       },
       close() {
         this.module = '';
         this.selectIds = [];
         this.dialogVisible = false;
+        removeGoBackListener(this.close);
       }
     }
   }
diff --git a/frontend/src/business/components/track/common/NodeEdit.vue b/frontend/src/business/components/track/common/NodeEdit.vue
index f6b9f2ca25..f71f2bc529 100644
--- a/frontend/src/business/components/track/common/NodeEdit.vue
+++ b/frontend/src/business/components/track/common/NodeEdit.vue
@@ -30,8 +30,8 @@
 </template>
 
 <script>
-  import {CURRENT_PROJECT} from '../../../../common/js/constants';
   import MsDialogFooter from '../../common/components/MsDialogFooter';
+  import {listenGoBack, removeGoBackListener} from "../../../../common/js/utils";
 
     export default {
       components: {MsDialogFooter},
@@ -70,6 +70,7 @@
             this.form.name = this.node.name;
           }
           this.nodeIds = nodeIds;
+          listenGoBack(this.close);
           this.dialogFormVisible = true;
         },
         saveNode() {
@@ -118,6 +119,7 @@
         },
         close() {
           this.form.name = '';
+          removeGoBackListener(this.close);
           this.dialogFormVisible = false;
         }
       }
diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index bbf7f22aa9..ce53fa9057 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -4,6 +4,7 @@
 
     <el-dialog :title="operationType == 'edit' ? $t('test_track.plan.edit_plan') : $t('test_track.plan.create_plan')"
                :visible.sync="dialogFormVisible"
+               @close="close"
                width="65%">
 
       <el-form :model="form" :rules="rules" ref="planFrom">
@@ -111,6 +112,7 @@
 
   import {WORKSPACE_ID} from '../../../../../common/js/constants';
   import TestPlanStatusButton from "../common/TestPlanStatusButton";
+  import {listenGoBack, removeGoBackListener} from "../../../../../common/js/utils";
 
   export default {
       name: "TestPlanEdit",
@@ -154,6 +156,7 @@
             Object.assign(tmp, testPlan);
             Object.assign(this.form, tmp);
           }
+          listenGoBack(this.close);
           this.dialogFormVisible = true;
         },
         savePlan(){
@@ -196,6 +199,10 @@
           this.form.status = status;
           this.$forceUpdate();
         },
+        close() {
+          removeGoBackListener(this.close);
+          this.dialogFormVisible = false;
+        },
         resetForm() {
           //防止点击修改后，点击新建触发校验
           if (this.$refs['planFrom']) {
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index cf76720022..42d5014407 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -225,6 +225,7 @@
   import ApiTestResult from "./test/ApiTestResult";
   import PerformanceTestDetail from "./test/PerformanceTestDetail";
   import PerformanceTestResult from "./test/PerformanceTestResult";
+  import {listenGoBack, removeGoBackListener} from "../../../../../../common/js/utils";
 
   export default {
     name: "TestPlanTestCaseEdit",
@@ -265,19 +266,8 @@
       }
     },
     methods: {
-      listenGoBack() {
-        //监听浏览器返回操作，关闭该对话框
-        if (window.history && window.history.pushState) {
-          history.pushState(null, null, document.URL);
-          window.addEventListener('popstate', this.goBack, false);
-        }
-      },
-      goBack() {
-        this.handleClose();
-      },
       handleClose() {
-        //移除监听，防止监听其他页面
-        window.removeEventListener('popstate', this.goBack, false);
+        removeGoBackListener(this.handleClose);
         this.showDialog = false;
       },
       cancel() {
@@ -359,7 +349,7 @@
       openTestCaseEdit(testCase) {
         this.showDialog = true;
         this.activeTab = 'detail';
-        this.listenGoBack();
+        listenGoBack(this.handleClose);
         this.initData(testCase);
       },
       initTest() {
diff --git a/frontend/src/common/js/utils.js b/frontend/src/common/js/utils.js
index fa53e88d4c..ae056950b8 100644
--- a/frontend/src/common/js/utils.js
+++ b/frontend/src/common/js/utils.js
@@ -174,3 +174,17 @@ export function downloadFile(name, content) {
     navigator.msSaveBlob(blob, name)
   }
 }
+
+export function listenGoBack( callback) {
+  //监听浏览器返回操作，关闭该对话框
+  if (window.history && window.history.pushState) {
+    history.pushState(null, null, document.URL);
+    window.addEventListener('popstate', callback);
+  }
+}
+
+export function removeGoBackListener(callback) {
+  window.removeEventListener('popstate', callback);
+}
+
+

From 60d863208be8e84ba55363926591f900bf28944e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 5 Aug 2020 18:21:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/api/service/APITestService.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 9e48420f56..a886c9ed3a 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -318,11 +318,13 @@ public class APITestService {
         List<String> resourceIds = schedules.stream()
                 .map(Schedule::getResourceId)
                 .collect(Collectors.toList());
-        ApiTestExample example = new ApiTestExample();
-        example.createCriteria().andIdIn(resourceIds);
-        List<ApiTest> apiTests = apiTestMapper.selectByExample(example);
-        Map<String, String> apiTestMap = apiTests.stream().collect(Collectors.toMap(ApiTest::getId, ApiTest::getName));
-        scheduleService.build(apiTestMap, schedules);
+        if (!resourceIds.isEmpty()) {
+            ApiTestExample example = new ApiTestExample();
+            example.createCriteria().andIdIn(resourceIds);
+            List<ApiTest> apiTests = apiTestMapper.selectByExample(example);
+            Map<String, String> apiTestMap = apiTests.stream().collect(Collectors.toMap(ApiTest::getId, ApiTest::getName));
+            scheduleService.build(apiTestMap, schedules);
+        }
         return schedules;
     }
 }