From 6923bac8053d654b1e091507941faabe058724a8 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 27 May 2022 15:09:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=84=91=E5=9B=BE=E5=90=8E=E4=B8=8D=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E5=88=87=E6=8D=A2=E5=B7=A5=E4=BD=9C=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1010568 --user=陈建星 【测试跟踪】-功能用例 编辑脑图后不保存，切换工作空间 后 ，点击保存/取消 页面一直处于加载状态 https://www.tapd.cn/55049933/s/1166187
---
 .../common/components/IsChangeConfirm.vue     | 17 +++++++---
 .../components/common/head/HeaderWs.vue       | 33 ++++++++++++++-----
 .../components/track/case/TestCase.vue        | 11 ++++++-
 frontend/src/store/index.js                   |  3 +-
 frontend/src/store/mutations.js               |  1 +
 5 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/frontend/src/business/components/common/components/IsChangeConfirm.vue b/frontend/src/business/components/common/components/IsChangeConfirm.vue
index d903a1a0b1..b740257e9d 100644
--- a/frontend/src/business/components/common/components/IsChangeConfirm.vue
+++ b/frontend/src/business/components/common/components/IsChangeConfirm.vue
@@ -4,7 +4,8 @@
     width="20%"
     :title="title"
     :with-footer="false"
-    :close-on-click-modal="false">
+    :close-on-click-modal="false"
+    @close="handleClose">
     {{tip}}
     <template v-slot:footer>
       <el-button type="primary" @click="save" @keydown.enter.native.prevent>{{$t('保存')}}</el-button>
@@ -21,22 +22,28 @@ export default {
   data() {
     return {
       visible: false,
-      data: {}
+      data: {
+        temWorkspaceId: null
+      }
     }
   },
   props: ['title','tip', 'versionEnable'],
   methods: {
-    open(item) {
+    open(item, temWorkspaceId) {
       this.visible = true;
+      this.temWorkspaceId = temWorkspaceId ? temWorkspaceId : null;
       this.data = item;
     },
     save() {
-      this.$emit('confirm', true);
+      this.$emit('confirm', true, this.temWorkspaceId);
       this.visible = false;
     },
     cancel() {
-      this.$emit('confirm', false);
+      this.$emit('confirm', false, this.temWorkspaceId);
       this.visible = false;
+    },
+    handleClose() {
+      this.$store.commit('setTemWorkspaceId', null);
     }
   }
 
diff --git a/frontend/src/business/components/common/head/HeaderWs.vue b/frontend/src/business/components/common/head/HeaderWs.vue
index 9a8f7fbf3c..7ca1dd4f63 100644
--- a/frontend/src/business/components/common/head/HeaderWs.vue
+++ b/frontend/src/business/components/common/head/HeaderWs.vue
@@ -40,8 +40,12 @@ import {PROJECT_ID, WORKSPACE_ID} from "@/common/js/constants";
 export default {
   name: "MsHeaderWs",
   created() {
+    this.$EventBus.$on('changeWs', this._changeWs);
     this.initMenuData();
   },
+  destroyed() {
+    this.$EventBus.$off('changeWs', this._changeWs);
+  },
   inject: [
     'reloadTopMenus',
   ],
@@ -98,15 +102,26 @@ export default {
       if (!workspaceId || getCurrentWorkspaceId() === workspaceId) {
         return false;
       }
-      const loading = fullScreenLoading(this);
-      this.$post("/user/switch/source/ws/" + workspaceId, {}, response => {
-        saveLocalStorage(response);
-        sessionStorage.setItem(WORKSPACE_ID, workspaceId);
-        sessionStorage.setItem(PROJECT_ID, response.data.lastProjectId);
-        this.$router.push(this.getRedirectUrl(response.data)).then(() => {
-          this.reloadTopMenus(stopFullScreenLoading(loading));
-        }).catch(err => err);
-      });
+      let isTestCaseMinderChanged = this.$store.state.isTestCaseMinderChanged;
+      if (isTestCaseMinderChanged) {
+        // 脑图提示保存
+        this.$store.commit('setTemWorkspaceId', workspaceId);
+        return;
+      }
+      this._changeWs(workspaceId);
+    },
+    _changeWs(workspaceId) {
+      if (workspaceId) {
+        const loading = fullScreenLoading(this);
+        this.$post("/user/switch/source/ws/" + workspaceId, {}, response => {
+          saveLocalStorage(response);
+          sessionStorage.setItem(WORKSPACE_ID, workspaceId);
+          sessionStorage.setItem(PROJECT_ID, response.data.lastProjectId);
+          this.$router.push(this.getRedirectUrl(response.data)).then(() => {
+            this.reloadTopMenus(stopFullScreenLoading(loading));
+          }).catch(err => err);
+        });
+      }
     },
     query(queryString) {
       this.workspaceList = queryString ? this.wsListCopy.filter(this.createFilter(queryString)) : this.wsListCopy;
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index f0d951b580..2f05384052 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -309,6 +309,11 @@ export default {
       } else {
         this.activeName = 'default';
       }
+    },
+    '$store.state.temWorkspaceId'() {
+      if (this.$store.state.temWorkspaceId) {
+        this.$refs.isChangeConfirm.open(null, this.$store.state.temWorkspaceId);
+      }
     }
   },
   computed: {
@@ -363,8 +368,12 @@ export default {
     updateActiveDom(activeDom) {
       openMinderConfirm(this, activeDom);
     },
-    changeConfirm(isSave) {
+    changeConfirm(isSave, temWorkspaceId) {
       saveMinderConfirm(this, isSave);
+      if (temWorkspaceId) {
+        // 如果是切换工作空间提示的保存，则保存完后跳转到对应的工作空间
+        this.$EventBus.$emit('changeWs', temWorkspaceId);
+      }
     },
     changeRedirectParam(redirectIDParam) {
       this.redirectID = redirectIDParam;
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index fd9c47f136..75e71224dd 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -47,7 +47,8 @@ const state = {
   uiElementLibraryModuleIds: null,
   uiElementLibraryElements: null,
   refreshUiScenario: false,
-  showLicenseCountWarning: false
+  showLicenseCountWarning: false,
+  temWorkspaceId: null
 }
 
 const store = new Vuex.Store({
diff --git a/frontend/src/store/mutations.js b/frontend/src/store/mutations.js
index 163bc132a6..6d9d1e7c99 100644
--- a/frontend/src/store/mutations.js
+++ b/frontend/src/store/mutations.js
@@ -30,6 +30,7 @@ const mutations = {
   setRefreshUiScenario: (state, value) => state.refreshUiScenario = value,
   setSelectUiGroup: (state, value) => state.selectUiGroup = value,
   setShowLicenseCountWarning: (state, value) => state.showLicenseCountWarning = value,
+  setTemWorkspaceId: (state, value) => state.temWorkspaceId = value,
 }
 
 export default mutations;