Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml

@@ -306,9 +306,12 @@
                 or test_case.num like CONCAT('%', #{request.name},'%')
                 or test_case.tags like CONCAT('%', #{request.name},'%'))
             </if>
-            <if test="request.createTime >0">
+            <if test="request.relevanceCreateTime >0">
                 and test_case.id in (select test_case_id from test_case_test where test_case_test.create_time >= #{request.createTime})
             </if>
+            <if test="request.createTime >0">
+                and test_case.create_time >= #{request.createTime}
+            </if>
             <if test="request.nodeIds != null and request.nodeIds.size() > 0">
                 and test_case.node_id in
                 <foreach collection="request.nodeIds" item="nodeId" separator="," open="(" close=")">

backend/src/main/java/io/metersphere/track/request/testcase/QueryTestCaseRequest.java

@@ -24,8 +24,10 @@ public class QueryTestCaseRequest extends BaseQueryRequest {
     private String reviewId;
 
     private boolean isSelectThisWeedData = false;
+    private boolean isSelectThisWeedRelevanceData = false;
 
     private String caseCoverage;
 
     private long createTime = 0;
+    private long relevanceCreateTime = 0;
 }

backend/src/main/java/io/metersphere/track/service/TestCaseService.java

@@ -210,13 +210,19 @@ public class TestCaseService {
      */
     private void initRequest(QueryTestCaseRequest request, boolean checkThisWeekData) {
         if (checkThisWeekData) {
-            if (request.isSelectThisWeedData()) {
             Map<String, Date> weekFirstTimeAndLastTime = DateUtils.getWeedFirstTimeAndLastTime(new Date());
             Date weekFirstTime = weekFirstTimeAndLastTime.get("firstTime");
+            if (request.isSelectThisWeedData()) {
                 if (weekFirstTime != null) {
                     request.setCreateTime(weekFirstTime.getTime());
                 }
             }
+            if (request.isSelectThisWeedRelevanceData()) {
+                if (weekFirstTime != null) {
+                    request.setRelevanceCreateTime(weekFirstTime.getTime());
+                }
+            }
+
         }
     }
 

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -439,6 +439,14 @@ export default {
     if (this.type === 'edit' || this.type === 'copy') {
       this.open(this.currentTestCaseInfo)
     }
+    // Cascader 级联选择器: 点击文本就让它自动点击前面的input就可以触发选择。
+    setInterval(function () {
+      document.querySelectorAll('.el-cascader-node__label').forEach(el => {
+        el.onclick = function () {
+          if (this.previousElementSibling) this.previousElementSibling.click();
+        };
+      });
+    }, 1000);
   },
   watch: {
     treeNodes() {

frontend/src/business/components/track/case/components/TestCaseList.vue

@@ -409,11 +409,15 @@ export default {
     getData() {
       this.getSelectDataRange();
       this.condition.selectThisWeedData = false;
+      this.condition.selectThisWeedRelevanceData = false;
       this.condition.caseCoverage = null;
       switch (this.selectDataRange) {
         case 'thisWeekCount':
           this.condition.selectThisWeedData = true;
           break;
+        case 'thisWeekRelevanceCount':
+          this.condition.selectThisWeedRelevanceData = true;
+          break;
         case 'uncoverage':
           this.condition.caseCoverage = 'uncoverage';
           break;

frontend/src/business/components/track/head/TrackHeaderMenus.vue

@@ -9,7 +9,10 @@
           <el-menu-item :index="'/track/home'">
             {{ $t("i18n.home") }}
           </el-menu-item>
-
+          <el-menu-item :index="'/track/case/all'">
+            {{ $t("test_track.case.test_case") }}
+          </el-menu-item>
+          <!--
                     <el-submenu v-permission="['test_manager','test_user','test_viewer']"
                                 index="6" popper-class="submenu">
                       <template v-slot:title>{{ $t('test_track.case.test_case') }}</template>
@@ -21,6 +24,7 @@
                       <ms-create-button v-permission="['test_manager','test_user']" :index="'/track/case/create'"
                                         :title="$t('test_track.case.create_case')"/>
                     </el-submenu>
+          -->
 
           <el-submenu v-permission="['test_manager','test_user','test_viewer']"
                       index="8" popper-class="submenu">

frontend/src/business/components/track/home/components/RelevanceCaseCard.vue

@@ -40,7 +40,7 @@
         <el-row>
           <el-col>
             {{$t('api_test.home_page.api_details_card.this_week_add')}}
-            <el-link type="info" @click="redirectPage('thisWeekCount')" target="_blank" style="color: #000000">{{relevanceCountData.thisWeekAddedCount}}
+            <el-link type="info" @click="redirectPage('thisWeekRelevanceCount')" target="_blank" style="color: #000000">{{relevanceCountData.thisWeekAddedCount}}
             </el-link>
             {{$t('api_test.home_page.unit_of_measurement')}}
           </el-col>