fix(接口测试): 修复复制的场景无法添加前后置脚本的缺陷

--bug=1026590 --user=王孝刚 [接口测试] github#24667最新版MS的接口自动化-场景导入-场景复制后，无法进行前后置脚本编写 https://www.tapd.cn/55049933/s/1377035
metersphere · May 30, 2023 · 793c972 · 793c972
1 parent 29a054f
commit 793c972
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 5 deletions.
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
@@ -258,6 +258,10 @@
                 UNION
                 SELECT project_id
                 FROM load_test_report
+                WHERE id = #{resourceId}
+                UNION
+                SELECT project_id
+                FROM api_test_environment
                 WHERE id = #{resourceId})
         LIMIT 1
     </select>

diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java
@@ -1379,7 +1379,7 @@ public UserDTO.PlatformInfo getCurrentPlatformInfo(String workspaceId) {
     public void updateCurrentUserByResourceId(String resourceId) {
         Project project = extProjectMapper.selectProjectByResourceId(resourceId);
         if (project == null) {
-            return;
+            MSException.throwException(Translator.get("select_resource_error_and_check"));
         }
         SessionUser user = SessionUtils.getUser();
         user.setLastProjectId(project.getId());

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
@@ -77,3 +77,4 @@ issue_jira_info_error=
 case_status_not_exist=
 jira_auth_error=
 file_name_error=
+select_resource_error_and_check=
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -389,4 +389,5 @@ tcp_mock_not_unique=This tcp port is be used
 no_tcp_mock_port=No idle tcp port, please contact administrators.
 name_already_exists_in_module=Name already exists in same module
 plan_warning=There is no associated executable use case under the test plan
-file_name_error=Illegal file name
+file_name_error=Illegal file name
+select_resource_error_and_check=Select the resource error, check it please
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -389,3 +389,4 @@ no_tcp_mock_port=无可用的TCP端口号，请联系管理员
 name_already_exists_in_module=同层级下已经存在
 plan_warning=测试计划下没有关联可以执行的用例
 file_name_error=文件名非法
+select_resource_error_and_check=查找资源出错，请检查资源是否存在
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -387,4 +387,5 @@ tcp_mock_not_unique=該TCP端口號已被使用
 no_tcp_mock_port=無可用的TCP端口號，請聯繫管理員
 name_already_exists_in_module=同層級下已存在
 plan_warning=測試計劃下沒有關聯可以執行的用例
-file_name_error=文件名非法
+file_name_error=文件名非法
+select_resource_error_and_check=查找資源出錯，請檢查資源是否存在
diff --git a/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue b/frontend/src/business/components/api/automation/scenario/component/ApiScenarioComponent.vue
@@ -256,7 +256,6 @@ export default {
       for (let i in arr) {
         arr[i].disabled = disabled;
         arr[i].projectId = this.calcProjectId(arr[i].projectId, id);
-        arr[i].notAddStep = true;
         // 处理子请求环境
         let typeArray = ["JDBCPostProcessor", "JDBCSampler", "JDBCPreProcessor"]
         if (typeArray.indexOf(arr[i].type) !== -1) {

diff --git a/frontend/src/business/components/api/definition/components/step/JmxStep.vue b/frontend/src/business/components/api/definition/components/step/JmxStep.vue
@@ -18,7 +18,7 @@
           :value="item.id">
         </el-option>
       </el-select>
-      <el-button size="mini" @click="add" type="primary" v-if="tabType !== 'assertionsRule'" :disabled="request.notAddStep">
+      <el-button size="mini" @click="add" type="primary" v-if="tabType !== 'assertionsRule'">
         {{ $t('api_test.request.assertions.add') }}
       </el-button>
     </p>