test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(UI自动化): 修复元素库模块路径问题 

--story=1007525 --user=刘瑶 【UI测试】元素库优化 https://www.tapd.cn/55049933/s/1203207
This commit is contained in:
nathan.liu 2022-07-18 13:13:05 +08:00 committed by jianxing
parent fd0003fa60
commit fcb3ecae69
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtModuleNodeMapper.java
View File

@ -24,6 +24,8 @@ public interface ExtModuleNodeMapper {
void insert(@Param("tableName") String tableName, @Param("record") ModuleNode record); void insert(@Param("tableName") String tableName, @Param("record") ModuleNode record);
void insertWithModulePath(@Param("tableName") String tableName, @Param("record") ModuleNode record);
ModuleNodeDTO get(@Param("tableName") String tableName, @Param("id") String id); ModuleNodeDTO get(@Param("tableName") String tableName, @Param("id") String id);
void updatePos(@Param("tableName") String tableName, @Param("id") String id, @Param("pos") Double pos); void updatePos(@Param("tableName") String tableName, @Param("id") String id, @Param("pos") Double pos);

14
backend/src/main/java/io/metersphere/base/mapper/ext/ExtModuleNodeMapper.xml
View File

@ -70,6 +70,16 @@
</trim> </trim>
</insert> </insert>
<insert id="insert"> <insert id="insert">
insert into ${tableName} (id, project_id, `name`,
parent_id, `level`, create_time,
update_time, pos, create_user
)
values (#{record.id,jdbcType=VARCHAR}, #{record.projectId,jdbcType=VARCHAR}, #{record.name,jdbcType=VARCHAR},
#{record.parentId,jdbcType=VARCHAR}, #{record.level,jdbcType=INTEGER}, #{record.createTime,jdbcType=BIGINT},
#{record.updateTime,jdbcType=BIGINT}, #{record.pos,jdbcType=DOUBLE}, #{record.createUser,jdbcType=VARCHAR}
)
</insert>
<insert id="insertWithModulePath">
insert into ${tableName} (id, project_id, `name`, module_path, insert into ${tableName} (id, project_id, `name`, module_path,
parent_id, `level`, create_time, parent_id, `level`, create_time,
update_time, pos, create_user update_time, pos, create_user
@ -123,7 +133,9 @@
update ${tableName} update ${tableName}
set project_id = #{record.projectId,jdbcType=VARCHAR}, set project_id = #{record.projectId,jdbcType=VARCHAR},
`name` = #{record.name,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR},
`module_path` = #{record.modulePath,jdbcType=VARCHAR}, <if test="record.modulePath != null">
`module_path` = #{record.modulePath,jdbcType=VARCHAR},
</if>
parent_id = #{record.parentId,jdbcType=VARCHAR}, parent_id = #{record.parentId,jdbcType=VARCHAR},
`level` = #{record.level,jdbcType=INTEGER}, `level` = #{record.level,jdbcType=INTEGER},
create_time = #{record.createTime,jdbcType=BIGINT}, create_time = #{record.createTime,jdbcType=BIGINT},

2
backend/src/main/java/io/metersphere/service/ProjectService.java
View File

@ -266,7 +266,7 @@ public class ProjectService {
extModuleNodeMapper.insert(ProjectModuleDefaultNodeEnum.UI_SCENARIO_DEFAULT_NODE.getTableName(), record); extModuleNodeMapper.insert(ProjectModuleDefaultNodeEnum.UI_SCENARIO_DEFAULT_NODE.getTableName(), record);
record.setId(UUID.randomUUID().toString()); record.setId(UUID.randomUUID().toString());
record.setName(ProjectModuleDefaultNodeEnum.UI_ELEMENT_DEFAULT_NODE.getNodeName()); record.setName(ProjectModuleDefaultNodeEnum.UI_ELEMENT_DEFAULT_NODE.getNodeName());
extModuleNodeMapper.insert(ProjectModuleDefaultNodeEnum.UI_ELEMENT_DEFAULT_NODE.getTableName(), record); extModuleNodeMapper.insertWithModulePath(ProjectModuleDefaultNodeEnum.UI_ELEMENT_DEFAULT_NODE.getTableName(), record);
ApiModule apiRecord = new ApiModule(); ApiModule apiRecord = new ApiModule();
BeanUtils.copyBean(apiRecord, record); BeanUtils.copyBean(apiRecord, record);

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit ff5b6db69dd600fb7c68db33256e01efdd51e705 Subproject commit fcfe1200cffcd15d8079aa0386fedc9d489f5fe7

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 9b9233d775b00461cc29a537243ff391fe0bf2e8 Subproject commit b8ec7e7e2cf2d0a7dba138f7895428298652cac2