Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/metersphere/service/UserService.java

@@ -195,6 +195,17 @@ public class UserService {
         String userId = user.getId();
         UserRoleExample userRoleExample = new UserRoleExample();
         userRoleExample.createCriteria().andUserIdEqualTo(userId);
+        List<UserRole> userRoles = userRoleMapper.selectByExample(userRoleExample);
+        List<String> list = userRoles.stream().map(UserRole::getSourceId).collect(Collectors.toList());
+
+        if (!CollectionUtils.isEmpty(list)) {
+            if (list.contains(user.getLastWorkspaceId()) || list.contains(user.getLastOrganizationId())) {
+                user.setLastOrganizationId("");
+                user.setLastWorkspaceId("");
+                userMapper.updateByPrimaryKeySelective(user);
+            }
+        }
+
         userRoleMapper.deleteByExample(userRoleExample);
         List<Map<String, Object>> roles = user.getRoles();
         if (!roles.isEmpty()) {
@@ -275,6 +286,14 @@ public class UserService {
         UserRoleExample example = new UserRoleExample();
         example.createCriteria().andRoleIdLike("%test%")
                 .andUserIdEqualTo(userId).andSourceIdEqualTo(workspaceId);
+
+        User user = userMapper.selectByPrimaryKey(userId);
+        if (StringUtils.equals(workspaceId, user.getLastWorkspaceId())) {
+            user.setLastWorkspaceId("");
+            user.setLastOrganizationId("");
+            userMapper.updateByPrimaryKeySelective(user);
+        }
+
         userRoleMapper.deleteByExample(example);
     }
 
@@ -305,6 +324,14 @@ public class UserService {
     public void delOrganizationMember(String organizationId, String userId) {
         UserRoleExample userRoleExample = new UserRoleExample();
         userRoleExample.createCriteria().andRoleIdLike("%org%").andUserIdEqualTo(userId).andSourceIdEqualTo(organizationId);
+
+        User user = userMapper.selectByPrimaryKey(userId);
+        if (StringUtils.equals(organizationId, user.getLastOrganizationId())) {
+            user.setLastWorkspaceId("");
+            user.setLastOrganizationId("");
+            userMapper.updateByPrimaryKeySelective(user);
+        }
+
         userRoleMapper.deleteByExample(userRoleExample);
     }
 

frontend/src/business/components/track/plan/components/TestPlanList.vue

@@ -29,6 +29,7 @@
         :label="$t('test_track.plan.plan_status')"
         show-overflow-tooltip>
         <template v-slot:default="scope">
+          <div @click.stop="false">
             <el-dropdown class="test-case-status" @command="statusChange">
               <span class="el-dropdown-link">
                 <plan-status-table-item :value="scope.row.status"/>
@@ -45,7 +46,7 @@
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-
+          </div>
         </template>
       </el-table-column>
       <el-table-column

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue

@@ -167,7 +167,7 @@
               </el-row>
 
               <el-row v-if="testCase.issues && testCase.issues.hasIssues">
-                <el-col :span="20" :offset="1" class="step-edit">
+                <el-col :span="20" :offset="1" class="issues-edit">
                   <ckeditor :editor="editor" :disabled="isReadOnly" :config="editorConfig" v-model="testCase.issues.content"/>
                 </el-col>
               </el-row>
@@ -425,7 +425,7 @@
     line-height: 50px;
   }
 
-  .step-edit >>> p {
+  .issues-edit >>> p {
     line-height: 16px;
   }
 
@@ -456,5 +456,4 @@
   .el-switch >>> .el-switch__label.is-active {
     color: #409EFF;
   }
-
 </style>

frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue

@@ -86,7 +86,8 @@
           column-key="status"
           :label="$t('test_track.plan_view.execute_result')">
           <template v-slot:default="scope">
-              <el-dropdown class="test-case-status" @command="statusChange">
+            <div @click.stop="false">
+              <el-dropdown class="test-case-status" @command="statusChange" >
                 <span class="el-dropdown-link">
                   <status-table-item :value="scope.row.status"/>
                 </span>
@@ -105,6 +106,7 @@
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
+            </div>
           </template>
         </el-table-column>
 

frontend/src/common/css/main.css

@@ -33,8 +33,10 @@ body {
   clear: both;
 }
 
-
-
+/*解决富文本框中link显示问题*/
+.ck-rounded-corners .ck.ck-balloon-panel,.ck.ck-balloon-panel.ck-rounded-corners {
+  z-index: 10055 !important;
+}
 
 .table-card > .el-card__body {
   padding-top: 0;