diff --git a/backend/src/main/java/io/metersphere/base/mapper/UiTaskRefreshMapper.java b/backend/src/main/java/io/metersphere/base/mapper/UiTaskRefreshMapper.java index 77c06b51c7..8c1d6f7efb 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/UiTaskRefreshMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/UiTaskRefreshMapper.java @@ -8,4 +8,6 @@ public interface UiTaskRefreshMapper { UiTaskRefresh getByTaskKey(@Param("taskKey") String taskKey); void insert(UiTaskRefresh uiTaskRefresh); + + void update(@Param("refresh") UiTaskRefresh refresh); } diff --git a/backend/src/main/java/io/metersphere/base/mapper/UiTaskRefreshMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/UiTaskRefreshMapper.xml index 699476b037..46d380af3f 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/UiTaskRefreshMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/UiTaskRefreshMapper.xml @@ -18,4 +18,18 @@ #{id}, #{taskKey}, #{taskStatus}, #{createTime} ) + + + UPDATE + ui_task_refresh + + + task_key = #{refresh.taskKey}, + + + task_status = #{refresh.taskStatus}, + + + WHERE id = #{refresh.id} + diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java index 4260c8df24..e4c0afc1ad 100644 --- a/backend/src/main/java/io/metersphere/service/ProjectService.java +++ b/backend/src/main/java/io/metersphere/service/ProjectService.java @@ -266,7 +266,9 @@ public class ProjectService { extModuleNodeMapper.insert(ProjectModuleDefaultNodeEnum.UI_SCENARIO_DEFAULT_NODE.getTableName(), record); record.setId(UUID.randomUUID().toString()); record.setName(ProjectModuleDefaultNodeEnum.UI_ELEMENT_DEFAULT_NODE.getNodeName()); + record.setModulePath("/" + record.getName()); extModuleNodeMapper.insertWithModulePath(ProjectModuleDefaultNodeEnum.UI_ELEMENT_DEFAULT_NODE.getTableName(), record); + record.setModulePath(null); ApiModule apiRecord = new ApiModule(); BeanUtils.copyBean(apiRecord, record); diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index a9abdd910d..806edbbea6 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit a9abdd910d6ae37351e2ecec6dfd830bd20e24ad +Subproject commit 806edbbea6b2b3fffbb18b8fb83f4d293a1eed34 diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 1bbac774ec..d357c326a7 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 1bbac774ec8f5dec7b177ba84967c98b1140a56d +Subproject commit d357c326a70088b0827ba1ced1d9cc035866170d diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 4376ac13a9..5da51f856b 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -3291,6 +3291,7 @@ export default { step_results: "Step results", treatment_method: "Treatment method", scenario_steps: "Scenario steps", - basic_information: "Basic information" + basic_information: "Basic information", + check_element: "Please select the elements" } }; diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index d5b9aff6f0..1fe2af8c3e 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -3347,6 +3347,7 @@ export default { step_results: "步骤结果", treatment_method: "处理方式", scenario_steps: "场景步骤", - basic_information: "基础信息" + basic_information: "基础信息", + check_element: "请勾选元素" } }; diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 91af46dfcc..22cff265f2 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -3294,6 +3294,7 @@ export default { step_results: "步骤结果", treatment_method: "處理方式", scenario_steps: "場景步驟", - basic_information: "基礎信息" + basic_information: "基礎信息", + check_element: "請勾選元素" } };