fix: TAPD缺陷修复

TAPD缺陷修复

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -413,8 +413,10 @@ public class ApiAutomationService {
                             http.setUrl(null);
                         } else {
                             ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
+                            if (apiDefinition != null) {
                                 http.setUrl(apiDefinition.getPath());
                             }
+                        }
                         if (http.isEnable()) {
                             if (StringUtils.isBlank(http.getUrl()) || !tr.isURL(http.getUrl())) {
                                 env.getProjectIds().add(http.getProjectId());
@@ -424,11 +426,15 @@ public class ApiAutomationService {
                     } else if (StringUtils.equals(tr.getType(), "JDBCSampler") || StringUtils.equals(tr.getType(), "TCPSampler")) {
                         if (StringUtils.equals(tr.getRefType(), "CASE")) {
                             ApiTestCaseWithBLOBs apiTestCaseWithBLOBs = apiTestCaseService.get(tr.getId());
+                            if (apiTestCaseWithBLOBs != null) {
                                 env.getProjectIds().add(apiTestCaseWithBLOBs.getProjectId());
+                            }
                         } else {
                             ApiDefinition apiDefinition = apiDefinitionService.get(tr.getId());
+                            if (apiDefinition != null) {
                                 env.getProjectIds().add(apiDefinition.getProjectId());
                             }
+                        }
                     } else if (StringUtils.equals(tr.getType(), "scenario")) {
                         if (tr.isEnable()) {
                             ApiScenarioWithBLOBs apiScenario = getApiScenario(tr.getId());

frontend/src/business/components/api/definition/ApiDefinition.vue

@@ -429,7 +429,8 @@
         this.setTabTitle(data);
       },
       mockConfig(data) {
-        this.handleMockTabsConfig(this.$t("commons.mock"), "MOCK", data);
+        let targetName = this.$t("commons.mock") + "-" + data.apiName;
+        this.handleMockTabsConfig(targetName, "MOCK", data);
       },
       saveApi(data) {
         this.setTabTitle(data);

frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue

@@ -2,7 +2,6 @@
 
   <div class="card-container">
     <el-card class="card-content" v-loading="httpForm.loading">
-
       <el-form :model="httpForm" :rules="rule" ref="httpForm" label-width="80px" label-position="right">
         <!-- 操作按钮 -->
         <div style="float: right;margin-right: 20px">
@@ -190,6 +189,10 @@
           return this.mockBaseUrl + "/mock/" + this.projectId;
         } else {
           let path = this.httpForm.path;
+          let prefix = "";
+          if (path.endsWith("/")) {
+            prefix = "/";
+          }
           let protocol = this.httpForm.method;
           if (protocol === 'GET' || protocol === 'DELETE') {
             if (this.httpForm.request != null && this.httpForm.request.rest != null) {
@@ -215,7 +218,8 @@
               }
             }
           }
-          return this.mockBaseUrl + "/mock/" + this.projectId + path;
+
+          return this.mockBaseUrl + "/mock/" + this.projectId + path + prefix;
         }
       }
     },
@@ -316,6 +320,7 @@
 
           this.$post('/mockConfig/genMockConfig', mockParam, response => {
             let mockConfig = response.data;
+            mockConfig.apiName = this.httpForm.name;
             this.$emit('mockConfig', mockConfig);
           });
         }

frontend/src/business/components/api/definition/components/document/ApiDocumentAnchor.vue

@@ -26,15 +26,21 @@
                     @keyup.enter.native="initApiDocSimpleList()" v-model="apiSearch.name"/>
           <api-document-batch-share v-xpack v-if="showXpackCompnent" @shareApiDocument="shareApiDocument" :project-id="projectId" :share-url="batchShareUrl" style="float: right;margin: 6px;font-size: 17px"/>
         </el-row>
-        <el-row v-else style="margin-top: 0px;position: fixed;float: right;margin-right: 0px;margin-left: 400px;top: 150px; right: 90px;">
+        <el-row v-else
-          <el-select size="small" :placeholder="$t('api_test.definition.document.order')" v-model="apiSearch.orderCondition" style="float: right;width: 180px;margin-right: 5px"
+                style="margin-top: 0px;position: fixed;float: right;margin-right: 0px;margin-left: 400px;top: 150px; right: 90px; z-index: 9999">
+          <el-select size="small" :placeholder="$t('api_test.definition.document.order')"
+                     v-model="apiSearch.orderCondition" style="float: right;width: 180px;margin-right: 5px"
                      class="ms-api-header-select" @change="initApiDocSimpleList" clearable>
-            <el-option key="createTimeDesc" :label="$t('api_test.definition.document.create_time_sort')" value="createTimeDesc" />
+            <el-option key="createTimeDesc" :label="$t('api_test.definition.document.create_time_sort')"
-            <el-option key="editTimeAsc" :label="$t('api_test.definition.document.edit_time_positive_sequence')" value="editTimeAsc"/>
+                       value="createTimeDesc"/>
-            <el-option key="editTimeDesc" :label="$t('api_test.definition.document.edit_time_Reverse_order')" value="editTimeDesc"/>
+            <el-option key="editTimeAsc" :label="$t('api_test.definition.document.edit_time_positive_sequence')"
+                       value="editTimeAsc"/>
+            <el-option key="editTimeDesc" :label="$t('api_test.definition.document.edit_time_Reverse_order')"
+                       value="editTimeDesc"/>
           </el-select>
 
-          <el-select size="small" :placeholder="$t('api_test.definition.document.request_method')" v-model="apiSearch.type" style="float: right;width: 180px;margin-right: 5px"
+          <el-select size="small" :placeholder="$t('api_test.definition.document.request_method')"
+                     v-model="apiSearch.type" style="float: right;width: 180px;margin-right: 5px"
                      class="ms-api-header-select" @change="initApiDocSimpleList" clearable>
             <el-option key="ALL" :label="$t('api_test.definition.document.data_set.all')" value="ALL"/>
             <el-option key="GET" :label="'GET '+$t('api_test.definition.document.request_interface')" value="GET"/>

frontend/src/business/components/api/definition/components/mock/MockConfig.vue

@@ -1,5 +1,6 @@
 <template>
-  <div>
+  <div class="card-container">
+    <el-card class="card-content" v-loading="mockConfigData.loading">
       <p class="tip">期望列表</p>
       <div class="card">
         <el-input :placeholder="$t('commons.search_by_name')" class="search-input" size="small"
@@ -81,7 +82,8 @@
             </el-row>
             <el-row>
               <div v-if="mockExpectConfig.request.jsonParam">
-              <ms-code-edit height="400px" :mode="'json'" ref="codeEdit" :data.sync="mockExpectConfig.request.jsonData"
+                <ms-code-edit height="400px" :mode="'json'" ref="codeEdit"
+                              :data.sync="mockExpectConfig.request.jsonData"
                               style="margin-top: 10px;"/>
               </div>
               <div v-else>
@@ -140,6 +142,7 @@
           </div>
         </div>
       </el-form>
+    </el-card>
   </div>
 </template>
 
@@ -195,7 +198,7 @@ export default {
           {max: 100, message: this.$t('test_track.length_less_than') + '100', trigger: 'blur'}
         ],
         response: {
-          httpCode: [{required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},],
+          httpCode: [{required: true, message: this.$t('api_test.mock.rule.input_code'), trigger: 'blur'},],
           delayed: [{required: true, message: this.$t('test_track.case.input_name'), trigger: 'blur'},],
         },
       },

frontend/src/common/js/tableUtils.js

@@ -46,6 +46,11 @@ export function setUnSelectIds(tableData, condition, selectRows) {
     return ids.indexOf(val) === -1;
   });
   if (condition.unSelectIds) {
+    //首先将选择的ID从unSelectIds中排除
+    condition.unSelectIds = condition.unSelectIds.filter(function (val) {
+      return ids.indexOf(val) === -1;
+    });
+    //去掉unselectIds中存在的ID
     let needPushIds = thisUnSelectIds.filter(function (val) {
       return condition.unSelectIds.indexOf(val) === -1;
     });

frontend/src/i18n/en-US.js

@@ -615,6 +615,9 @@ export default {
       req_param: "Request params",
       rsp_param: "Response Params",
       delete_mock_expect: "Confirm to delete this expect info ?",
+      rule: {
+        input_code: "Please input HTTP Code"
+      }
     },
     definition: {
       api_title: "Api test",

frontend/src/i18n/zh-CN.js

@@ -624,6 +624,9 @@ export default {
       req_param: "请求参数",
       rsp_param: "响应内容",
       delete_mock_expect: "确认删除这条预期吗？",
+      rule: {
+        input_code: "请输入 HTTP Code"
+      }
     },
     definition: {
       api_title: "接口列表",

frontend/src/i18n/zh-TW.js

@@ -614,6 +614,9 @@ export default {
       req_param: "請求參賽",
       rsp_param: "響應內容",
       delete_mock_expect: "確認刪除這條預期嗎？",
+      rule: {
+        input_code: "請輸入 HTTP Code"
+      }
     },
     definition: {
       api_title: "接口列表",