Commit Graph

3626 Commits

Author SHA1 Message Date
wenyann b9522607ef Merge remote-tracking branch 'origin/master' 2021-01-27 18:20:29 +08:00
wenyann c04aeae9df feat: 弹框优化 2021-01-27 18:19:48 +08:00
song.tianyang f2b64c9a20 Merge remote-tracking branch 'origin/master' 2021-01-27 18:10:28 +08:00
song.tianyang 8e2bd2224e fix: 复制场景修改场景名称后,tab页的名称没跟着变
修复复制场景修改场景名称后,tab页的名称没跟着变的问题
2021-01-27 18:10:04 +08:00
shiziyuan9527 a9f918716a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 18:06:29 +08:00
shiziyuan9527 4235003784 fix(接口定义): 修复用例列表-复制用例,标签没复制 2021-01-27 18:05:38 +08:00
fit2-zhao e0da5d4dc6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 18:04:49 +08:00
fit2-zhao 2cde4124fa fix(接口自动化): 修复遮罩层问题 2021-01-27 18:04:06 +08:00
wenyann c4d38a2c4f Merge remote-tracking branch 'origin/master' 2021-01-27 17:27:54 +08:00
wenyann 3ba612e17e feat: 弹框优化 2021-01-27 17:26:56 +08:00
song.tianyang c9fdccf85e fix: 测试计划-测试用例表格增加列固定
测试计划-测试用例表格增加列固定
2021-01-27 17:23:05 +08:00
song.tianyang 4af22aee1c fix: 环境配置-增加复制按钮
环境配置-增加复制按钮
2021-01-27 17:13:48 +08:00
song.tianyang 45629caa27 Merge remote-tracking branch 'origin/master' 2021-01-27 16:59:48 +08:00
song.tianyang 008beee84e fix: 性能测试报告列表-触发方式筛选-增加"用例触发"
性能测试报告列表-触发方式筛选-增加"用例触发"
2021-01-27 16:59:32 +08:00
fit2-zhao ff530b7c8f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 16:56:39 +08:00
fit2-zhao 0b9578ed5c fix(接口自动化): 重新计算报告执行总时间 2021-01-27 16:56:29 +08:00
song.tianyang 44189ef315 Merge remote-tracking branch 'origin/master' 2021-01-27 16:45:28 +08:00
song.tianyang 3dd54a302a fix: 接口自动化-场景列表-批量移动,弹框显示问题
解决接口自动化-场景列表-批量移动,弹框显示的问题
2021-01-27 16:45:08 +08:00
shiziyuan9527 92fd2166ef refactor(测试计划): 功能用例列表固定操作列 2021-01-27 16:24:35 +08:00
song.tianyang dca610b899 Merge remote-tracking branch 'origin/master' 2021-01-27 16:15:51 +08:00
song.tianyang e8d2f8b92b fix: 接口测试-首页-场景用例数量统计-本周新增跳转错误
解决接口测试-首页-场景用例数量统计-本周新增跳转错误的错误
2021-01-27 16:15:32 +08:00
shiziyuan9527 ae909070a2 refactor: 统一搜索提示文本 2021-01-27 16:00:18 +08:00
shiziyuan9527 7eec10e634 refactor(测试计划): 功能用例显示标签列 2021-01-27 15:38:12 +08:00
shiziyuan9527 79705a36f9 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 14:58:39 +08:00
shiziyuan9527 ead4963413 fix(接口定义): 修复用例列表新建用例时标签未清空的问题 2021-01-27 14:56:33 +08:00
BugKing 3941e2170a refactor: 修改版本号 2021-01-27 14:55:06 +08:00
wenyann 0afb257184 Merge remote-tracking branch 'origin/master' 2021-01-27 14:53:53 +08:00
wenyann 3acc2a1edd feat: switch样式调整 2021-01-27 14:51:16 +08:00
chenjianxing a404fbfaf5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 14:24:58 +08:00
fit2-zhao 90e57f12d8 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 14:15:41 +08:00
fit2-zhao dd7843525c fix(场景自动化): 自定义请求修复 2021-01-27 14:15:17 +08:00
Captain.B e1cb0dc88d Merge remote-tracking branch 'origin/master' 2021-01-27 13:46:53 +08:00
Captain.B 9583cd95ae refactor: 修改配置oidc认证源的参数 2021-01-27 13:43:57 +08:00
Captain.B 866db48255 refactor: 修改配置oidc认证源的参数 2021-01-27 13:40:40 +08:00
chenjianxing d8c4bf0789 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 13:40:21 +08:00
fit2-zhao d1b32083da Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 13:40:07 +08:00
chenjianxing 832636725e fix: tag描述 2021-01-27 13:39:56 +08:00
fit2-zhao 42273bebf0 style(接口自动化): 控制台参数设置 2021-01-27 13:39:46 +08:00
Captain.B 15f4489cf2 fix: 修复 Missing URI template variable 'a' for method parameter of type String 2021-01-27 13:10:57 +08:00
Captain.B 77a1235ff6 Merge remote-tracking branch 'origin/master' 2021-01-27 12:51:02 +08:00
Captain.B af69dfe7ba fix: 修复改变认证源状态报错的问题 2021-01-27 12:49:48 +08:00
fit2-zhao d6b2336d35 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 11:35:10 +08:00
fit2-zhao c820538f9f fix(场景自动化): 场景变量设置 2021-01-27 11:34:49 +08:00
chenjianxing 7f207e72b6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 11:33:47 +08:00
chenjianxing 13ddaa5aca refactor: 修改添加标签描述 2021-01-27 11:33:17 +08:00
fit2-zhao 982169c1c9 fix(接口定义): 展开用例 2021-01-27 11:18:02 +08:00
fit2-zhao f84db83a4c fix(接口定义): 快捷调试另存为用例,并自动创建一条接口 2021-01-27 11:16:54 +08:00
song.tianyang 7035f6c0e3 fix: 接口场景表格-拓展按钮换行的问题
解决接口场景表格-拓展按钮换行的问题
2021-01-27 01:35:08 +08:00
song.tianyang 93ec184ba7 fix: 性能测试-批量删除弹出多条提示
解决性能测试-批量删除弹出多条提示的问题
2021-01-27 00:06:55 +08:00
song.tianyang f21574c2e7 fix: 测试跟踪-报告-查看报告详情,导出报告卡死
解决测试跟踪-报告-查看报告详情,导出报告卡死的问题
2021-01-26 23:09:40 +08:00
shiziyuan9527 cb8ff8904d fix: 构建失败,回退 2021-01-26 22:06:49 +08:00
chenjianxing 2d0477b705 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 21:46:01 +08:00
chenjianxing 39220420fe fix: 自动格式化 2021-01-26 21:45:45 +08:00
shiziyuan9527 56be5270f2 fix(接口定义): 修复用例列表新建用例时标签未清空的问题 2021-01-26 21:43:05 +08:00
chenjianxing 00eadc527f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 20:37:14 +08:00
chenjianxing 192b386166 refactor: 去掉tcp的环境配置多余信息 2021-01-26 20:36:51 +08:00
song.tianyang 0e2ee19237 Merge remote-tracking branch 'origin/master' 2021-01-26 20:22:04 +08:00
song.tianyang 2b5857886e fix: 解决手动保存日志时保存数据缺失的问题,同时针对报告页面增加跳转功能
解决手动保存日志时保存数据缺失的问题,同时针对报告页面增加跳转功能
2021-01-26 20:21:19 +08:00
fit2-zhao 141715e0e0 fix(场景自动化): 修复sql 执行结果类型错误 2021-01-26 19:56:44 +08:00
fit2-zhao 0e7f91acd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 19:49:38 +08:00
fit2-zhao 421c4263b7 fix(场景自动化): 修复sql 执行结果类型错误 2021-01-26 19:49:14 +08:00
wenyann 0b893278af Merge remote-tracking branch 'origin/master' 2021-01-26 19:26:35 +08:00
wenyann 54de49325f feat: 样式调整 2021-01-26 19:26:10 +08:00
chenjianxing 255f0673cc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 19:25:29 +08:00
chenjianxing 24aa3e5f96 fix: 关联场景用例报错 2021-01-26 19:25:04 +08:00
Captain.B f44a5f5b2f fix: 修复关闭认证源的页面再打开之后不能选择类型的bug 2021-01-26 19:14:40 +08:00
fit2-zhao dcd30a1fb7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 18:30:02 +08:00
fit2-zhao 1c5249485d fix(场景自动化): 引用请求只允许查看,不能编辑 2021-01-26 18:29:38 +08:00
Captain.B f6a34e7076 Merge remote-tracking branch 'origin/master' 2021-01-26 17:50:29 +08:00
Captain.B 817fc25bb8 fix: 解决 sso 登录跳转之后又执行signout的问题 2021-01-26 17:50:08 +08:00
Coooder-X 9f05de4205
feat:在接口列表等窗口中,可点击ID进入编辑页面 (#1269)
* feat: (接口定义、接口自动化) 删除模块时,模块下的所有接口或场景被放入回收站

* feat:在接口列表等窗口中,可点击ID进入编辑页面
2021-01-26 17:21:43 +08:00
fit2-zhao 27f5264a88 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 17:20:21 +08:00
fit2-zhao e967cb0539 fix(场景自动化): 数据迁移后附件丢失问题修复 2021-01-26 17:19:57 +08:00
Captain.B 2b6c627e14 Merge remote-tracking branch 'origin/master' 2021-01-26 17:17:54 +08:00
chenjianxing 1bb837bb61 refactor: 场景引用添加跳转链接 2021-01-26 17:09:16 +08:00
Captain.B e00e07fb30 fix: sso logout 和 sso placeholder 提示 2021-01-26 16:44:00 +08:00
chenjianxing 7658916438 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 16:36:57 +08:00
chenjianxing 4554cb15e4 用例列表查看无引用场景信息 2021-01-26 16:36:25 +08:00
shiziyuan9527 c3c9b70238 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 16:15:01 +08:00
shiziyuan9527 b783d21f6d refactor(测试计划): 修改搜索提示文本 2021-01-26 16:14:48 +08:00
wenyann 48b0adc065 Merge remote-tracking branch 'origin/master' 2021-01-26 16:05:42 +08:00
wenyann 2ec320b519 feat: 添加模版示例,增加接口测试报告路径 2021-01-26 16:05:08 +08:00
fit2-zhao bc2c2beefa Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 15:49:22 +08:00
fit2-zhao 96f6d854ce fix(场景自动化): 修复引用场景查看问题 2021-01-26 15:49:04 +08:00
chenjianxing dbb04a64d1 fix: 用例列表点输入框会展开 2021-01-26 15:43:01 +08:00
chenjianxing 16e48c79ea fix: tcp快捷调试添加断言的无效 2021-01-26 15:23:07 +08:00
chenjianxing 824a5a9f0e fix: 解决冲突 2021-01-26 15:12:33 +08:00
chenjianxing 38df9dd649 fix: 场景导入高度过高 2021-01-26 15:05:16 +08:00
fit2-zhao 614acd2ed3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 15:02:11 +08:00
shiziyuan9527 edf337d996 fix(测试计划): 修复关联的缺陷预览显示不全的问题 2021-01-26 14:48:52 +08:00
fit2-zhao 54944560c3 fix(场景自动化): 修复多次执行 结果不能及时响应问题 2021-01-26 14:48:50 +08:00
fit2-zhao a0a0bdc262 style(接口自动化): 批量移动页面导致场景列表大面积空白问题修复 2021-01-26 14:21:05 +08:00
fit2-zhao 19703d1f68 fix(接口自动化): 修复快捷调试,url参数处理 2021-01-26 14:15:54 +08:00
fit2-zhao 324cc0fd5f fix(接口自动化): 修复旧数据迁移选择模块根节点问题 2021-01-26 14:07:34 +08:00
song.tianyang 9d8c0b731e fix: 接口定义固定列-表头全选菜单不展示
修复接口定义固定列-表头全选菜单不展的问题
2021-01-26 13:55:10 +08:00
Coooder-X d844b486d2
feat:页面右上角header增加下拉选项‘API文档’ (#1257)
在页面右上角header增加下拉选项‘API文档’,点击后浏览器打开新标签,并跳转
2021-01-26 13:06:47 +08:00
Coooder-X 5ee7fffd68
feat:实现 接口测试-接口定义界面,ctrl + s 保存快捷键 (#1254) 2021-01-26 13:05:03 +08:00
chenjianxing cffe0f8b3a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 13:03:06 +08:00
chenjianxing 74124839aa feat: 用例列表支持全选 2021-01-26 13:02:42 +08:00
fit2-zhao 96431f0899 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 11:41:07 +08:00
fit2-zhao 46737136d9 fix(接口自动化): 修复DELETE参数丢失问题 2021-01-26 11:40:44 +08:00
song.tianyang 5888f5c5d4 fix: 页面合并后出现的全选箭头位置不对的问题
修复页面合并后出现的全选箭头位置不对的问题
2021-01-26 11:34:17 +08:00
song.tianyang 0c2631883c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
2021-01-26 11:25:43 +08:00
song.tianyang 29ab9b301a fix: 接口自动化-场景列表-批量操作下拉框不显示操作
修复接口自动化-场景列表-批量操作下拉框不显示操作的问题
2021-01-26 11:05:41 +08:00
wenyann b3808d8c90 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
2021-01-26 10:27:57 +08:00
wenyann 00ef6a7c76 feat: swagger定时修改 2021-01-26 10:16:35 +08:00
Captain.B ee3a21d317 refactor: 状态组件中的国际化 2021-01-26 10:08:14 +08:00
fit2-zhao cf013c1e84 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 18:45:54 +08:00
fit2-zhao b0ee42f9e4 fix(接口自动化): 修复部分缺陷 2021-01-25 18:44:18 +08:00
Captain.B d9a4a5bd2a refactor: 场景状态组件修改 2021-01-25 18:17:37 +08:00
Captain.B baeab081a6 Merge remote-tracking branch 'origin/master' 2021-01-25 17:50:03 +08:00
Captain.B 75030f1695 refactor: 场景页面表头优化 2021-01-25 17:49:20 +08:00
fit2-zhao 950723c4dc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 17:10:03 +08:00
fit2-zhao 2b58538a33 fix(接口自动化): 参数上下移动处理 2021-01-25 17:09:41 +08:00
Captain.B 9ec013d360 fix: 测试跟踪-测试用例-新建,标签bug修复 2021-01-25 17:00:51 +08:00
Captain.B cc8969e07f Merge remote-tracking branch 'origin/master' 2021-01-25 16:40:02 +08:00
Captain.B 3a20c69b80 fix: 接口定义-用例列表-新建用例,用例名称和标签会保留上个用例的信息 2021-01-25 16:38:42 +08:00
shiziyuan9527 4c2002f8ff fix(测试计划): 修复测试计划状态不准确 2021-01-25 16:36:08 +08:00
fit2-zhao c26e7aa314 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 15:56:01 +08:00
fit2-zhao 57967ab6b0 fix(接口自动化): 列表参数问题修复 2021-01-25 15:55:37 +08:00
chenjianxing e5ce5b740f fix: 模块树搜索清空不起作用 2021-01-25 15:32:18 +08:00
chenjianxing 3f877ef845 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 14:57:38 +08:00
chenjianxing 601adb5004 fix: 旧版前后置脚本样式 2021-01-25 14:57:23 +08:00
song.tianyang f84df44d0a Merge remote-tracking branch 'origin/master' 2021-01-25 14:52:24 +08:00
song.tianyang 0b8651b1d8 fix: 接口测试-首页-接口数量统计-未开始/已完成/进行中跳转错误
解决接口测试-首页-接口数量统计-未开始/已完成/进行中跳转错误的问题
2021-01-25 14:51:57 +08:00
Captain.B 68f4ca38f9 refactor(xPack): 修改跳转认证源的代码 2021-01-25 14:34:43 +08:00
fit2-zhao a104e94c4f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 14:24:34 +08:00
fit2-zhao 23cd306a62 fix(接口自动化): 修复CSV展示问题 2021-01-25 14:24:14 +08:00
song.tianyang a71f75967d Merge remote-tracking branch 'origin/master' 2021-01-25 13:58:39 +08:00
song.tianyang a0bce7cda3 fix: 测试计划报告菜单批量删除功能的缺失
解决测试计划报告菜单批量删除功能的缺失的问题
2021-01-25 13:58:15 +08:00
fit2-zhao 3ac8b83d54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 13:50:21 +08:00
fit2-zhao 33cd6b37e8 feat(接口自动化): 循环控制器 结果处理 2021-01-25 13:49:59 +08:00
shiziyuan9527 e005e39326 fix(测试计划): 修复性能测试按照状态筛选不生效的问题 2021-01-25 10:59:26 +08:00
chenjianxing 058c3b3dd4 refactor: pr代码优化 2021-01-25 10:10:21 +08:00
Captain.B 2013e784f9 Merge remote-tracking branch 'origin/master' 2021-01-22 19:40:00 +08:00
Captain.B c71b1d49f3 refactor(xPack): 接入oidc单点登录 2021-01-22 19:28:34 +08:00
song.tianyang e6d2e1bf4d feat: 测试计划定时任务报告增加状态字段
测试计划定时任务报告增加状态字段
2021-01-22 19:06:30 +08:00
fit2-zhao 96ae6250be fix(接口自动化): 修复部分缺陷 2021-01-22 18:42:04 +08:00
fit2-zhao 5ae9f4dcfe Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:18:26 +08:00
fit2-zhao 53fd31ec90 fix(接口自动化): 修复I18n 显示问题 2021-01-22 18:17:53 +08:00
Joker bb952bd430
fix swagger2.0 NullPointException (#1196)
* fix swagger2.0同步时存在$ref参数而dto不存在的情况

* 删除多余代码

* 修复编辑HTTP配置域名为空是,数据库config拼接的json串中domain没有更新为空的情况

* 语法调整

Co-authored-by: fengkaijun <fengkaijun@yingzi.com>
2021-01-22 18:17:19 +08:00
fit2-zhao 5340a37cb1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:12:25 +08:00
fit2-zhao 4e38c73ac5 fix(接口自动化): 修复部分缺陷 2021-01-22 18:12:05 +08:00
shiziyuan9527 4b41e9df0c fix(测试计划): 修复报告统计结果错误 2021-01-22 17:14:12 +08:00
wenyann 2cdf1e6730 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
2021-01-22 17:07:43 +08:00
wenyann 8e1f189ce9 feat: swagger定时修改 2021-01-22 17:01:41 +08:00
chenjianxing 4144a35a26 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 16:32:24 +08:00
chenjianxing f2c93f828b fix: 编辑用例新增不显示上一条下一条 2021-01-22 16:32:13 +08:00
chenjianxing 6243e3a410 feat: 用例编辑支持上一条下一条 2021-01-22 16:30:49 +08:00
Captain.B 96926b3311 refactor: 设置迭代次数和rpslimit的上限 2021-01-22 16:20:43 +08:00