test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,593 Commits 42 Branches 174 Tags 409 MiB
Commit Graph

4401 Commits

Author SHA1 Message Date
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
Captain.B cc46f93fe5 Merge remote-tracking branch 'origin/master' 2021-03-09 14:05:52 +08:00
Captain.B 5f59602ddd fix: 去掉登录页面滚动条 2021-03-09 14:05:35 +08:00
wenyann 48fccf8ce3 Merge remote-tracking branch 'origin/master' 2021-03-09 13:17:10 +08:00
wenyann 66977ce60d fix: 场景字段缺失 2021-03-09 13:13:25 +08:00
shiziyuan9527 c16b3969a8 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-09 11:40:18 +08:00
shiziyuan9527 8f5ffcb51a fix(测试计划): 列表页面卡顿 2021-03-09 11:38:11 +08:00
Captain.B 3c970efd2d chore: sync 2021-03-08 19:11:51 +08:00
shiziyuan9527 c59cc92f28 fix(接口自动化): 自定义请求步骤不能执行 2021-03-08 18:37:42 +08:00
fit2-zhao 44422224ca Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 17:00:39 +08:00
fit2-zhao bace68bd85 feat(测试跟踪): xmind 导入用例增加标签处理 2021-03-08 17:00:32 +08:00
shiziyuan9527 d250f6c49d fix(接口自动化): 加载环境配置 2021-03-08 16:27:23 +08:00
song.tianyang d591bca29c Merge remote-tracking branch 'origin/master' 2021-03-08 14:49:28 +08:00
song.tianyang 9ac38f6035 fix: 修复无xpack版源码运行，文档模块会报错的问题 
修复无xpack版源码运行，文档模块会报错的问题
 2021-03-08 14:46:32 +08:00
shiziyuan9527 b22f2a5ed7 feat(接口自动化): 批量修改场景执行环境 2021-03-08 14:21:55 +08:00
fit2-zhao 78b30352af fix(接口自动化): 修复添加断言规则，会多出一个响应时间断言栏 2021-03-08 14:20:29 +08:00
Captain.B d634f9d540 fix(性能测试): 修复导入资源文件没有上传的bug 2021-03-08 13:14:13 +08:00
Captain.B 9aed5a57a9 fix(性能测试): 修复创建测试时方法名字修改的bug 2021-03-08 10:10:39 +08:00
fit2-zhao 60bb8bdf18 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-05 18:30:12 +08:00
fit2-zhao fc610db2ca feat(XPack): 完成报表列表功能及筛选功能 2021-03-05 17:47:49 +08:00
Captain.B 6940a2eb02 Merge remote-tracking branch 'origin/master' 2021-03-05 17:44:16 +08:00
Captain.B 0bd3d0355b Merge remote-tracking branch 'origin/master' 2021-03-05 17:43:48 +08:00
song.tianyang 2c522657e5 Merge remote-tracking branch 'origin/master' 2021-03-05 17:43:45 +08:00
song.tianyang d5a17f447c fix: 文档分享功能问题-增加过滤路径、日志，修改文档路径生成方式 
文档分享功能问题-增加过滤路径、日志，修改文档路径生成方式
 2021-03-05 17:41:31 +08:00
Coooder-X fef08d19aa
fix(定时任务): 修复 开启-关闭定时任务提示窗错误 (#1578) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* fix(定时任务): 修复 开启-关闭定时任务提示窗错误
 2021-03-05 17:33:10 +08:00
Ambitiousliga a687ccce8e
fix(接口定义)：修复删除CASE时没有“确认删除”弹窗 (#1571) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-05 17:32:11 +08:00
Coooder-X 2cb7aa6256
fix: 场景用例步骤复制时候插入在当前步骤下面 (#1570) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* feat(场景步骤、环境配置): 场景变量、环境配置支持mock参数

* fix: 场景用例步骤复制时候插入在当前步骤下面
 2021-03-05 17:31:52 +08:00
Coooder-X 595a594d50
feat(场景步骤、环境配置): 场景变量、环境配置 支持mock参数 (#1566) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* feat(场景步骤、环境配置): 场景变量、环境配置支持mock参数
 2021-03-05 17:31:05 +08:00
Coooder-X f1c021e9cc
Fix el input (#1559) 
* feat(测试跟踪): 测试用例下载模版增加标签列

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

* fix(环境配置): 解决 通用配置-变量名在屏幕缩小时无法显示
 2021-03-05 17:30:01 +08:00
Coooder-X dc6240c964
feat(测试跟踪): 测试用例下载模版增加标签列 (#1548) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度
 2021-03-05 17:29:17 +08:00
Coooder-X 58d4c226b8
feat: (场景步骤) 请求参数增加复选框实现一键全选和反选 (#1529) 2021-03-05 17:28:14 +08:00
Captain.B 5595110c1c feat(性能测试): 修复报告显示线程组重复的bug 2021-03-05 17:24:12 +08:00
shiziyuan9527 7a251e2afb Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-05 17:08:00 +08:00
shiziyuan9527 313c6d4eaf feat(测试计划): 批量修改场景用例执行环境 2021-03-05 17:03:12 +08:00
Captain.B d6b73f1305 Merge remote-tracking branch 'origin/master' 2021-03-05 16:43:43 +08:00
Captain.B a281f08422 feat(性能测试): 支持选择线程组 2021-03-05 16:43:21 +08:00
wenyann 63578e4391 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-05 16:25:51 +08:00
wenyann d1fa34c7fc feat: 测试用例改造 2021-03-05 16:24:34 +08:00
shiziyuan9527 eed41fab06 feat(测试计划): 关联场景用例时保存执行环境 2021-03-05 16:17:18 +08:00
Captain.B 7599c4c5fc feat(性能测试): 支持选择线程组 2021-03-05 15:57:25 +08:00
Captain.B 3a7a37bc19 feat(性能测试): 上传的文件保证顺序 2021-03-05 14:32:52 +08:00
Captain.B 2dd0d94276 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-05 13:29:47 +08:00
Captain.B 329ed8dd77 feat(性能测试): 支持自由组合场景 2021-03-05 13:13:29 +08:00
fit2-zhao 2076159918 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-04 19:59:15 +08:00
fit2-zhao 5c5fc5546b feat(XPack): 完成报表的charts 加载 2021-03-04 19:55:56 +08:00
song.tianyang 0c6704b742 Merge remote-tracking branch 'origin/master' 2021-03-04 19:21:32 +08:00
song.tianyang 41cb3e0283 feat: 设置模块，系统->用户、组织->成员 新增批量处理功能【添加工作空间】【添加角色】；工作空间->成员 新增批量处理功能【添加角色】 
设置模块，系统->用户、组织->成员 新增批量处理功能【添加工作空间】【添加角色】；工作空间->成员 新增批量处理功能【添加角色】
 2021-03-04 19:21:18 +08:00
shiziyuan9527 aa54248673 feat(测试计划): 批量修改接口用例执行环境 2021-03-04 17:41:30 +08:00
fit2-zhao be55b34bfd fix(接口自动化): If控制器可增加导入场景权限 2021-03-04 17:29:28 +08:00
shiziyuan9527 c8ef224935 fix(接口自动化): 初始化时未加载环境配置 2021-03-04 10:40:04 +08:00
fit2-zhao 18d6322636 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-04 10:29:55 +08:00
fit2-zhao 70f71b2e70 feat(XPack): i18n 统一提交 2021-03-04 10:29:41 +08:00
shiziyuan9527 d18c1aa9ed fix(接口自动化): 环境配置列表显示不准确的问题 2021-03-03 21:19:17 +08:00
fit2-zhao c8c96d8919 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 18:47:42 +08:00
fit2-zhao d40fe759a9 feat(XPack): 路由配置 2021-03-03 18:47:09 +08:00
fit2-zhao 032b9e16e1 fix(接口自动化): 修复jmx导入 断言规则处理问题 2021-03-03 17:48:21 +08:00
Captain.B f4dbf03580 Merge branch 'scenario' 2021-03-03 17:35:02 +08:00
Captain.B 4a9ccc2ea5 feat(性能测试): 支持组合场景场景 2021-03-03 17:33:55 +08:00
fit2-zhao ce9d9c8c43 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 17:33:27 +08:00
fit2-zhao 4aac690fc8 feat(XPack): 报表分析，前端页面完成 2021-03-03 17:33:22 +08:00
fit2-zhao 445df3a281 fix(接口自动化): i18n合并 2021-03-03 17:28:57 +08:00
song.tianyang 1df8b0c38a Merge remote-tracking branch 'origin/master' 2021-03-02 18:27:11 +08:00
song.tianyang 1c4d0c9012 feat: 用户excel批量导入功能 
用户excel批量导入功能
 2021-03-02 18:22:22 +08:00
shiziyuan9527 bab80c4ef2 refactor(场景自动化): 调整环境配置样式 2021-03-02 18:01:09 +08:00
shiziyuan9527 739d194854 fix(测试计划): 拼写导致的控制台报错 2021-03-02 14:10:29 +08:00
wenyann 8690b9afd8 feat: 创建评审加执行按钮 2021-03-02 12:52:21 +08:00
wenyann 5114672358 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-02 11:01:39 +08:00
wenyann e06d5bfaf6 fix: 保存上次选中字段，平级拖动 2021-03-02 10:58:25 +08:00
shiziyuan9527 957c186b32 fix(接口自动化): 关闭环境编辑页面环境列表未刷新的问题 2021-03-01 16:45:15 +08:00
wenyann dd96caedd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-01 15:21:32 +08:00
wenyann 1a633fe2ca feat: 改造评审用例，创建评审，评审详情 
fix：修改接口定义更新错误
 2021-03-01 15:21:10 +08:00
shiziyuan9527 3b2fe5ddb3 fix(接口自动化): 环境配置渲染顺序不固定的问题 2021-03-01 14:59:50 +08:00
shiziyuan9527 b7ddf4194a Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/api/definition/components/Run.vue
 2021-03-01 10:27:46 +08:00
shiziyuan9527 532007f25d feat(接口自动化): 场景步骤跨项目添加接口 2021-02-26 18:24:59 +08:00
fit2-zhao d961a96081 fix(接口自动化): 修复循环下添加自定义请求问题 2021-02-26 18:15:04 +08:00
fit2-zhao 5735efc372 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-26 17:16:28 +08:00
fit2-zhao ab56e2f7be fix(接口定义): 断言脚本规则 增加 python 推荐脚本 2021-02-26 17:15:08 +08:00
shiziyuan9527 b5d7140aa8 refactor: 去掉冗余代码 2021-02-26 14:38:54 +08:00
fit2-zhao 10861c56df fix(接口定义): 模块树，检索大小写问题优化 2021-02-26 14:19:23 +08:00
shiziyuan9527 df73916d7d fix(接口自动化): 场景步骤循环控制器无法执行的问题 2021-02-26 14:18:07 +08:00
fit2-zhao 7e4c7303c4 fix(接口定义): 修复调试缺陷 2021-02-26 14:06:13 +08:00
shiziyuan9527 2bed7959bb Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
	backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
 2021-02-26 13:30:00 +08:00
shiziyuan9527 025fa9cde0 fix(接口自动化): 场景步骤中接口无法执行的问题 2021-02-26 13:14:56 +08:00
fit2-zhao c3466d5ca7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-26 11:34:27 +08:00
fit2-zhao a3d3fc8366 refactor(接口测试): 重构基本数据格式 2021-02-26 11:32:49 +08:00
shiziyuan9527 34fc7e8cf6 fix(接口自动化): 场景步骤所属项目显示慢的问题 2021-02-26 10:40:08 +08:00
fit2-zhao 8ae4743d42 fix(测试跟踪，接口测试): 添加了非被动事件侦听器解决控制台一堆警告问题 2021-02-26 10:22:05 +08:00
fit2-zhao 6b47ed7470 fix(接口自动化): 修复新功能导致执行问题 2021-02-25 18:44:33 +08:00
fit2-zhao 9b2b7e7f63 fix(接口定义): 修复新功能导致执行问题 2021-02-25 18:25:38 +08:00
song.tianyang e385d3b84c Merge remote-tracking branch 'origin/master' 2021-02-25 15:29:48 +08:00
song.tianyang a84edf8cc9 Merge remote-tracking branch 'origin/master' 2021-02-25 15:29:04 +08:00
song.tianyang 56a369b6a6 fix: 修改请求方式显示样式、提升文档页面数据加载的性能 
修改请求方式显示样式、提升文档页面数据加载的性能
 2021-02-25 15:28:41 +08:00
fit2-zhao 35887dff24 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 15:27:26 +08:00
fit2-zhao be78ab5b29 fix(接口自动化，测试跟踪，接口定义): 修复所有高级搜索-标签搜索问题 2021-02-25 15:24:34 +08:00
shiziyuan9527 dc8a850db8 fix(接口自动化): 修复调试时环境判断 2021-02-25 15:04:20 +08:00
shiziyuan9527 d2b183256f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 14:49:35 +08:00
shiziyuan9527 e4f8018065 Merge branch 'scenario-projects' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java
#	backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
 2021-02-25 14:48:54 +08:00
Captain.B 8db2582f21 chore: sync 2021-02-25 14:48:36 +08:00
shiziyuan9527 c9e4e32fca fix(接口自动化): 跨项目添加场景兼容历史数据 2021-02-25 14:37:08 +08:00
chenjianxing 16b146b2a4 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 13:56:21 +08:00
chenjianxing 089a994b01 fix: 测试用例导出全选 2021-02-25 13:47:47 +08:00
song.tianyang 8412735cec Merge remote-tracking branch 'origin/master' 2021-02-25 13:46:42 +08:00
song.tianyang 33468c66cd feat: 接口定义增加api文档功能 
接口定义增加api文档功能
 2021-02-25 13:46:01 +08:00
Captain.B 072792eb8b refactor(性能测试): 资源池增加配置gc和heap的选项 2021-02-25 11:32:58 +08:00
shiziyuan9527 6417a131b0 fix(接口自动化): 跨项目添加场景 2021-02-25 11:22:01 +08:00
wenyann fc43d9967f Merge remote-tracking branch 'origin/master' 2021-02-24 18:38:39 +08:00
wenyann 3fc69227ff fix: 设置接口URL不可重复，重复导入时接口用例重复生成,部分提取 2021-02-24 18:37:59 +08:00
shiziyuan9527 ef08532187 feat(接口自动化): 跨项目添加场景 2021-02-24 16:29:22 +08:00
fit2-zhao eb16cead2e style(接口定义): 接口定义用例创建时间和更新时间样式间距调整 2021-02-24 14:03:00 +08:00
fit2-zhao aa6bf4cb6e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-24 11:04:39 +08:00
fit2-zhao 56a38525e4 fix(接口自动化): 权限控制 2021-02-24 11:04:21 +08:00
wenyann 1f2ffba0d4 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-02-24 10:36:19 +08:00
wenyann 96ddd80f11 feat: 接口定义列表操作列增加执行图标 2021-02-24 10:31:06 +08:00
fit2-zhao 0355634492 style(测试跟踪，接口测试): 所有TAG标签显示样式优化 2021-02-24 10:13:09 +08:00
shiziyuan9527 0a997065dd feat(接口自动化): 跨项目添加场景步骤 2021-02-23 18:06:12 +08:00
wenyann 83f8d4f5c1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 17:20:58 +08:00
wenyann b8387ac3cf feat: 接口定义列表添加执行 2021-02-23 17:20:45 +08:00
chenjianxing ebfcc56a3d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 17:10:39 +08:00
chenjianxing 1edc8f1644 refactor: 自定义表头支持拖拽 2021-02-23 17:10:24 +08:00
fit2-zhao 80e5b4935d feat(接口自动化): 导入jmx 添加HTTP 请求头处理 2021-02-23 17:02:49 +08:00
fit2-zhao 22855ba8cb fix(接口定义):规范jmx导入方法 2021-02-23 14:27:23 +08:00
wenyann 7e51a7eb61 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 14:11:37 +08:00
wenyann 24007f71a8 fix: 明文显示收件人 2021-02-23 14:11:24 +08:00
fit2-zhao 4d810c3d5d fix(接口定义): 修复执行报错问题 2021-02-23 11:29:15 +08:00
fit2-zhao 6b931b9777 fix(接口定义): 修复dubbo类型错误问题 2021-02-23 11:01:13 +08:00
fit2-zhao 1bc15856cc style(接口自动化): 优化单个步骤执行结果信息显示，支持可复制 2021-02-23 10:16:51 +08:00
fit2-zhao 8771e82ba1 fix(接口自动化): 修复场景变量 header 输入提示功能，修复报告显示顺序问题 2021-02-22 18:05:17 +08:00
fit2-zhao a983c8a4da Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-22 16:38:49 +08:00
fit2-zhao 42a9c3b1de feat(接口自动化): 完成 jmx 导出功能 2021-02-22 16:32:44 +08:00
shiziyuan9527 354892fd9c refactor(场景自动化): 场景步骤显示所属项目名 2021-02-22 16:01:39 +08:00
shiziyuan9527 5f0821174a refactor: 测试元素实体类增加项目ID属性 2021-02-22 14:51:05 +08:00
chenjianxing 2a7ccf7b24 refactor: 统一接口定义和场景导出 2021-02-22 13:57:40 +08:00
Captain.B 192b8ed757 feat: K8S 资源池支持nodeSelector 2021-02-22 12:41:46 +08:00
fit2-zhao 188cdbf6e3 fix(接口自动化): 修复场景无法导入问题 2021-02-20 18:26:06 +08:00
fit2-zhao e6e71a0f1e feat(接口自动化): 完成导出jmx功能 2021-02-20 18:25:39 +08:00
fit2-zhao e831eb5f3d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 14:33:25 +08:00
fit2-zhao dff4904efb style(接口自动化): DUBBO协议接口 显示样式修改 2021-02-20 14:32:45 +08:00
chenjianxing 29b87fd76d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 14:12:39 +08:00
chenjianxing 3e623dd0ad fix: 场景导出代码冲突 2021-02-20 14:10:06 +08:00
song.tianyang 8fd91be7b1 fix: 解决文档右侧列表排序变动时产生的错序问题 
解决文档右侧列表排序变动时产生的错序问题
 2021-02-20 14:06:09 +08:00
chenjianxing ce7600bad4 fix: 解决冲突 2021-02-20 13:44:18 +08:00
chenjianxing 500fe60fec feat: 场景导入-MS格式 2021-02-20 11:57:31 +08:00
fit2-zhao 35d87006e0 fix(接口自动化): 注释一部分重复代码 2021-02-20 11:56:18 +08:00
fit2-zhao 1270eb8b29 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-20 11:53:04 +08:00
fit2-zhao b0486b6faf Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-20 11:52:23 +08:00
fit2-zhao 63b8801aa9 feat(接口自动化): 完善jmx导入功能，增加jmeter相关Sampler依赖jar包 2021-02-20 11:20:58 +08:00
song.tianyang 1f6736cad0 Merge remote-tracking branch 'origin/master' 2021-02-19 18:30:13 +08:00
song.tianyang d1789dd154 feat: 接口定义->文档 增加JSON-Schema的显示和查找功能 
接口定义->文档 增加JSON-Schema的显示和查找功能
 2021-02-19 18:29:47 +08:00
wenyann 9b2e1e5a52 Merge remote-tracking branch 'origin/master' 2021-02-19 18:27:44 +08:00
wenyann 4e376541d1 fix: 修复冲突 2021-02-19 18:27:24 +08:00
chenjianxing a813605095 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-19 17:52:45 +08:00
chenjianxing c6c220269b fix: 解决冲突 2021-02-19 17:52:34 +08:00