Commit 309aac73 authored by chenjianxing's avatar chenjianxing Committed by BugKing
Browse files

refactor: 场景跨项目导入导出置空所属项目

parent dc674611
v1.10 pr@v1.10@feat_参数添加长度描述 pr@v1.10@feat_同步禅道缺陷 pr@v1.10@feat_同步第三方平台缺陷状态 pr@v1.10@feat_执行测试计划接口用例后更新关联的功能用例状态 pr@v1.10@feat_接口定义定时任务改造 pr@v1.10@feat_部分列表自定义表头重构支持保存列宽 pr@v1.10@fix_ pr@v1.10@fix_32 pr@v1.10@fix_APIBackendListenerClient优化 pr@v1.10@fix_api_homepage pr@v1.10@fix_bug09 pr@v1.10@fix_bug3306 pr@v1.10@fix_bug3307dev_bug pr@v1.10@fix_bug8877 pr@v1.10@fix_jira提交空的非必填字段报错 pr@v1.10@fix_jira校验报错 pr@v1.10@fix_my_v1.10_bug pr@v1.10@fix_postman导入报错 pr@v1.10@fix_sql脚本中带了库名 pr@v1.10@fix_swagger导入报错 pr@v1.10@fix_swagger未导入到指定模块 pr@v1.10@fix_zentao_issue pr@v1.10@fix_修改SQL中大小写与实际表名不一致问题 pr@v1.10@fix_修改prometheus内存使用率查询公式 pr@v1.10@fix_修改vue2-ace-editor依赖 pr@v1.10@fix_列表展示模板字段失效 pr@v1.10@fix_列表展示自定义字段 pr@v1.10@fix_删除用例后数量统计错误 pr@v1.10@fix_删除项目清理定时任务 pr@v1.10@fix_同步缺陷失败 pr@v1.10@fix_回退问题PR pr@v1.10@fix_场景自定义ID导入保留ID pr@v1.10@fix_失败继续无效 pr@v1.10@fix_导出场景文件名为null pr@v1.10@fix_开多个窗口编辑场景样式错乱 pr@v1.10@fix_批量操作数量显示错误 pr@v1.10@fix_接口定义_列表筛选 pr@v1.10@fix_接口定义导入用例id重复 pr@v1.10@fix_接口定义导出swagger报错 pr@v1.10@fix_接口导入MS格式报空指针 pr@v1.10@fix_接口模块名带有斜杠导出导入异常 pr@v1.10@fix_操作日志列表报错 pr@v1.10@fix_查看场景测试报告报错 pr@v1.10@fix_模板编辑页面点击浏览器回退异常 pr@v1.10@fix_测试用例关联缺陷列表状态没更新 pr@v1.10@fix_测试用例导入创建人为空 pr@v1.10@fix_测试用例导入更新文本错误 pr@v1.10@fix_测试用例显示了已删除的缺陷 pr@v1.10@fix_测试计划-场景测试执行结果筛选失败 pr@v1.10@fix_测试计划-用例状态过滤失效 pr@v1.10@fix_测试计划报告报错 pr@v1.10@fix_测试计划测试用例编辑页面报错 pr@v1.10@fix_测试计划用例执行人显示 pr@v1.10@fix_测试计划用例自定义字段展示 pr@v1.10@fix_测试计划页面优化 pr@v1.10@fix_用例导入文件限制改为100M pr@v1.10@fix_用例导入无法显示责任人 pr@v1.10@fix_用例批量编辑自定义字段 pr@v1.10@fix_编辑场景滑动滚动条控制台报错 pr@v1.10@fix_编辑用例点击关联缺陷缺少数据 pr@v1.10@fix_脑图保存校验 pr@v1.10@fix_脑图创建用例自定义ID为空 pr@v1.10@fix_脑图无法删除用例 pr@v1.10@fix_自定义字段选项值校验 pr@v1.10@fix_自定义表头国际化问题 pr@v1.10@fix_选中模块后删除用例会显示全部用例 pr@v1.10@lyh_v1.10 pr@v1.10@refactor_Jira接口使用v2版本 pr@v1.10@refactor_jira缺陷描述支持图片 pr@v1.10@refactor_postman导入变量格式转换 pr@v1.10@refactor_tapd详情支持图片 pr@v1.10@refactor_勾选批量操作提示 pr@v1.10@refactor_右上角的帮助文档,修改为新页面打开 pr@v1.10@refactor_场景导入页面高度优化 pr@v1.10@refactor_接口定时任务编辑页面样式优化 pr@v1.10@refactor_测试用例页面创建人显示名称 pr@v1.10@refactor_测试计划用例添加保存按钮 pr@v1.10@refactor_用例上传大小限制改为50M pr@v1.10@refactor_缺陷列表增加用例数字段 pr@v1.10@refactor_缺陷列表添加过滤排序条件 pr@v1.10@refactor_缺陷列表点击关联用例跳转到用例列表过滤 pr@v1.10@refactor_规范建表语句 pr@v1.10@refactor_重构测试计划-场景测试 pr@v1.10@refactor_重构测试计划-性能测试页面 pr@v1.10@refactor_重构测试计划-接口测试页面 pr@v1.10@refactor_首页定时任务展示优化 pr@v1.10@style_调整多处样式使布局更加紧凑 pr@v1.10@去掉测试跟踪及接口测试首页tips pr@v1.10@构建完成后清理构建产物 pr@v1.10@编辑用例页面mock显示优化 prv1.10@fix_测试跟踪_变更历史 repr@dev_v1.10@678b9a6a3a9c4636aa1b9493850d60c4a6aed2df@fix_接口模块名带有斜杠导出导入异常 repr@dev_v1.10@70bf87ed@fix_接口自动化_场景步骤 repr@dev_v1.10@82e11e464edb0da216c6660c8ffde45819d27570@refactor_重构测试计划-接口测试页面 repr@dev_v1.10@cfebb59139baf5d4375384a15872ba6f90a7c6f1@refactor_重构测试计划-场景测试 repr@dev_v1.10@e9fceb49@fix_接口自动化_提示 repr@v1.10_dev@10e3fbec@fix_api_homepage repr@v1.10_dev@16ac406@fix_0615 repr@v1.10_dev@ab918f0@fix_scario_report_0616 v1.10.11-lts v1.10.10-lts v1.10.9-lts v1.10.8-lts v1.10.7-lts v1.10.7-lts-rc2 v1.10.7-lts-rc1 v1.10.6 v1.10.6-rc2 v1.10.6-rc1 v1.10.6-lts v1.10.5 v1.10.5-rc1 v1.10.5-lts v1.10.4 v1.10.4-rc2 v1.10.4-rc1 v1.10.4-lts v1.10.3 v1.10.3-rc3 v1.10.3-rc2 v1.10.3-rc1 v1.10.3-lts v1.10.2 v1.10.2-rc1 v1.10.2-lts v1.10.1 v1.10.1-rc1 v1.10.1-lts v1.10.0 v1.10.0-rc1 v1.10.0-lts
No related merge requests found
Showing with 23 additions and 7 deletions
+23 -7
......@@ -70,6 +70,10 @@ public class MsScenarioParser extends MsAbstractParser<ScenarioImport> {
if (scenarioDefinition != null) {
JSONArray hashTree = scenarioDefinition.getJSONArray("hashTree");
setCopy(hashTree);
JSONObject environmentMap = scenarioDefinition.getJSONObject("environmentMap");
if (environmentMap != null) {
scenarioDefinition.put("environmentMap", new HashMap<>());
}
item.setScenarioDefinition(JSONObject.toJSONString(scenarioDefinition));
}
}
......@@ -93,6 +97,11 @@ public class MsScenarioParser extends MsAbstractParser<ScenarioImport> {
if (StringUtils.isNotBlank(referenced) && StringUtils.equals(referenced, "REF")) {
object.put("referenced", "Copy");
}
object.put("projectId", "");
JSONObject environmentMap = object.getJSONObject("environmentMap");
if (environmentMap != null) {
object.put("environmentMap", new HashMap<>());
}
if (CollectionUtils.isNotEmpty(object.getJSONArray("hashTree"))) {
setCopy(object.getJSONArray("hashTree"));
}
......
......@@ -106,15 +106,20 @@
};
},
watch: {
'body.format'() {
'body.format'(oldValue, newValue) {
if (!oldValue) {
return;
}
const MsConvert = new Convert();
if (this.body.format === 'JSON-SCHEMA') {
this.body.jsonSchema = MsConvert.format(JSON.parse(this.body.raw));
} else {
MsConvert.schemaToJsonStr(this.body.jsonSchema, (result) => {
this.$set(this.body, 'raw', result);
this.reloadCodeEdit();
});
if (this.body.jsonSchema) {
MsConvert.schemaToJsonStr(this.body.jsonSchema, (result) => {
this.$set(this.body, 'raw', result);
this.reloadCodeEdit();
});
}
}
}
},
......
......@@ -82,7 +82,7 @@ export default {
},
props: {
screenHeight: {
type: Number,
type: [String, Number],
default: 400,
},
selectNodeIds: {
......
......@@ -4,7 +4,9 @@ export function _handleSelectAll(component, selection, tableData, selectRows, co
if (selection.length > 0) {
if (selection.length === 1) {
selection.hashTree = [];
selectRows.add(selection[0]);
tableData.forEach(item => {
component.$set(item, "showMore", true);
});
} else {
tableData.forEach(item => {
item.hashTree = [];
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment