Commit Graph

4852 Commits

Author SHA1 Message Date
wenyann d7113c4c0c Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 18:30:42 +08:00
wenyann 7332bd41ec fix:用例添加了评论,但编辑的时候看不到 2021-03-29 18:27:46 +08:00
fit2-zhao 2bd6172e4a Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 18:23:24 +08:00
fit2-zhao 1d9059de34 refactor(接口自动化,接口定义): 删除接口自动化场景调试产生的记录详情,保留最后一条 2021-03-29 18:23:10 +08:00
chenjianxing cda0b0d1bf Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 17:55:56 +08:00
Ambitiousliga c1d7f5df42 feat(测试跟踪):通过Excel导入导出时有ID字段,可通过Excel导入来更新用例。 (#1727)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-29 17:55:32 +08:00
song.tianyang 8697826dfd Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 17:40:35 +08:00
song.tianyang 2fac88cca8 fix: 修复页面展现XML格式数据时会自动转化标签的问题
修复页面展现XML格式数据时会自动转化标签的问题
2021-03-29 17:28:56 +08:00
shiziyuan9527 7a9079a479 fix(场景自动化): 场景下步骤未启用当前场景的环境 2021-03-29 17:02:34 +08:00
song.tianyang 809142af53 fix: 场景关联ESB接口时复制的ESB案例无法构建树结构数据
修复场景关联ESB接口时复制的ESB案例无法构建树结构数据
2021-03-29 16:50:33 +08:00
wenyann 52b0709753 fix:修复表头显示问题 2021-03-29 16:43:52 +08:00
Captain.B 966b7318ca Merge branch 'v1.8' 2021-03-29 15:51:57 +08:00
Captain.B b00576b670 chore: sync 2021-03-29 15:50:00 +08:00
fit2-zhao 7e9e3f5a7b Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 15:46:57 +08:00
fit2-zhao 82def4f5b5 style(场景自动化): 调整步骤样式,默认显示复制按钮 2021-03-29 15:46:51 +08:00
wenyann ae391e54ce Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 15:29:32 +08:00
wenyann 7502bdcc7a fix:删除无用代码 2021-03-29 15:29:10 +08:00
fit2-zhao 8d635743bc Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 15:01:25 +08:00
fit2-zhao a3b1c4f4d5 feat(场景自动化,测试用例): 默认选中树节点添加对应功能 2021-03-29 15:01:18 +08:00
fit2-zhao d3fccb25d6 feat(场景自动化,测试用例,): 测试用例、 接口定义、场景自动化 增加“默认模块” 创建测试用例、接口定义、场景时 所属模块默认值为“默认模块” 2021-03-29 14:43:25 +08:00
Captain.B 3ea6c015d1 Merge branch 'v1.8' 2021-03-29 13:44:58 +08:00
Captain.B 1d90a1b56c chore: sync 2021-03-29 13:44:41 +08:00
fit2-zhao e2ead6e002 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
2021-03-29 13:31:50 +08:00
fit2-zhao fddad77ace Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
2021-03-29 13:31:42 +08:00
fit2-zhao 49097dc7b6 feat(接口定义): 接口定义、增加“默认模块” 创建接口定义所属模块默认值为“默认模块” 2021-03-29 13:19:59 +08:00
Captain.B 223b88cfbb Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-29 12:32:37 +08:00
Captain.B 4c5bcb6307 feat(性能测试): 修复场景名称过长导致样式出错的问题 2021-03-29 12:32:21 +08:00
shiziyuan9527 033a4a69f0 refactor(场景自动化): 运行环境优化 2021-03-29 12:03:14 +08:00
chenjianxing 9c96088006 Merge commit 'cc5ff944d1ed0ac524591553486cdc6a6effaadf' into v1.8 2021-03-29 12:00:19 +08:00
chenjianxing 28ed11d09b fix: 脑图全屏下拉框无法显示 2021-03-29 11:51:51 +08:00
Captain.B b5e3077544 Merge branch 'v1.8' 2021-03-29 10:57:10 +08:00
Captain.B c5e977b091 fix: 尝试修复表格固定列之后错乱的问题 2021-03-29 10:56:14 +08:00
Ambitiousliga 999f55985d
feat(测试跟踪):通过Excel导入导出时有ID字段,可通过Excel导入来更新用例。 (#1727)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-29 09:35:12 +08:00
shiziyuan9527 fd34e063ff refactor(场景自动化): 运行环境优化 2021-03-27 19:11:12 +08:00
Captain.B 0e1991ae28 fix(性能测试): 修复报告对比bug 2021-03-26 19:07:23 +08:00
Captain.B 8e8ce9a90d Merge branch 'v1.8' 2021-03-26 18:39:02 +08:00
song.tianyang ae3d1adf33 Merge remote-tracking branch 'origin/v1.8' into v1.8
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
2021-03-26 18:33:52 +08:00
Captain.B cd13e58cb0 feat(性能测试): 测试报告支持对比 2021-03-26 18:24:04 +08:00
Captain.B 39187a0cba Merge branch 'v1.8' 2021-03-26 18:20:51 +08:00
Captain.B 9bfaf7588e Revert "feat(性能测试): 测试报告支持对比" 2021-03-26 18:20:18 +08:00
Captain.B a162fe4f45 Revert "feat(性能测试): 测试报告支持对比"
This reverts commit e26561e4
2021-03-26 18:16:54 +08:00
Captain.B 1f5fc92233 Revert "refactor(性能测试): 报告对比将当前报告的标记写在名称前边"
This reverts commit 34be7ce2
2021-03-26 18:16:43 +08:00
Captain.B 8b36c3b150 Merge branch 'v1.8' 2021-03-26 18:13:18 +08:00
wenyann ca67a3ed56 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 18:13:08 +08:00
wenyann 5ac89f8410 fix: 表头修改 2021-03-26 18:12:25 +08:00
Captain.B 34be7ce27f refactor(性能测试): 报告对比将当前报告的标记写在名称前边 2021-03-26 18:10:00 +08:00
Captain.B 40870f3d65 Merge remote-tracking branch 'origin/master' 2021-03-26 18:06:03 +08:00
Captain.B f29cad3cf0 chore: sync 2021-03-26 18:05:21 +08:00
Captain.B e6f889b16e Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-26 18:04:41 +08:00
Captain.B cd80921632 Merge branch 'compare' into v1.8 2021-03-26 18:04:17 +08:00
Captain.B e26561e464 feat(性能测试): 测试报告支持对比 2021-03-26 18:03:58 +08:00
fit2-zhao 8f06031cec fix(测试跟踪): 点击树菜单,列表恢复到列表 2021-03-26 18:03:00 +08:00
song.tianyang 64263c2cdb Merge remote-tracking branch 'origin/v1.8' into v1.8
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
2021-03-26 18:02:08 +08:00
song.tianyang c1416fe407 fix: 测试用例,选中【选择所有数据】,翻页后发现第2页之后的数据并没有被选中
测试用例,选中【选择所有数据】,翻页后发现第2页之后的数据并没有被选中
2021-03-26 17:47:43 +08:00
wenyann d12ec06066 fix: 测试跟踪用例重复显示 2021-03-26 17:16:08 +08:00
chenjianxing 89c6666c9e Merge branch 'master' of github.com:metersphere/metersphere 2021-03-26 17:06:40 +08:00
chenjianxing cc5ff944d1 refactor: 重构模式搜索框 2021-03-26 17:06:22 +08:00
fit2-zhao 12f1c60a0f Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 16:29:35 +08:00
fit2-zhao dda1217c1a fix(接口自动化): 修复导入场景步骤请求 ip 和端口 是变量的问题 2021-03-26 16:29:18 +08:00
Captain.B b29d302ad2 refactor(性能测试): 测试报告统计标题 KO -> FAIL 2021-03-26 14:21:13 +08:00
shiziyuan9527 f5796eb602 fix(测试跟踪): 修复首页跳转问题 2021-03-26 14:14:40 +08:00
Captain.B 371628ba54 fix: 处理冲突 2021-03-26 14:10:04 +08:00
Captain.B cb4ad5bca4 Merge branch 'master' into compare
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
2021-03-26 14:04:21 +08:00
Captain.B 6fcc8536d0 chore: sync 2021-03-26 14:00:34 +08:00
wenyann deaf05dd5f fix:修复编辑用例js报错 2021-03-26 13:14:43 +08:00
fit2-zhao e903441002 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 11:21:52 +08:00
fit2-zhao ba76c82851 fix(接口自动化): 修复复制场景,场景变量不能编辑问题 2021-03-26 11:21:38 +08:00
Captain.B 767faf9dfe fix: 尝试修复表格固定列之后错乱的问题 2021-03-26 09:52:03 +08:00
fit2-zhao 6257fce4a9 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 19:34:48 +08:00
Captain.B ef6c7ae83c chore: sync 2021-03-25 19:26:42 +08:00
Captain.B 612d8438c9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 19:25:24 +08:00
Captain.B b4bb64f9da fix(性能测试): 修复最大并发数没有按照资源池来限制的bug
Closes #1708
2021-03-25 19:25:08 +08:00
fit2-zhao 0bbd35a493 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:40:17 +08:00
fit2-zhao 12a32b8bc4 fix(接口自动化): 修复场景移动后,移动到的模块名称不能修改问题 2021-03-25 18:40:11 +08:00
shiziyuan9527 a8b54c9d74 refactor: 打开环境配置时默认选中当前配置 2021-03-25 18:33:03 +08:00
fit2-zhao c43a258780 fix(接口自动化): 修复jmx导出消息体数据类型设置错误问题 2021-03-25 17:53:26 +08:00
song.tianyang 24c9b5d0a1 fix: 文档不超过5个数据时下滚出现问题
文档不超过5个数据时下滚出现问题
2021-03-25 17:02:59 +08:00
Captain.B 1c773f83de fix: 尝试修复表格固定列之后错乱的问题 2021-03-25 16:57:15 +08:00
Captain.B 8328cab574 chore: sync 2021-03-25 15:44:06 +08:00
chenjianxing 25d11cd5e6 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-25 15:33:58 +08:00
Captain.B 806772a339 fix(测试跟踪): 修复planId可能为空调用后台报错的问题 2021-03-25 14:54:59 +08:00
fit2-zhao e2ae033d87 fix(接口自动化): 修复if条件不起作用问题 2021-03-25 14:44:34 +08:00
chenjianxing fa78e9a7f5 refactor: 去掉控制台打印 2021-03-25 14:08:54 +08:00
chenjianxing 21bf611d2a Merge branch 'master' into v1.8 2021-03-25 14:06:20 +08:00
chenjianxing 7ac98d98cf fix: 测试用例列表标签显示问题 2021-03-25 14:05:37 +08:00
Captain.B 08d46862eb chore: sync 2021-03-25 12:24:45 +08:00
Captain.B 6e97d412ee fix(性能测试): 修复用例和场景转换性能测试保存文件的问题 2021-03-25 12:22:07 +08:00
song.tianyang cf39bb066d Merge remote-tracking branch 'origin/master' 2021-03-25 12:02:19 +08:00
song.tianyang 7780bf980d fix: 转性能测试增加参数
转性能测试增加参数
2021-03-25 11:59:54 +08:00
Captain.B 4aadacdf98 Merge remote-tracking branch 'origin/master' 2021-03-25 11:20:46 +08:00
Captain.B 21de1ba11f fix(性能测试): 提供文件更新的功能 2021-03-25 11:20:32 +08:00
song.tianyang abe7b9fae8 Merge remote-tracking branch 'origin/master' 2021-03-25 11:10:18 +08:00
song.tianyang 28b2048fcb fix: 测试计划关联跨项目场景用例,批量选中不显示数量的问题
测试计划关联跨项目场景用例,批量选中不显示数量的问题
2021-03-25 11:08:53 +08:00
fit2-zhao e0fd1422ab fix(接口自动化): 去除最大化关闭按钮 2021-03-25 11:08:17 +08:00
shiziyuan9527 83ee946f31 fix(测试跟踪): 修复测试评审关联用例页面默认未选中当前项目的问题 2021-03-25 10:24:41 +08:00
Captain.B 4e270cd409 fix(性能测试): 保证每次从接口测试都能创建新的性能测试 2021-03-25 10:20:36 +08:00
Captain.B c6319bf763 Merge remote-tracking branch 'origin/master' 2021-03-25 10:15:50 +08:00
Captain.B 0db75e1b12 fix(性能测试): 保证每次从接口测试都能创建新的性能测试 2021-03-25 10:15:33 +08:00
fit2-zhao b1e48675c1 refactor(接口自动化): 优化部分代码 2021-03-25 10:02:57 +08:00
chenjianxing 6a45fe5f57 fix: 页面刷新projectId为空 2021-03-25 09:49:34 +08:00
wenyann 52ef34c78b fix:jenkins通知 2021-03-25 08:41:01 +08:00
wenyann 51948d79a0 Merge remote-tracking branch 'origin/master' 2021-03-25 01:46:29 +08:00
wenyann 6c1daf4620 fix: 初始化自定义表头 2021-03-25 01:45:56 +08:00
Captain.B 0664c5a569 fix(性能测试): 修复从接口自动化创建性能测试没有场景的bug 2021-03-25 00:19:39 +08:00
Captain.B 73e9824c5f chore: sync 2021-03-24 23:05:38 +08:00
chenjianxing 8c10f3d5b4 refactor: 初始化vuex清除projectId 2021-03-24 22:25:59 +08:00
chenjianxing f80f6c74d1 fix: 工作空间无项目时报错 2021-03-24 22:21:51 +08:00
chenjianxing 6dd49752fc Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 22:13:10 +08:00
chenjianxing 6a79dcba08 refactor: 模块名称不能带'\' 2021-03-24 22:12:58 +08:00
Captain.B 51e820d697 refactor(测试跟踪): 删掉不用的代码 2021-03-24 21:56:29 +08:00
chenjianxing d03976d8e1 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 21:30:17 +08:00
chenjianxing 519c868418 refactor: 测试用例模块名称长度改为100 2021-03-24 21:30:07 +08:00
song.tianyang 9d134f85a4 Merge remote-tracking branch 'origin/master' 2021-03-24 20:20:49 +08:00
song.tianyang c90ab047bb fix: 修复接口定义-接口列表-文档-仅选中get请求接口-按更新时间从前到后显示,选中某个接口后,焦点不是选中的接口的问题
修复接口定义-接口列表-文档-仅选中get请求接口-按更新时间从前到后显示,选中某个接口后,焦点不是选中的接口的问题
2021-03-24 20:18:36 +08:00
fit2-zhao a611768e52 fix(接口自动化): 去掉脚本成功后缓存 2021-03-24 20:15:37 +08:00
fit2-zhao 0948132bae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 20:11:32 +08:00
chenjianxing 406a8ff935 fix: 测试计划-脑图用例状态未更新 2021-03-24 20:04:44 +08:00
chenjianxing 0fa16caf5a Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 19:57:18 +08:00
Coooder-X f115f25f87
fix: 测试计划的通过率前端值类型转换 (#1700)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* feat(测试计划): 执行用例或定时任务结束后,自动更新测试计划的状态

* fix: 测试计划的通过率前端值类型转换

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
2021-03-24 19:54:14 +08:00
chenjianxing 8cb054df86 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 19:53:19 +08:00
chenjianxing 21a4586ddc refactor: 编辑新增测试用例实时更新脑图 2021-03-24 19:53:08 +08:00
fit2-zhao 4c3e69cdf1 fix(接口自动化): 修复引用步骤执行结果内容运行复制 2021-03-24 19:27:11 +08:00
BugKing 5fce9a65bd Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-24 19:15:04 +08:00
BugKing 77a550dd3a refactor: 修改版本号 2021-03-24 19:14:54 +08:00
wenyann beac8a9a14 Merge remote-tracking branch 'origin/master' 2021-03-24 19:11:18 +08:00
wenyann e9c004d8ef fix:merge 2021-03-24 19:11:00 +08:00
Captain.B dfb0f1c12f Merge remote-tracking branch 'origin/master' 2021-03-24 19:07:14 +08:00
wenyann 95baefb1c9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseEdit.vue
2021-03-24 19:07:06 +08:00
Captain.B d92526ab4e chore: sync 2021-03-24 19:06:59 +08:00
song.tianyang 27e405fde5 Merge remote-tracking branch 'origin/master' 2021-03-24 19:05:17 +08:00
shiziyuan9527 f9eba24408 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/track/case/components/TestCaseEdit.vue
2021-03-24 19:00:05 +08:00
song.tianyang 6ee42fbbea fix: 修复工作空间权限问题
修复工作空间权限问题
2021-03-24 18:59:15 +08:00
shiziyuan9527 0abec56775 fix(测试跟踪): 修复新建用例缺陷 2021-03-24 18:59:10 +08:00
wenyann 22d437cc85 fix:projectId 2021-03-24 18:58:26 +08:00
fit2-zhao c3937b1c44 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 18:58:05 +08:00
wenyann ad5346d7e8 fix:合并 2021-03-24 18:52:07 +08:00
fit2-zhao fca46fd9e7 fix(接口定义): 修复另存新接口路径不更新问题 2021-03-24 18:51:24 +08:00
wenyann efae6aae5b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseEdit.vue
2021-03-24 18:40:05 +08:00
wenyann 53fc7b6eaf fix:创建用例关联测试显示问题 2021-03-24 18:33:56 +08:00
fit2-zhao 637f0ea707 fix(接口自动化): 修复另存接口协议错误问题 2021-03-24 18:10:22 +08:00
Captain.B ebc1013c89 Merge remote-tracking branch 'origin/master' 2021-03-24 17:54:07 +08:00
fit2-zhao 9a6b47051b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 17:53:56 +08:00
shiziyuan9527 599a78995c fix(场景自动化): 跨项目sql用例环境问题 2021-03-24 17:52:26 +08:00
Captain.B 4b9b9f4953 Merge remote-tracking branch 'origin/master' 2021-03-24 17:51:59 +08:00
chenjianxing 3e52d67914 fix: 新增编辑用例更新脑图 2021-03-24 17:51:51 +08:00
Captain.B ac1a5f1d77 refactor: 邮件模版显示修改 2021-03-24 17:51:41 +08:00
Coooder-X e22118de55
fix: 接口定义http响应体、状态码参数前的checkbox不显示 (#1698)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix: 接口定义http响应体、状态码参数前的checkbox不显示
2021-03-24 17:50:49 +08:00
fit2-zhao 321f2b4db9 fix(接口自动化): 查看场景变量时禁用操作 2021-03-24 17:48:02 +08:00
BugKing d1c1957a10 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-24 17:43:12 +08:00
BugKing 98a4b77dca style(接口测试): 前后置脚本编辑框限定最小高度 2021-03-24 17:40:19 +08:00
song.tianyang 27db2f0153 Merge remote-tracking branch 'origin/master' 2021-03-24 17:38:57 +08:00
song.tianyang 70d15e2ee1 fix: 测试计划的定时任务,下次执行时间不是实时的问题;系统设置-批量添加用户到工作空间添加角色功能优化
测试计划的定时任务,下次执行时间不是实时的问题;系统设置-批量添加用户到工作空间添加角色功能优化
2021-03-24 17:35:27 +08:00
fit2-zhao 5b4740f838 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 17:25:07 +08:00
fit2-zhao 8cf3e3f9ce fix(接口自动化): 修复导出jmx校验问题 2021-03-24 17:25:00 +08:00
Captain.B 95be5207b2 Merge remote-tracking branch 'origin/master' 2021-03-24 17:01:36 +08:00
Captain.B f0456b36e9 fix: 修复只读用户点击保存用例跳转到设置的bug 2021-03-24 17:01:19 +08:00
fit2-zhao bd0a6132e6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 16:18:22 +08:00
fit2-zhao f8d171d124 fix(接口定义): 接口快捷调试另存新用例 问题修复 2021-03-24 16:18:08 +08:00
shiziyuan9527 35217aeef9 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 15:57:03 +08:00
shiziyuan9527 2a74eedfb6 fix: 修复路由跳转错误 2021-03-24 15:56:35 +08:00
song.tianyang a365dc0b42 Merge remote-tracking branch 'origin/master' 2021-03-24 15:54:13 +08:00
song.tianyang bf73aa5e30 fix: 解决文档不现实回收站内的接口信息问题
解决文档不现实回收站内的接口信息问题
2021-03-24 15:53:07 +08:00
fit2-zhao 3c328f4826 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 15:39:40 +08:00
fit2-zhao 7ec678acad fix(接口自动化): 修复步骤另存新接口问题 2021-03-24 15:39:34 +08:00
shiziyuan9527 792a5afa7d fix(场景自动化): 修复步骤与环境设置不匹配的问题 2021-03-24 14:13:47 +08:00
shiziyuan9527 c99e59a044 fix(场景自动化): 修复导入场景时列表数据显示错误的问题 2021-03-24 13:47:29 +08:00
shiziyuan9527 f13746e655 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 13:40:23 +08:00
Captain.B 5a25f3ad97 Merge remote-tracking branch 'origin/master' 2021-03-24 13:30:26 +08:00
Captain.B 50c71ac1f9 refactor(性能测试): 项目文件管理页面重构 2021-03-24 13:30:04 +08:00
fit2-zhao 0655c509bf Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 13:24:14 +08:00
fit2-zhao 034042fca5 fix(接口定义): 修复JSON-SCHEMA 自定义转换器,修复场景步骤引用权限控制问题 2021-03-24 13:23:53 +08:00
Captain.B b6ec991ce7 refactor(性能测试): 新建和编辑性能测试上传文件逻辑修改 2021-03-24 13:20:32 +08:00
shiziyuan9527 b86a220007 refactor(测试计划): 去掉无用代码 2021-03-24 11:43:51 +08:00
shiziyuan9527 1b5288756a fix(测试计划): 测试计划执行时未显示测试步骤 2021-03-24 11:27:38 +08:00
song.tianyang 4d25ab60a0 Merge remote-tracking branch 'origin/master' 2021-03-24 11:18:49 +08:00
song.tianyang 00e2932148 refactor: 解决无效参数导致的页面报错
解决无效参数导致的页面报错
2021-03-24 11:18:38 +08:00
chenjianxing b3675c3a41 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 11:15:30 +08:00
chenjianxing d4f813decd refactor: 关联接口用例搜索描述 2021-03-24 11:15:16 +08:00
song.tianyang 2c5c924244 Merge remote-tracking branch 'origin/master' 2021-03-24 11:10:10 +08:00
song.tianyang 53fb641a10 refactor: 解决页面拖拽导致esb请求响应表格断行的问题
解决页面拖拽导致esb请求响应表格断行的问题  参数名的宽度稍微增加;取消描述字段的长度限制,改为最小长度
2021-03-24 11:09:54 +08:00
BugKing bfe6e732d5 style(测试跟踪): 修改测试计划用力列表标签列格式 2021-03-24 10:32:15 +08:00
fit2-zhao 3d321b37c6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 10:15:55 +08:00
fit2-zhao b02868245b fix(接口定义): 用例执行dubbo协议不强制选择环境 2021-03-24 10:15:36 +08:00
Coooder-X 36e3e001d4
feat(测试计划): 执行用例或定时任务结束后,自动更新测试计划的状态 (#1694)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* feat(测试计划): 执行用例或定时任务结束后,自动更新测试计划的状态
2021-03-24 10:06:01 +08:00
Captain.B d2fabf8e93 fix: 修复创建性能测试查询文件的提示,计算图表不去单个计算 2021-03-24 09:55:08 +08:00
shiziyuan9527 3cc4c181b8 fix(接口自动化): 导入场景项目名称显示问题 2021-03-23 22:23:38 +08:00
song.tianyang bd48741020 refactor: 按照命名规范重新命名文件夹名称
按照命名规范重新命名文件夹名称
2021-03-23 22:12:21 +08:00
song.tianyang 4293aa0f3d refactor: 按照命名规范重新命名文件夹名称
按照命名规范重新命名文件夹名称
2021-03-23 22:10:56 +08:00
song.tianyang 7b55b15b5a fix: 更改接口文档搜索框的位置
更改接口文档搜索框的位置
2021-03-23 22:03:28 +08:00
song.tianyang ed7aeb10e5 Merge remote-tracking branch 'origin/master' 2021-03-23 21:46:37 +08:00
shiziyuan9527 01d2f96ff6 fix: 修复组织和空间名过长显示不正确
Closes #1693
2021-03-23 21:39:35 +08:00
song.tianyang 47ec0a77da fix: API文档分享链接失效的问题
API文档分享链接失效的问题
2021-03-23 21:27:19 +08:00
chenjianxing 44f289f752 fix: msDrawer随窗口大小变化 2021-03-23 21:26:51 +08:00
chenjianxing a6d3fb5694 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 20:59:56 +08:00
chenjianxing e92d346202 refactor: 脑图非全屏高度适配 2021-03-23 20:59:46 +08:00
song.tianyang 691cf5a380 Merge remote-tracking branch 'origin/master' 2021-03-23 20:20:08 +08:00
chenjianxing 17e9f41833 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 20:15:52 +08:00
chenjianxing 9c4b6614bf fix: 解决冲突 2021-03-23 20:15:26 +08:00
Captain.B 0c54407aca Merge remote-tracking branch 'origin/master' 2021-03-23 20:11:02 +08:00
chenjianxing b2514df363 fix: 测试跟踪从vuex获取项目id 2021-03-23 20:10:55 +08:00
Captain.B b60b534f48 fix: 修复创建性能测试查询文件是否存在的bug 2021-03-23 20:10:47 +08:00
shiziyuan9527 266fbd008f fix(测试跟踪): 修复首页图表数据错误的问题 2021-03-23 19:44:50 +08:00
song.tianyang 9e57b0e45e fix: 文档:将搜索栏上移,并减少行间距
文档:将搜索栏上移,并减少行间距
2021-03-23 19:42:15 +08:00
fit2-zhao d744621491 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 19:37:56 +08:00
fit2-zhao c02b8dff1b fix(接口定义,接口自动化): 点击树节点 ,右侧Tab恢复到列表页面 2021-03-23 19:37:48 +08:00
fit2-zhao 41c46740b3 fix(接口定义): 切换code选项格式调整 2021-03-23 19:05:42 +08:00
wenyann 186e5efa1d fix:创建用例报错 2021-03-23 18:43:25 +08:00
song.tianyang b2daeb76c2 Merge remote-tracking branch 'origin/master' 2021-03-23 18:26:34 +08:00
fit2-zhao 4640746de5 fix(接口自动化): 场景步骤协议展示及另存为新接口问题修复 2021-03-23 18:20:31 +08:00
BugKing a1fdc25a96 style(性能测试): 修改性能测试压力配置样式 2021-03-23 18:10:06 +08:00
fit2-zhao 478c98ac21 fix(接口自动化): 场景步骤断言规则增加查看功能 2021-03-23 18:05:51 +08:00
song.tianyang 066ac69c6d feat: 接口定义导入-根据不同的接口选择,展现不同的到导入方式
接口定义导入-根据不同的接口选择,展现不同的到导入方式
2021-03-23 17:47:49 +08:00
Captain.B 7f69f17a5b Merge remote-tracking branch 'origin/master' 2021-03-23 17:36:41 +08:00
Captain.B 40c1ebea20 refactor(性能测试): 修改压力配置的页面 2021-03-23 17:36:25 +08:00
fit2-zhao 774fd1f425 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 17:31:47 +08:00
fit2-zhao eeedae7a4a fix(接口自动化): 场景步骤按钮控制 2021-03-23 17:30:23 +08:00
song.tianyang dc1ef10180 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	frontend/src/business/components/api/definition/components/module/ApiModuleHeader.vue
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
2021-03-23 17:28:07 +08:00
chenjianxing 8993e53b70 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 17:26:11 +08:00
chenjianxing 0bd0098b95 fix: 接口自动化从vuex获取projectId 2021-03-23 17:26:00 +08:00
song.tianyang d83df6e1cc feat: ESB接口导入和模板下载
ESB接口导入和模板下载
2021-03-23 17:25:20 +08:00
Captain.B 6544382236 Merge remote-tracking branch 'origin/master' 2021-03-23 17:06:35 +08:00
Captain.B 41fe3cbe6b fix: 修复创建性能测试查询文件是否存在的bug 2021-03-23 17:06:14 +08:00
chenjianxing e2285238d3 fix: 接口定义创建到其他项目 2021-03-23 16:47:32 +08:00
fit2-zhao 3dba18779f fix(接口自动化): 次数循环成功后继续循环 开关校验问题修复 2021-03-23 16:35:47 +08:00
fit2-zhao 08c9cc09df fix(接口定义): 测试执行-另存新接口 增加路径反显 2021-03-23 16:12:43 +08:00
chenjianxing 41a1a5f38b Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 15:49:35 +08:00
chenjianxing 4b7933a85d refactor: 重构vuex 2021-03-23 15:49:24 +08:00
fit2-zhao b6c550bb2a style: 统一样式修改 2021-03-23 15:32:02 +08:00
fit2-zhao 0dce5022e8 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 15:31:43 +08:00
fit2-zhao 89dc94fac5 style: 统一样式修改 2021-03-23 15:31:23 +08:00
BugKing 1e81835dcf Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-23 15:08:07 +08:00
BugKing a92b750ae7 style: 修改列表标签列格式 2021-03-23 15:08:00 +08:00
fit2-zhao 00af593531 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 15:07:12 +08:00
fit2-zhao 27f9f34be3 fix(接口定义): 批量执行记录最后执行环境 2021-03-23 15:06:57 +08:00
wenyann e9e73f87d3 fix:测试计划关联过来的接口用例使用默认环境 2021-03-23 14:50:22 +08:00
wenyann 8c768895d4 Merge remote-tracking branch 'origin/master' 2021-03-23 14:16:18 +08:00
wenyann dc2f3cc092 fix:表头出现空白情况 2021-03-23 14:15:59 +08:00
fit2-zhao b7fe6101ee fix(接口定义): 恢复用例执行代码,接口变更,用例不能跟着变更 2021-03-23 14:11:48 +08:00
fit2-zhao 6761a96f15 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 13:54:22 +08:00
fit2-zhao 1be8ab1cac fix(接口自动化,接口定义): 回收站增加批量恢复功能 2021-03-23 13:54:04 +08:00
shiziyuan9527 39f48e3583 fix(测试跟踪): 修复首页跳转 2021-03-23 11:40:52 +08:00
wenyann 6be8af57a3 Merge remote-tracking branch 'origin/master' 2021-03-23 11:24:24 +08:00
wenyann 14ba48c95b fix:关联测试用例点击行选中 2021-03-23 11:24:04 +08:00
wenyann 23628537a2 fix:去掉测试用例下拉 2021-03-23 11:23:21 +08:00
BugKing 113c689f17 refactor(接口测试): 规范部分文本大小写 2021-03-23 11:09:33 +08:00
wenyann 8bc9bdc6bc Merge remote-tracking branch 'origin/master' 2021-03-23 10:23:53 +08:00
wenyann 56b58ce9cd fix:表格错位问题,添加逐条评审 2021-03-23 10:23:31 +08:00
Captain.B 8995209a15 chore: sync 2021-03-23 09:49:10 +08:00
wenyann bfff069b6e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 23:24:21 +08:00
wenyann cec4ff28c2 fix:默认字段 2021-03-22 23:23:41 +08:00
shiziyuan9527 10c4ff2577 fix: 修复表格样式 2021-03-22 22:53:11 +08:00
Ambitiousliga b9035b42cb
fix(测试跟踪):删除“全部用例”标题及“取消全部关联”按钮 (#1685)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-22 21:59:43 +08:00
Ambitiousliga 9b87e41ec6
fix(测试跟踪):关联用例后增加“责任人”字段,便于识别用例原本的责任人。 (#1684)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-22 21:59:05 +08:00
chenjianxing 352c74d090 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-22 21:57:24 +08:00
chenjianxing b3c6e17cf7 fix: 脑图bug 2021-03-22 21:57:12 +08:00
shiziyuan9527 6fe9101144 fix(测试计划): 去除执行页面无用的字段展示 2021-03-22 21:24:50 +08:00
shiziyuan9527 2fb76d69e8 fix: 修复表格样式 2021-03-22 21:14:56 +08:00
wenyann f2e36b64b8 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
2021-03-22 19:13:15 +08:00
wenyann 954b58161e fix: 修复jenkins调用测试计划报告不更新问题 2021-03-22 19:10:12 +08:00
song.tianyang 730f52c5e7 Merge remote-tracking branch 'origin/master' 2021-03-22 18:41:16 +08:00
song.tianyang fdc5fcdcb6 Merge remote-tracking branch 'origin/master' 2021-03-22 18:31:58 +08:00
shiziyuan9527 02a8c2a2e5 fix(测试跟踪): 首页跳转 2021-03-22 18:31:47 +08:00
song.tianyang 8e49e466a5 fix: 场景导入esb案例 报文格式问题处理
场景导入esb案例 报文格式问题处理
2021-03-22 18:31:37 +08:00
chenjianxing 62959225a1 fix: 脑图创建模块报错提示 2021-03-22 18:25:14 +08:00
chenjianxing 3f04d930d6 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-22 18:16:40 +08:00
chenjianxing 4e10b2eec7 fix: 脑图优先级显示错误 2021-03-22 17:45:06 +08:00
fit2-zhao 5e15166c92 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 17:39:21 +08:00
fit2-zhao c532baf241 fix(xPack): 报表筛选条件优化 2021-03-22 17:39:07 +08:00
shiziyuan9527 f0b9b631b5 fix: i18n 2021-03-22 17:33:19 +08:00
BugKing 05dc583719 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-22 16:54:45 +08:00
BugKing 3e6c44add8 refactor(测试跟踪): 修改用例列表文本提示 2021-03-22 16:54:34 +08:00
Captain.B c3368ecc82 Merge remote-tracking branch 'origin/master' 2021-03-22 16:48:14 +08:00
Captain.B 8fe70457a5 refactor(性能测试): 加载已有的文件支持查询 2021-03-22 16:47:53 +08:00
fit2-zhao 0fa3c27123 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-22 16:18:39 +08:00
fit2-zhao 2d8423556c fix(场景自动化): 修复添加自定义请求问题,场景变量查看问题 2021-03-22 16:18:29 +08:00
shiziyuan9527 fa0a57a6af feat(测试计划): 执行用例时显示关联测试 2021-03-22 15:44:00 +08:00
BugKing 10f9bdc23c refactor: 规范部分页面文本大小写 2021-03-22 14:47:52 +08:00
Captain.B 58d7ddbdd5 chore: sync 2021-03-22 14:11:16 +08:00
Captain.B 783766220d refactor(性能测试): 增加k8s资源池单pod线程数的配置 2021-03-22 14:10:07 +08:00
Captain.B 82da6b28e3 chore: sync 2021-03-22 13:48:24 +08:00
Captain.B 119f15d475 refactor(性能测试): 报告对比 2021-03-22 13:31:17 +08:00
song.tianyang 248f6ef850 Merge remote-tracking branch 'origin/master' 2021-03-22 11:45:48 +08:00
song.tianyang 320ed514cc refactor: ESB数据结构表格增加复制功能
ESB数据结构表格增加复制功能:复制当前节点下的数据结构
2021-03-22 11:35:18 +08:00
Captain.B 3a14671dc2 Merge branch 'master' into compare 2021-03-22 09:36:38 +08:00
Captain.B c054c13a06 refactor(性能测试): 报告对比 2021-03-22 09:34:23 +08:00
wenyann 8f12d2786a Merge remote-tracking branch 'origin/master' 2021-03-22 09:02:13 +08:00
wenyann 8ccd6befe2 fix:自定义表头显示问题 2021-03-22 09:01:35 +08:00
song.tianyang bccc68b841 Merge remote-tracking branch 'origin/master' 2021-03-21 20:44:39 +08:00
song.tianyang 362e0b3720 refactor: 文档页面性能优化
文档页面性能优化
2021-03-21 20:44:24 +08:00
wenyann c96928384e feat: 测试用例关联多个测试 2021-03-21 19:43:15 +08:00
wenyann b0a1fbe6dd Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-21 16:02:05 +08:00
Captain.B cc24e959eb chore: sync 2021-03-21 12:46:18 +08:00
wenyann 4ce09675b3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-21 12:27:04 +08:00
shiziyuan9527 6c0780e1cb fix(测试跟踪): 首页失败用例列表未统计性能失败用例 2021-03-21 12:03:36 +08:00
wenyann a40a36cfac Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-20 22:55:06 +08:00
shiziyuan9527 f3eb82c839 feat(测试跟踪): 测试用例可关联JIRA需求 2021-03-20 20:32:14 +08:00
song.tianyang 787909a415 Merge remote-tracking branch 'origin/master' 2021-03-20 16:48:15 +08:00
wenyann 0a8b04808c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-20 16:46:12 +08:00
shiziyuan9527 807bdfe841 fix(系统设置): 主题色修改 2021-03-20 12:46:46 +08:00
shiziyuan9527 2c41d790eb fix(测试跟踪): 修复只读人员能创建项目的问题 2021-03-20 09:59:00 +08:00
song.tianyang 72f9e143c5 feat: 接口定义针对 TCP 请求增加 ESB 子类型(X-Pack)
接口定义针对 TCP 请求增加 ESB 子类型(X-Pack)
2021-03-19 19:29:14 +08:00
fit2-zhao a34274b414 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-19 18:41:39 +08:00
fit2-zhao 17a764e236 fix(场景自动化): 修复移除不了导入的步骤问题 2021-03-19 18:41:23 +08:00
wenyann 4a3f44daf4 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-19 18:07:39 +08:00
chenjianxing b46e33a71c fix: 解决冲突 2021-03-19 18:07:39 +08:00
chenjianxing 2b5483dc23 fix: 用例导入tag表头为空导入失败 2021-03-19 18:04:35 +08:00
Captain.B 772454df43 Merge branch 'master' into compare 2021-03-19 17:44:49 +08:00
Captain.B 5350cc1634 refactor(性能测试): 设置默认超时时间为60s 2021-03-19 17:44:24 +08:00
Captain.B 5f7d6b5370 feat: 增加报告对比功能 2021-03-19 17:39:34 +08:00
shiziyuan9527 bc9a8ccc21 fix(测试跟踪): 修复执行步骤中含有回车的用例未原样导入的问题
Closes #1573
2021-03-19 17:21:41 +08:00
wenyann e23c4d84a8 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-19 17:19:29 +08:00
wenyann afc0cfbde5 fix:测试跟踪,测试用例表头显示和设置的不一样 2021-03-19 17:19:12 +08:00
wenyann 88c2073002 fix:测试跟踪-测试用例下拉框-创建用例,会提示没项目 2021-03-19 16:51:07 +08:00
shiziyuan9527 64a14107bd fix(测试跟踪): 表格名称显示错误 2021-03-19 16:41:41 +08:00
Captain.B ba7fb40f42 Merge branch 'master' into temp
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
2021-03-19 15:43:46 +08:00
Captain.B 497c2c3393 Merge remote-tracking branch 'origin/master' 2021-03-19 13:59:13 +08:00
Captain.B 37abc8efd8 refactor(性能测试): 调整执行时长最大值是9999秒,分,时 2021-03-19 13:51:06 +08:00
chenjianxing 6446024cf8 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-19 13:44:56 +08:00
chenjianxing 07ecb97022 refactor: 脑图全屏 2021-03-19 13:44:46 +08:00
shiziyuan9527 87334f4b5e fix(测试计划): 查询缺陷失败时捕获异常 2021-03-19 12:00:36 +08:00
shiziyuan9527 cd8c7a9124 refactor: 关联页面项目默认为当前项目 2021-03-19 11:05:30 +08:00
shiziyuan9527 937d33e955 fix(测试跟踪): 修复首页数据统计错误 2021-03-19 10:28:52 +08:00
Coooder-X 553a25881c
fix(接口定义): 输入用例名称,让鼠标移开后台自动保存 不用折叠页面也不用弹出提示 (#1665)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 输入用例名称,让鼠标移开后台自动保存 不用折叠页面也不用弹出提示
2021-03-19 10:11:46 +08:00
Coooder-X fb08b185b7
fix(接口定义): 删除用例提示的是删除接口,改成用例 (#1664)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 删除用例提示的是删除接口,改成用例
2021-03-19 10:11:29 +08:00
fit2-zhao 376d7a08c8 fix(场景自动化): 修复新建场景问题 2021-03-18 19:10:52 +08:00
fit2-zhao 6a93a0d0c4 fix(测试报告): 修复运行中的报告查看错误问题 2021-03-18 18:00:40 +08:00
fit2-zhao 5a98df399b style(XPack): 优化报表提示内容 2021-03-18 17:37:54 +08:00
fit2-zhao bc804ec9db Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 17:27:38 +08:00
fit2-zhao 3f1da24143 fix(接口定义): 修复加载外部js问题,增加 Nashorn JavaScript引擎切换到GraalVM 选择 2021-03-18 17:27:23 +08:00
shiziyuan9527 5e5be76df5 fix(测试跟踪): 创建用例时关联需求 2021-03-18 17:24:10 +08:00
wenyann a4ddf766be Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 16:12:36 +08:00
Ambitiousliga af5a0edfe2
fix(系统设置):修改用户密码时增加确认密码框 (#1662)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-18 16:12:08 +08:00
Ambitiousliga 0ba062f008
fix(接口测试):使XPath断言规则的表达式能接收更长的字符 (#1661)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-18 16:11:20 +08:00
wenyann dd8de4e277 Merge remote-tracking branch 'origin/master' 2021-03-18 16:11:01 +08:00
wenyann e8fd3f1847 fix:国际化 2021-03-18 16:10:38 +08:00
fit2-zhao 13adca8f57 fix(接口定义): 修复接口没有用例时初始添加报错问题 2021-03-18 16:05:08 +08:00
fit2-zhao e8f56b1787 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 15:04:05 +08:00
fit2-zhao 1961c8fec3 feat(接口自动化): 增加jmx导入内容的编辑 2021-03-18 15:03:46 +08:00
Coooder-X 3fd2139607
fix: 修复定时任务点击跳转错误 (#1643)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix: 修复定时任务点击跳转错误

* fix: 测试计划首页的定时任务只显示测试计划任务

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
2021-03-18 14:53:15 +08:00
Coooder-X eb163bbb65
fix(接口定义): 修复导入接口个数不对,以及api和case判断错误 (#1659)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix(接口定义): 修复导入接口个数不对,以及api和case判断错误
2021-03-18 14:49:39 +08:00
Coooder-X 1696001475
fix: 修复点击取消关闭定时任务,switch仍然会显示被关闭 (#1640)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix: 修复点击取消关闭定时任务,switch仍然会显示被关闭
2021-03-18 14:48:47 +08:00
Ambitiousliga f5ec3169ea
fix (#1646)
* fix(接口测试):修复只读用户权限过高能对数据进行操作

* fix(测试计划):修复关联用例时样式不统一的问题

Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
2021-03-18 14:48:19 +08:00
wenyann e7d78334f1 Merge remote-tracking branch 'origin/master' 2021-03-18 14:44:28 +08:00
chenjianxing 87ea2e0253 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-18 14:44:01 +08:00
wenyann 5818947ca7 fix: 注释接口性能测试(评审) 2021-03-18 14:43:56 +08:00
chenjianxing 0217702655 fix: 国际化 2021-03-18 14:43:51 +08:00
wenyann 878439795d fix: 测试评审样式 2021-03-18 13:59:51 +08:00
wenyann cf5688fc4e Merge remote-tracking branch 'origin/master' 2021-03-18 13:54:36 +08:00
wenyann 3593c907cd fix: 测试评审样式 2021-03-18 13:54:18 +08:00
Captain.B 850af874ee chore: sync 2021-03-18 13:34:18 +08:00
shiziyuan9527 e94774c976 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 10:55:29 +08:00
fit2-zhao 1b66871e2f fix(接口自动化): 最大化单接口调试问题修复 2021-03-18 10:36:43 +08:00
shiziyuan9527 ab9a4f3514 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-18 10:14:53 +08:00
fit2-zhao 17ebeda90b style(接口自动化): 终止事件调整 2021-03-17 19:02:28 +08:00
fit2-zhao ce361d3246 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-17 18:45:41 +08:00
fit2-zhao 319450d701 style(接口自动化): 步骤最大化时内容过多样式调整 2021-03-17 18:44:59 +08:00
shiziyuan9527 94b7cd3e4c fix(测试跟踪): 用例关联Zentao需求 2021-03-17 18:32:15 +08:00
Captain.B b00a5a4fcd refactor(性能测试): 调整rps上限为99999,迭代次数上限为9999999 2021-03-17 17:49:29 +08:00
Captain.B 54d180084a chore: sync 2021-03-17 17:31:42 +08:00
chenjianxing ca26657e91 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-17 16:59:42 +08:00
chenjianxing 03818c53ee fix: 脑图用例编辑 2021-03-17 16:59:33 +08:00
Captain.B 41d7619d74 fix(性能测试): 修复报告查看时的rps选项不能点击 2021-03-17 16:24:14 +08:00
Captain.B 489077ad08 Merge remote-tracking branch 'origin/master' 2021-03-17 15:07:16 +08:00
Captain.B 8170ffe3a4 fix(性能测试): 修复报告列表不能进入starting的报告 2021-03-17 15:06:55 +08:00
wenyann be2699f1dc Merge remote-tracking branch 'origin/master' 2021-03-17 15:03:17 +08:00
wenyann 806957ba79 feat: 测试计划列表 2021-03-17 15:02:44 +08:00
shiziyuan9527 e58dcf4d88 fix: 批量修改执行环境 2021-03-17 14:05:44 +08:00
chenjianxing 51e0461dc3 refactor: 脑图测试步骤和预期结果不加标签 2021-03-17 13:17:33 +08:00
chenjianxing e30209e990 refactor: 测试审批与测试计划脑图编辑 2021-03-17 13:03:59 +08:00
chenjianxing f9447a3ab2 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-17 11:46:06 +08:00
chenjianxing 492dbb42bd feat: 测试计划脑图编辑 2021-03-17 11:45:49 +08:00
fit2-zhao 816cb4780c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-17 11:41:44 +08:00
fit2-zhao eac412baab style(接口自动化): 步骤最大化样式调整 2021-03-17 11:41:38 +08:00
chenjianxing 9fa89f3a9c Merge branch 'master' of github.com:metersphere/metersphere 2021-03-17 10:54:03 +08:00
chenjianxing fc04de0980 feat: 用例评审脑图编辑 2021-03-17 10:53:53 +08:00
fit2-zhao 24d836d381 fix(接口自动化): 最大化调试执行处理 2021-03-17 10:33:31 +08:00
fit2-zhao 7489fcaec3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-17 09:13:50 +08:00
Captain.B e21f3c8d40 fix: 修复上传文件时检查没有同步返回的bug 2021-03-16 19:12:42 +08:00
fit2-zhao 271668a40e fix(接口自动化): 最大化cookie失效设置 2021-03-16 18:19:00 +08:00
Captain.B af2dbf2994 Merge remote-tracking branch 'origin/master' 2021-03-16 18:17:41 +08:00
Captain.B 43e14da7c3 fix: 修复 LDAP 测试登录没有加密的bug 2021-03-16 18:17:24 +08:00
wenyann 8730b4be89 feat: 创建测试计划 2021-03-16 18:10:15 +08:00
fit2-zhao e88f467105 feat(接口自动化): 场景步骤另存新的接口及用例 2021-03-16 18:03:33 +08:00
wenyann f74bf38052 feat: 测试评审测试计划功能测试同步添加关联的接口和性能测试 2021-03-16 17:48:26 +08:00
wenyann 2a40e173b5 Merge remote-tracking branch 'origin/master' 2021-03-16 14:41:37 +08:00
wenyann 93dc64b11a fix: 测试评审关联报错 2021-03-16 14:41:21 +08:00
fit2-zhao 99c46579fd Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-16 13:48:11 +08:00
Captain.B 7fe6b3660d refactor(性能测试): 删除文件之后刷新列表 2021-03-16 13:47:56 +08:00
Captain.B 15dc136df7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/resources/db/migration/V78__v1.8_release.sql
2021-03-16 13:42:36 +08:00
Captain.B 475440ccd4 refactor(性能测试): 测试文件关联项目 2021-03-16 13:40:14 +08:00
fit2-zhao e5ba2eba44 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-16 13:19:07 +08:00
fit2-zhao d43f867e97 feat(接口自动化): 查看引用场景变量 2021-03-16 13:16:59 +08:00
chenjianxing 80dfe48968 fix: 页面报错 2021-03-16 13:01:15 +08:00
chenjianxing c3f53287bc Merge branch 'master' of github.com:metersphere/metersphere 2021-03-16 12:56:10 +08:00
chenjianxing 0edc4d136f feat: 测试计划添加脑图 2021-03-16 12:55:56 +08:00
wenyann 30d39b4338 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
2021-03-16 11:40:19 +08:00
wenyann 916dc27989 fix: 测试评审关联用例修改 2021-03-16 11:38:46 +08:00
shiziyuan9527 25e2cdc2c9 fix(测试跟踪): 删除缺陷未删除关联关系 2021-03-16 11:01:48 +08:00
chenjianxing 0ab8899820 fix: 用例评审样式问题 2021-03-16 10:04:16 +08:00
chenjianxing 8b71a911b8 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 21:25:58 +08:00
shiziyuan9527 c2af5f6635 feat(测试跟踪): 首页跳转 2021-03-15 21:22:49 +08:00
chenjianxing 5cd45c9a1e Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 21:09:49 +08:00
chenjianxing 17e9c9dd93 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 20:46:53 +08:00
Coooder-X 7f8a453035
fix: 修改接口自动化、接口定义的导入参数全选按钮,修复选框不显示 (#1635)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: 修改接口自动化、接口定义的导入参数全选按钮,修复选框不显示
2021-03-15 20:43:01 +08:00
Coooder-X 0a19204418
feat(定时任务): 修改schedule表和查询,swagger定时任务也显示在首页 (#1627)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* feat(定时任务): 修改schedule表和查询,swagger定时任务也显示在首页

增加了schedule表的project ID、name字段,重写了首页定时任务列表的查询语句
2021-03-15 20:42:38 +08:00
chenjianxing c3d1c454b5 refactor: 用例评审添加脑图 2021-03-15 20:39:09 +08:00
fit2-zhao 90adde0933 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-15 19:08:59 +08:00
fit2-zhao 0255bcb598 feat(接口自动化): 全屏设置 2021-03-15 19:08:50 +08:00
Captain.B 31b5930273 Merge remote-tracking branch 'origin/master' 2021-03-15 17:41:28 +08:00
Captain.B 1e77dfa1ae feat(性能测试): 报告图表采用平滑显示 2021-03-15 17:40:37 +08:00
shiziyuan9527 19d284a399 fix(测试跟踪): 首页重构 2021-03-15 17:24:14 +08:00
Captain.B 84a989db63 Merge remote-tracking branch 'origin/master' 2021-03-15 17:03:41 +08:00
Captain.B c426bb2064 feat(性能测试): 配置压测时长支持单位 2021-03-15 16:55:33 +08:00
chenjianxing bbacb89b02 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 16:21:14 +08:00
chenjianxing b5709cc998 feat: 脑图用例编辑 2021-03-15 16:20:51 +08:00
Captain.B 8b9b259853 feat(性能测试): 报告对比 2021-03-15 16:01:09 +08:00
shiziyuan9527 82d7be618c fix: 主题色修改 2021-03-15 15:26:56 +08:00
shiziyuan9527 4243cfdf7b fix: 主题色修改 2021-03-15 11:34:51 +08:00
shiziyuan9527 41cfc77a3e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-13 13:04:56 +08:00
shiziyuan9527 551f34fee7 feat(测试跟踪): 首页重构 2021-03-13 13:01:28 +08:00
Captain.B edfe08e5f6 Merge remote-tracking branch 'origin/master' 2021-03-12 18:15:55 +08:00
Captain.B e306a17056 fix(性能测试): 修复图表的问题 2021-03-12 18:15:39 +08:00
fit2-zhao 7093a8a921 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 17:14:36 +08:00
chenjianxing 74deed5032 fix: 脑图样式冲突以及功能优化 2021-03-12 16:57:34 +08:00
shiziyuan9527 7d26ee82c5 feat(测试跟踪): 用例数量统计 2021-03-12 16:57:16 +08:00
Captain.B 306600c73a refactor: 用户登录时用户名和密码使用密文传输
Closes #1094
2021-03-12 15:07:12 +08:00
fit2-zhao 67084bf5da style(接口自动化): 步骤组件样式统一 2021-03-12 14:00:59 +08:00
wenyann 637739459e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 11:15:31 +08:00
fit2-zhao f84eb9f702 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 10:57:13 +08:00
fit2-zhao 7a9bb603e8 fix(接口自动化): 修复引用场景不能移除问题 2021-03-12 10:56:59 +08:00
Captain.B 3d6eb4be51 chore: sync 2021-03-12 10:51:47 +08:00
Captain.B 17fff4a326 Merge remote-tracking branch 'origin/master' 2021-03-12 10:48:43 +08:00
Captain.B 2ff611bd58 fix(性能测试): 查看报告的时候压力配置图修改 2021-03-12 10:48:27 +08:00
shiziyuan9527 f787ed11d4 refactor: i18n 2021-03-12 10:25:17 +08:00
wenyann 9d6cec56e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 10:23:38 +08:00
Tester_Z 114573a475
fix: 修复菜单栏缩放过大导致的布局错位问题 (#1594) 2021-03-12 09:48:39 +08:00
Coooder-X de06a5e770
fix: 国际化补充 (#1615)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: 国际化补充
2021-03-11 20:44:49 +08:00
Coooder-X c25f10050b
feat(接口定义): 支持接口定义导出为 swagger 格式 (#1606)
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* feat(接口定义): 支持接口定义导出为 swagger 格式
2021-03-11 20:44:29 +08:00
Ambitiousliga b8c8d036bf
fix(接口测试):修复只读用户权限过高能对数据进行操作 (#1614)
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
2021-03-11 20:41:25 +08:00
chenjianxing 5ec898a4fb Merge branch 'master' of github.com:metersphere/metersphere 2021-03-11 20:28:24 +08:00
chenjianxing 0e5494cbe2 模块树转脑图 2021-03-11 20:27:54 +08:00
wenyann 3aae293f22 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 18:54:04 +08:00
fit2-zhao 5870c64653 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 18:49:41 +08:00
shiziyuan9527 4c6760df8b fix(测试用例): 字符串限制长度不一致
Closes #1574
2021-03-11 18:40:23 +08:00
fit2-zhao 4cd4a7592b Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/main.js
2021-03-11 18:34:03 +08:00
wenyann 4edddd5e39 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
2021-03-11 18:33:38 +08:00
wenyann c3627e5f29 fix:测试评审接口列表修改 2021-03-11 18:32:34 +08:00
chenjianxing 1b541ab4fc fix: 解决冲突 2021-03-11 18:12:50 +08:00
fit2-zhao 257d031b8a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 17:59:27 +08:00
fit2-zhao 50d4d03380 fix(接口自动化): 修复因卡顿 重复提交的问题 2021-03-11 17:54:40 +08:00
chenjianxing 4d1958fd01 fix: 脑图样式 2021-03-11 17:42:41 +08:00
shiziyuan9527 b08a524f2a fix: 修复顶部菜单样式 2021-03-11 17:31:57 +08:00
Captain.B 4557e1905d fix(性能测试): 查看报告的时候不能点击线程类型 2021-03-11 17:26:18 +08:00
Captain.B 84895e7d34 chore: sync 2021-03-11 17:22:03 +08:00
Captain.B f49e0ce771 Merge remote-tracking branch 'origin/master' 2021-03-11 17:21:12 +08:00
Captain.B d92f04c1bd refactor(性能测试): 性能测试压力预览图修改 2021-03-11 17:20:50 +08:00
fit2-zhao 7dfa50d348 fix(接口定义): 保存用例最后执行环境 2021-03-11 17:03:29 +08:00
shiziyuan9527 6500e0cf4a Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/xpack
2021-03-11 16:46:58 +08:00
shiziyuan9527 56e9399595 feat(系统设置): 修改配色 2021-03-11 16:38:40 +08:00
song.tianyang 9f33d88d3a Merge remote-tracking branch 'origin/master' 2021-03-11 16:36:42 +08:00
song.tianyang 2a29e611b5 feat: 接口自动化模块Har文件导入
接口自动化模块Har文件导入
2021-03-11 16:34:14 +08:00
wenyann 0d1d1acd3d fix:修复测试报告不存在 2021-03-11 16:32:47 +08:00
fit2-zhao be133b3cc6 fix(接口自动化,接口定义): 修复列表数据放到回收站再恢复时状态错误问题 2021-03-11 15:56:54 +08:00
wenyann 8fd1ddbf2b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:10:33 +08:00
wenyann c4c33921b9 fix: 创建测试用例修改 2021-03-11 14:07:08 +08:00
wenyann 0e3a26cbb5 fix:创建测试用例修改 2021-03-11 14:05:32 +08:00
fit2-zhao aef40557cb Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:03:49 +08:00
fit2-zhao ae7de6edd1 refactor(接口定义): 删除无用js文件 2021-03-11 14:01:09 +08:00
Captain.B 496816d288 chore: sync 2021-03-11 13:56:58 +08:00
Captain.B db8e075f9e refactor(性能测试): 增加上传资源文件的类型 2021-03-11 13:56:31 +08:00
fit2-zhao 448c14138b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 13:51:07 +08:00
fit2-zhao 6b76d62bdb fix(接口自动化): 每个请求显示执行结果 2021-03-11 13:30:37 +08:00
fit2-zhao 5bd68a8234 fix: 恢复误提交引用 2021-03-11 11:40:42 +08:00
song.tianyang 0380567fe4 feat: Har文件导入
Har文件导入
2021-03-11 11:40:15 +08:00
Captain.B 511278843d Merge remote-tracking branch 'origin/master' 2021-03-11 10:57:57 +08:00
Captain.B 0f5d79fb52 feat(性能测试): 提供手动设置报告聚合时间 2021-03-11 10:55:36 +08:00
chenjianxing dc0cc7425a feat: 添加脑图 2021-03-10 21:35:19 +08:00
chenjianxing e3bb866969 refactor: 抽取tabButton组件 2021-03-10 20:54:47 +08:00
shiziyuan9527 82b2a6cf6a fix(接口自动化): 执行调试前检查环境配置 2021-03-10 18:05:18 +08:00
Captain.B cc16006b37 Merge remote-tracking branch 'origin/master' 2021-03-10 17:30:53 +08:00
Captain.B 808f9de68b fix: 跳转到 / 不用校验csrf 2021-03-10 17:30:13 +08:00
shiziyuan9527 78db8d3b59 fix(接口自动化): 自定义请求环境配置问题 2021-03-10 17:21:38 +08:00
Captain.B 9de992a91c chore: sync 2021-03-10 15:49:43 +08:00
Captain.B 5a632c7141 Merge remote-tracking branch 'origin/master' 2021-03-10 15:48:33 +08:00
Captain.B 7e6a08bef2 refactor: 使用csrf拦截器过滤请求
Closes #1088
2021-03-10 15:02:30 +08:00
shiziyuan9527 e1d18909e2 fix(接口自动化): 添加场景到测试计划时未选择环境 2021-03-10 14:15:01 +08:00
fit2-zhao 842cf07ccf refactor(XPack): 报表路由同样命名 2021-03-10 13:48:57 +08:00
fit2-zhao 0a0fe75c86 fix: 解决控制台mouseleave 时警告问题 2021-03-10 11:29:44 +08:00
fit2-zhao f511b38e91 fix(场景自动化): 修复循环控制器不能添加引用场景问题 2021-03-10 11:25:22 +08:00
fit2-zhao b9d43558bc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-10 11:15:29 +08:00
fit2-zhao c5d58d40c3 feat(接口定义): JSONpath 断言增加操作符 2021-03-10 11:14:31 +08:00
Captain.B 8bf4ce16a6 fix: 修复查看已结束的报告报错 2021-03-10 10:13:04 +08:00
song.tianyang 7e7433f801 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
2021-03-09 19:21:19 +08:00
song.tianyang 3d822ac0bb fix: 有附件的案例或场景转JMX时,附件也要加过去
有附件的案例或场景转JMX时,附件也要加过去
2021-03-09 19:10:27 +08:00
shiziyuan9527 abe640cba5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-09 18:09:58 +08:00
shiziyuan9527 c90c061738 fix(接口自动化): 环境配置问题 2021-03-09 18:08:02 +08:00
wenyann 3e64e39631 Merge remote-tracking branch 'origin/master' 2021-03-09 17:44:08 +08:00
wenyann 9e723a1309 feat: 用例评审修改 2021-03-09 17:36:53 +08:00
wenyann 5475bb4adb feat: 测试评审详情改造,关联测试用例 2021-03-09 17:32:49 +08:00
Captain.B 24e74882bb fix: 登录页面宽度1200px 2021-03-09 14:38:09 +08:00