Commit Graph

5687 Commits

Author SHA1 Message Date
chenjianxing 03a8401b1b fix: 修复_fileter和_sort方法引用 2021-02-03 19:22:34 +08:00
chenjianxing 9b66d9c261 Merge branch 'v1.7' 2021-02-03 19:07:03 +08:00
chenjianxing 9ed341da50 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 19:05:12 +08:00
chenjianxing c115ea22e5 refactor: 代码优化 2021-02-03 19:04:50 +08:00
wenyann 167742dfd9 fix: 测试 2021-02-03 18:57:11 +08:00
fit2-zhao 76bcd14500 fix(接口定义): 排序修改 2021-02-03 18:50:02 +08:00
song.tianyang 0fa4facec4 fix: 代码格式优化
代码格式优化
2021-02-03 18:28:00 +08:00
chenjianxing 947ec17383 refactor: 抽取表格相关代码 2021-02-03 18:17:29 +08:00
fit2-zhao e69ee40438 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-03 17:48:37 +08:00
chenjianxing 937ce3f3c6 refactor: jar包管理优化 2021-02-03 17:21:20 +08:00
song.tianyang 683c533db0 Merge branch 'v1.7'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/track/service/TestPlanService.java
#	frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
#	frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
2021-02-03 17:11:04 +08:00
song.tianyang e3903adcd0 refactor: 添加国际化字段
添加国际化字段
2021-02-03 16:57:04 +08:00
shiziyuan9527 117571cd94 feat: 组织、工作空间下拉列表增加滚动条 2021-02-03 16:43:59 +08:00
fit2-zhao a803225644 fix(接口定义): 历史JDBC数据兼容处理 2021-02-03 15:25:51 +08:00
fit2-zhao 54d88a077f fix(场景自动化): 历史数据兼容处理 2021-02-03 14:22:28 +08:00
chenjianxing 16b2b185ed fix: 环境里的请求头会优先于请求里的请求头 2021-02-03 13:48:41 +08:00
Coooder-X 21f8e54069 fit: 解决冲突 2021-02-03 11:54:44 +08:00
Coooder-X 9a9f8f628b fear: (系统设置) 项目-jar包管理,支持查找 (#1350) 2021-02-03 11:23:17 +08:00
chenjianxing 171c7bc3b9 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 11:22:37 +08:00
Coooder-X 893485d592
fear: (系统设置) 项目-jar包管理,支持查找 (#1350) 2021-02-03 11:20:15 +08:00
Coooder-X 133035bd7a
fix: 测试计划无法编辑 (#1359) 2021-02-03 11:19:39 +08:00
chenjianxing b6f59bb15c fix: 滚动条宽度变化导致关联页面页面变形 2021-02-03 11:18:54 +08:00
fit2-zhao 3ba281e53c Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 10:47:22 +08:00
fit2-zhao f41beb6147 style(接口自动化): 整体展示样式优化 2021-02-03 10:46:56 +08:00
song.tianyang a09b8afb52 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-03 10:38:35 +08:00
song.tianyang 8e0d57a6d2 fix: 测试计划-关联功能测试用例-查看报告统计-切回到功能测试用例页后左侧模块列消失
解决测试计划-关联功能测试用例-查看报告统计-切回到功能测试用例页后左侧模块列消失的缺陷
2021-02-03 10:37:22 +08:00
fit2-zhao 8b3620337a refactor(接口自动化): 场景导入 jmx 基本完成 2021-02-03 10:03:07 +08:00
chenjianxing f26b96a38b fix: 国际化 2021-02-02 19:42:14 +08:00
chenjianxing 08cab71e00 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-02 19:23:16 +08:00
chenjianxing 80f34e4056 fix: 删除无用代码 2021-02-02 19:22:59 +08:00
song.tianyang cc390326ab Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 18:56:25 +08:00
song.tianyang 65427d18ca refactor: 测试计划关联接口用例,批量执行过程中前端显示加载状态
测试计划关联接口用例,批量执行过程中建议前端显示加载状态
2021-02-02 18:56:05 +08:00
chenjianxing ee1e55ac29 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-02 18:54:19 +08:00
chenjianxing 3e4e1272e6 fix: 测试计划场景列表tag显示问题 2021-02-02 18:53:57 +08:00
fit2-zhao 0217f0e0ed Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-02 17:46:13 +08:00
fit2-zhao c74e88c3f3 refactor(接口自动化): 场景导入 ms,postman 基本完成 2021-02-02 17:46:00 +08:00
shiziyuan9527 f8d5ad2363 feat(用例评审): 批量修改评审结果 2021-02-02 17:29:25 +08:00
chenjianxing f70995e175 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-02 16:14:45 +08:00
chenjianxing 6dcd2c5f48 fix: 模块移动国际化 2021-02-02 16:14:28 +08:00
song.tianyang c504b51625 fix: 针对场景批量添加到测试计划,不选计划的提示优化
针对场景批量添加到测试计划,不选计划的提示优化
2021-02-02 15:07:31 +08:00
song.tianyang 311e163a4c fix: 接口定义、场景、测试计划功能用例的表格,列拖动设置最小拖动植
接口定义、场景、测试计划功能用例的表格,列拖动设置最小拖动植,防止因表头换行导致的表格错位问题
2021-02-02 14:41:29 +08:00
song.tianyang 67a2752439 fix: 列拖宽时字符显示不完整
解决列拖宽时字符显示不完整的问题
2021-02-02 13:57:44 +08:00
song.tianyang adeedd6272 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 13:43:14 +08:00
song.tianyang 45c705d020 fix: 部分数据进入测试计划详情会报错
解决部分数据进入测试计划详情会报错的问题
2021-02-02 13:42:47 +08:00
chenjianxing f84f5fbbb3 refactor: 滚动条加粗 2021-02-02 12:06:16 +08:00
Coooder-X 66e9f091c2 fix: 解决 接口自动化-添加场景变量,焦点错误切换 (#1342) 2021-02-02 11:16:21 +08:00
wenyann 17f340002d Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 11:11:23 +08:00
wenyann c74c786725 fix: 修复导入swagger,模式选择覆盖,无法编辑 2021-02-02 11:10:56 +08:00
Coooder-X eb589b741e
fix: (接口定义) 将接口另存为新用例后,方法名会被前端自动替换为协议 (#1341) 2021-02-02 11:02:19 +08:00
Coooder-X bd2596a603
fix: 解决 接口自动化-添加场景变量,焦点错误切换 (#1342) 2021-02-02 11:01:49 +08:00