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

4844 Commits

Author SHA1 Message Date
shiziyuan9527 ab0f6d33c0 fix(场景自动化): 禁用场景步骤仍要求选择环境 2021-04-08 14:29:08 +08:00
shiziyuan9527 cc1cecc18b refactor: 代码规范 2021-04-08 14:28:37 +08:00
shiziyuan9527 57e5adb222 refactor: 代码规范 2021-04-08 14:28:37 +08:00
shiziyuan9527 8e95fa87bc refactor: 代码规范 2021-04-08 14:28:37 +08:00
shiziyuan9527 47f0333392 refactor: 代码规范 2021-04-08 14:28:37 +08:00
shiziyuan9527 c169f66dad refactor(场景自动化): 场景无步骤时运行环境置灰 2021-04-08 14:28:37 +08:00
shiziyuan9527 be68830955 fix(场景自动化): 禁用场景步骤仍要求选择环境 2021-04-08 14:28:37 +08:00
wenyann c3e636c953 fix: 测试计划，关联测试跳转问题,新建用例-编辑，无法给用例添加测试步骤,执行用例的时候，应允许编辑备注和附件,以及评论 2021-04-08 14:24:01 +08:00
wenyann 491dd7fc27 fix: 测试计划，关联测试跳转问题,新建用例-编辑，无法给用例添加测试步骤,执行用例的时候，应允许编辑备注和附件,以及评论 2021-04-08 14:23:35 +08:00
wenyann 055f971598 fix: 测试计划，关联测试跳转问题,新建用例-编辑，无法给用例添加测试步骤,执行用例的时候，应允许编辑备注和附件,以及评论 2021-04-08 14:23:10 +08:00
wenyann bd911136d8 fix: 测试计划，关联测试跳转问题,新建用例-编辑，无法给用例添加测试步骤,执行用例的时候，应允许编辑备注和附件,以及评论 2021-04-08 13:22:06 +08:00
Captain.B 41ca21f90c fix(性能测试): 修复报告对比时页面缓存的问题 2021-04-07 17:43:32 +08:00
Captain.B 437c1e28bd fix(性能测试): 修复报告对比时页面缓存的问题 2021-04-07 17:43:09 +08:00
Coooder-X 189dd3cd94
style(接口定义): 添加断言、等待控制器、前置脚本、后置脚本、提取参数 光标聚焦到输入框，自动展开 (#1873) 2021-04-07 15:09:58 +08:00
Ambitiousliga f96a323678
fix(测试跟踪):使得创建测试计划的对话框更加人性化 (#1878) 
* fix(测试跟踪):使得创建测试计划的对话框更加人性化

* style(测试跟踪):删除一行额外代码
 2021-04-07 15:09:16 +08:00
metersphere-bot 1994bfdb58
fix: cron 表达式生成器内存溢出 (#1933) 
Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
 2021-04-07 15:07:13 +08:00
metersphere-bot 1587d74b53
fix: postman导入缺失 (#1929) 
* feat: 脑图支持给模块打标签，批量操作

* fix: 国际化

* fix: postman导入缺失

* refactor: 代码优化

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
 2021-04-07 15:06:49 +08:00
metersphere-bot dbd5711c10
fix: 修改测试计划状态报错 (#1934) 
Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
 2021-04-07 15:06:12 +08:00
Captain.B b85c4519fb refactor(性能测试): 自动停止页面国际化 2021-04-07 08:40:38 +08:00
Captain.B ad8f290b52 refactor(性能测试): 自动停止页面国际化 2021-04-07 08:40:23 +08:00
Captain.B 302d814a3c refactor(性能测试): 自动停止页面国际化 2021-04-07 08:40:08 +08:00
guhan121 7809d7cc2f feat(登录):ldap启用时默认选择ldap登录方式 2021-04-06 16:17:57 +08:00
guhan121 990250fb30 feat(登录):ldap启用时默认选择ldap登录方式 2021-04-06 16:15:10 +08:00
guhan121 439dc08808 feat(登录):ldap启用时默认选择ldap登录方式 2021-04-06 15:48:37 +08:00
fit2-zhao a6e9a27f05 refactor(接口自动化): 重构报告页面，按照层级显示 2021-04-06 15:25:00 +08:00
Captain.B 71c3e92332 feat(性能测试): 支持自动停止 2021-04-06 13:30:24 +08:00
Captain.B d811c6bf79 feat(性能测试): 支持自动停止 2021-04-06 13:27:16 +08:00
Captain.B 645a35c073 feat(性能测试): 支持自动停止 2021-04-06 13:26:39 +08:00
fit2-zhao 7b5c15a565 refactor(接口自动化): 重构报告页面，按照层级显示 2021-04-06 10:19:26 +08:00
Captain.B f130eb9e4c revert(性能测试): 回退关于测试执行时间的修改 2021-04-04 14:43:08 +08:00
Captain.B ab8293769c revert(性能测试): 回退关于测试执行时间的修改 2021-04-04 14:42:52 +08:00
Captain.B 1a8a6c779f revert(性能测试): 回退关于测试执行时间的修改 2021-04-04 14:42:38 +08:00
Captain.B c2b8e391be fix(性能测试): 压力配置上可以选择场景是否顺序执行 2021-04-02 17:47:16 +08:00
Captain.B b4d8c693ba fix(性能测试): 压力配置上可以选择场景是否顺序执行 2021-04-02 17:26:50 +08:00
shiziyuan9527 c7c55541f0 refactor(场景自动化): 调试前检查运行环境 2021-04-02 17:15:10 +08:00
shiziyuan9527 ef819a0e77 refactor(场景自动化): 调试前检查运行环境 2021-04-02 17:14:42 +08:00
shiziyuan9527 d59d4b5fca refactor(场景自动化): 调试前检查运行环境 2021-04-02 17:11:04 +08:00
Captain.B 512d2c3170 fix(性能测试): 压力配置上可以选择场景是否顺序执行 2021-04-02 17:10:44 +08:00
metersphere-bot 6e1545b619
fix: form-data请求体切换成文件上传无反应 (#1872) 
Authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
 2021-04-02 16:41:59 +08:00
metersphere-bot 89cf36f9fb
fix: 评审测试计划脑图点击模块再点脑图出错 (#1856) 
Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
 2021-04-02 16:31:35 +08:00
jianxing f8bff31acb Update MsTableHeaderSelectPopover.vue 2021-04-02 16:29:16 +08:00
chenjianxing 21fb80adf6 refactor: 全选按钮颜色高亮 2021-04-02 16:29:16 +08:00
BugKing 2c5ccaef5d style: 修改文本框及测试跟踪用例步骤样式 2021-04-02 15:57:21 +08:00
BugKing b3d3955c5f style: 修改文本框及测试跟踪用例步骤样式 2021-04-02 15:52:55 +08:00
BugKing b5ffd3ffd0 style: 修改文本框及测试跟踪用例步骤样式 2021-04-02 15:52:30 +08:00
shiziyuan9527 9893021aeb fix(测试计划): 修复批量执行接口用例失败的问题 2021-04-02 15:51:33 +08:00
shiziyuan9527 66a962fddc fix(测试计划): 修复批量执行接口用例失败的问题 2021-04-02 15:51:00 +08:00
shiziyuan9527 5c3f79d6ed fix(测试计划): 修复批量执行接口用例失败的问题 2021-04-02 15:50:29 +08:00
shiziyuan9527 5240ed1c7c fix(用例评审): 修改提示 2021-04-02 12:43:52 +08:00
shiziyuan9527 30bc20c381 fix(用例评审): 修改提示 2021-04-02 12:37:29 +08:00
shiziyuan9527 593db1ca24 fix(用例评审): 修改提示 2021-04-02 12:37:14 +08:00
Captain.B 1bd3e87503 fix(项目文件更新): 修复项目文件更新时地址多了一个/ 2021-04-02 12:30:46 +08:00
Captain.B 50212d1645 fix(项目文件更新): 修复项目文件更新时地址多了一个/ 2021-04-02 12:17:56 +08:00
Captain.B 4d81b0fafe fix(项目文件更新): 修复项目文件更新时地址多了一个/ 2021-04-02 12:13:46 +08:00
shiziyuan9527 9021e0b75a fix(场景自动化): 项目ID设置问题 2021-04-01 22:33:03 +08:00
shiziyuan9527 6ead6afb92 fix(场景自动化): 优化运行环境 2021-04-01 22:33:03 +08:00
song-tianyang c4b5ee9101 fix: 修复api文档下滑时不会动态加载接口信息的bug 
修复api文档下滑时不会动态加载接口信息的bug
 2021-04-01 22:33:03 +08:00
metersphere-bot d63ea666cc fix: 接口用例添加步骤没反应 (#1810) 2021-04-01 22:33:03 +08:00
fit2-zhao ee60743925 fix(测试跟踪): 修复创建用例默认没有选择模块问题 2021-04-01 22:33:03 +08:00
fit2-zhao 30f8cda21e fix(接口自动化): 增加场景局部刷新功能 2021-04-01 22:33:03 +08:00
metersphere-bot b92369f3ab fix: 先点模块再点脑图，评审脑图不是对应模块的脑图 (#1790) 
* fix: 解决冲突

* refactor: 用例评审点击模块展示对应脑图

* refactor: 测试计划用例点击模块展示对应脑图

* fix: 先点模块再点脑图，评审脑图不是对应模块的脑图

* fix: 动态更新模块树

* refactor: 代码规范

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
Co-authored-by: BugKing <wangzhen@fit2cloud.com>
 2021-04-01 22:33:03 +08:00
fit2-zhao 9759d4feb3 fix(接口自动化): 场景变量国际化修改 2021-04-01 22:33:03 +08:00
wenyann 3ce3bc88f0 fix(测试评审tags、测试计划tags): 修复测试评审测试计划标签的bug 2021-04-01 22:33:03 +08:00
wenyann c93c602cf1 fix(测试评审tags、测试计划tags): 修复测试评审测试计划标签的bug 2021-04-01 22:33:03 +08:00
wenyann 28d3f93861 fix:加大case review中comment的长度限制 2021-04-01 22:33:03 +08:00
song-tianyang bb5ddf18f5 更新接口覆盖率的统计公示 2021-04-01 22:33:03 +08:00
shiziyuan9527 0a8d04bd38 fix(场景自动化): 项目ID设置问题 2021-04-01 20:41:39 +08:00
shiziyuan9527 3f779d7837 fix(场景自动化): 项目ID设置问题 2021-04-01 20:41:30 +08:00
shiziyuan9527 40f99ad65a fix(场景自动化): 优化运行环境 2021-04-01 20:05:03 +08:00
shiziyuan9527 e043e920cc fix(场景自动化): 优化运行环境 2021-04-01 19:59:54 +08:00
song-tianyang 780fabfa52 fix: 修复api文档下滑时不会动态加载接口信息的bug 
修复api文档下滑时不会动态加载接口信息的bug
 2021-04-01 19:56:45 +08:00
song-tianyang 22fd1fa93e fix: 修复api文档下滑时不会动态加载接口信息的bug 
修复api文档下滑时不会动态加载接口信息的bug
 2021-04-01 19:56:15 +08:00
fit2-zhao d898a951b7 fix(测试跟踪): 修复创建用例默认没有选择模块问题 2021-04-01 19:28:24 +08:00
fit2-zhao 046c9d70be fix(接口自动化): 增加场景局部刷新功能 2021-04-01 19:28:24 +08:00
metersphere-bot 3db60678b8
fix: 接口用例添加步骤没反应 (#1810) 2021-04-01 19:21:17 +08:00
fit2-zhao c201ec94ab fix(测试跟踪): 修复创建用例默认没有选择模块问题 2021-04-01 19:15:36 +08:00
fit2-zhao 31040c0107 fix(接口自动化): 增加场景局部刷新功能 2021-04-01 19:15:36 +08:00
metersphere-bot 4965645549
fix: 先点模块再点脑图，评审脑图不是对应模块的脑图 (#1790) 
* fix: 解决冲突

* refactor: 用例评审点击模块展示对应脑图

* refactor: 测试计划用例点击模块展示对应脑图

* fix: 先点模块再点脑图，评审脑图不是对应模块的脑图

* fix: 动态更新模块树

* refactor: 代码规范

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
Co-authored-by: BugKing <wangzhen@fit2cloud.com>
 2021-04-01 18:09:23 +08:00
fit2-zhao 8e130ec693 fix(接口自动化): 场景变量国际化修改 2021-04-01 17:17:48 +08:00
fit2-zhao 91ae9480b8 fix(接口自动化): 场景变量国际化修改 2021-04-01 17:04:22 +08:00
wenyann b503122a8a fix(测试评审tags、测试计划tags): 修复测试评审测试计划标签的bug 2021-04-01 15:59:46 +08:00
wenyann a04e13cb8b fix(测试评审tags、测试计划tags): 修复测试评审测试计划标签的bug 2021-04-01 15:59:46 +08:00
wenyann c61563d344 fix:加大case review中comment的长度限制 2021-04-01 15:59:46 +08:00
song-tianyang 01bde26454 更新接口覆盖率的统计公示 2021-04-01 15:28:05 +08:00
song-tianyang 40d53607d0 更新接口覆盖率的统计公示 2021-04-01 15:27:48 +08:00
Captain.B 51b6ea2850 fix(项目文件更新): 修复项目文件更新时不能上传同名文件 2021-04-01 14:07:16 +08:00
Captain.B f7e0c65074 refactor(性能测试): 测试报告统计展示median，字段名字更新 2021-04-01 14:07:16 +08:00
Captain.B 639d163e0e refactor(性能测试): 测试报告统计展示median，字段名字更新 2021-04-01 14:07:16 +08:00
Captain.B 0131d959f2 fix(项目文件更新): 修复项目文件更新时不能上传同名文件 2021-04-01 13:46:37 +08:00
fit2-zhao 97df3b83aa fix(接口自动化): 限制只有自定义请求可以另存新接口 2021-04-01 13:46:37 +08:00
Captain.B 30f80ed88c refactor(性能测试): 测试报告统计展示median，字段名字更新 2021-04-01 13:46:37 +08:00
Captain.B 4a6f25b84c refactor(性能测试): 测试报告统计展示median，字段名字更新 2021-04-01 13:46:37 +08:00
fit2-zhao fc13f0dc36 fix(接口自动化): 限制只有自定义请求可以另存新接口 2021-04-01 13:43:24 +08:00
Captain.B b659206b0e fix(项目文件更新): 修复项目文件更新时不能上传同名文件 2021-04-01 13:42:55 +08:00
fit2-zhao 113cb8e93f fix(接口自动化): 限制只有自定义请求可以另存新接口 2021-04-01 11:53:28 +08:00
Captain.B f9f42d0b64 refactor(性能测试): 测试报告统计展示median，字段名字更新 2021-04-01 03:42:46 +00:00
Captain.B 010b8185c8 refactor(性能测试): 测试报告统计展示median，字段名字更新 2021-04-01 03:33:28 +00:00
Captain.B a2f7c694ca Merge remote-tracking branch 'origin/master' 2021-03-31 19:10:20 +08:00
Captain.B f5c82748af Merge branch 'v1.8' 2021-03-31 19:09:00 +08:00
song-tianyang 22463ee6bb Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-31 18:27:50 +08:00
shiziyuan9527 9aada64a39 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 18:11:56 +08:00
shiziyuan9527 e3848b81f4 fix(接口定义): 批量执行问题 2021-03-31 18:11:45 +08:00
song-tianyang d88c97e81f fix: 修复接口定义页面在接口列表点击运行时tab标签命名错误的问题 
修复接口定义页面在接口列表点击运行时tab标签命名错误的问题
 2021-03-31 18:09:20 +08:00
Ambitiousliga 7181f6b899
fix(系统设置):使项目管理中配置数据库信息时可以校验连接 (#1769) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-31 17:48:05 +08:00
chenjianxing 9107a21d74 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 17:26:18 +08:00
chenjianxing b68a0a4586 fix: 导入接口没有带模块 2021-03-31 17:26:05 +08:00
song-tianyang ca11ff4bc1 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-31 17:04:07 +08:00
chenjianxing b1a3dd3473 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 16:50:22 +08:00
chenjianxing b2b83a57f5 fix: 接口定义无法选择模块 2021-03-31 16:50:04 +08:00
song-tianyang 2fd563f670 Merge branch 'v1.8' of http://github.com/metersphere/metersphere into v1.8 2021-03-31 16:44:45 +08:00
song.tianyang 5b3df1ab15 fix: 优化接口覆盖率的loading方式：改为图标 
优化接口覆盖率的loading方式：改为图标
 2021-03-31 16:13:16 +08:00
song.tianyang 7cc2737a5f fix: 优化excel模板导入，模块字数超标的提示 
优化excel模板导入，模块字数超标的提示
 2021-03-31 15:58:50 +08:00
wenyann f4a745ca81 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-31 15:34:46 +08:00
wenyann ace4c51f0c fix:用例步骤颜色加深 2021-03-31 15:08:41 +08:00
fit2-zhao f768f9aac8 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 15:04:23 +08:00
fit2-zhao cb1ba0e0aa style(接口定义): 通用下拉树 节点内容过长显示不全优化 2021-03-31 15:04:09 +08:00
Captain.B bfe011abc7 Merge branch 'v1.8' 2021-03-31 15:00:09 +08:00
song.tianyang c45e601994 fix: 接口测试首页增加"接口覆盖率统计" 
接口测试首页增加"接口覆盖率统计"
 2021-03-31 14:43:59 +08:00
fit2-zhao b918df0e15 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 14:33:11 +08:00
fit2-zhao 2279c17d73 fix(接口自动化): 修改转场景测试名称 2021-03-31 14:33:04 +08:00
chenjianxing 5dd39b60e5 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-31 13:44:02 +08:00
chenjianxing d55bbc6dd8 fix: 接口导出没有带路径 2021-03-31 13:43:43 +08:00
fit2-zhao 0cb2188cd2 fix(接口自动化): 恢复xpack 2021-03-31 13:24:50 +08:00
Captain.B 201027d432 Merge branch 'v1.8' 2021-03-31 13:24:02 +08:00
Captain.B 4045f5546f chore: sync 2021-03-31 13:23:26 +08:00
fit2-zhao d62391e6ca fix(接口自动化): 注释全路径校验 2021-03-31 13:20:53 +08:00
fit2-zhao ed3e076a01 fix(接口自动化): 放开全路径校验 2021-03-31 13:17:05 +08:00
fit2-zhao e092a7a130 fix(接口自动化): 放开全路径校验 2021-03-31 13:03:33 +08:00
fit2-zhao 1221bb8d66 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-31 13:00:04 +08:00
fit2-zhao 4811432acc fix(接口自动化): 修复csv 分隔符不能编辑问题 2021-03-31 12:59:48 +08:00
Captain.B 6d857da2f4 Merge branch 'v1.8' 2021-03-31 12:24:54 +08:00
Captain.B 8c7e941ee4 chore: sync 2021-03-31 12:24:38 +08:00
Captain.B 8d90e427a9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-31 12:22:33 +08:00
Captain.B 71c512174d fix(性能测试): 修复上传测试文件偶尔会传多个的bug 2021-03-31 12:22:14 +08:00
shiziyuan9527 a21c611d35 fix(场景自动化): 运行环境显示问题 2021-03-31 12:12:13 +08:00
fit2-zhao b20a870581 fix(接口自动化): 修复jsonPathAssrtion 5.2 版本升级后问题 2021-03-31 11:25:17 +08:00
Captain.B 13386da0af Merge branch 'v1.8' into master 2021-03-31 08:17:27 +08:00
Captain.B c1f00d8257 fix: 尝试修复表格固定列之后错乱的问题 2021-03-31 08:17:00 +08:00
Captain.B bdc0127207 chore: sync 2021-03-30 22:07:53 +08:00
fit2-zhao db11b495d0 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 19:54:35 +08:00
fit2-zhao 5d78d51091 fix(接口自动化): 检查场景步骤是否都是全路径 2021-03-30 19:54:18 +08:00
Captain.B 5cc4e709fe Merge branch 'v1.8' 2021-03-30 19:22:50 +08:00
Captain.B 1a858c619d fix: 尝试修复表格固定列之后错乱的问题 2021-03-30 19:20:39 +08:00
Captain.B 6d8873ca5c Merge branch 'v1.8' 2021-03-30 19:15:04 +08:00
Captain.B 9257eb55cc chore: sync 2021-03-30 19:14:50 +08:00
Captain.B 75fb21ca4b Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 19:14:07 +08:00
Captain.B 10a24e60a5 fix: 尝试修复表格固定列之后错乱的问题 2021-03-30 19:13:44 +08:00
Captain.B 058ff22195 Merge branch 'v1.8' 2021-03-30 18:33:56 +08:00
fit2-zhao c23a31400e Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 18:32:39 +08:00
Captain.B 5a205b9c1f fix(性能测试): 修复最大并发数没有按照资源池来限制的bug 2021-03-30 18:31:56 +08:00
fit2-zhao 5ed35abe59 fix(接口定义): 修复环境地址不是标准域名问题 2021-03-30 18:31:33 +08:00
song.tianyang cb9bbe26ea fix: 接口定义列表错位方法优化代码回退 
接口定义列表错位方法优化代码回退
 2021-03-30 17:39:22 +08:00
song.tianyang 812735696a Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 17:29:27 +08:00
fit2-zhao 78b06d18ee Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 17:28:06 +08:00
fit2-zhao 233cceec73 fix(场景自动化): 删除单个场景问题修复 2021-03-30 17:27:43 +08:00
Captain.B 5dbafb8770 Merge branch 'v1.8' 2021-03-30 17:27:15 +08:00
Captain.B 43f6bc09dd chore: sync 2021-03-30 17:23:02 +08:00
song.tianyang e63a56257c Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 17:16:49 +08:00
song.tianyang 71f883a377 fix: 解决接口定义点击api/case/文档不变色的问题;更新1.8的frontend-xpack版本号 
解决接口定义点击api/case/文档不变色的问题;更新1.8的frontend-xpack版本号
 2021-03-30 17:14:38 +08:00
fit2-zhao 63d1e2e640 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 17:05:16 +08:00
fit2-zhao 3243e5fb68 fix(场景自动化): 修复场景名称过长显示问题 2021-03-30 17:04:33 +08:00
chenjianxing af3d54b82f refactor: jsonpath推荐关闭按钮优化 2021-03-30 16:59:45 +08:00
chenjianxing 01480fc6f2 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-30 16:42:06 +08:00
song.tianyang 60136a3e02 fix: ESB导入增加xpack判断，ESB导入模板去掉"是否必填"列，ESB请求参数去掉"是否必填"列 
ESB导入增加xpack判断，ESB导入模板去掉"是否必填"列，ESB请求参数去掉"是否必填"列
 2021-03-30 16:33:45 +08:00
song.tianyang cc99108e28 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-30 16:29:10 +08:00
Ambitiousliga ab98740321 fix(测试跟踪):使只读用户不能删除测试计划报告 (#1758) 
Co-authored-by: 黎龙鑫 <lilongxinya@163.com>
 2021-03-30 16:20:22 +08:00
fit2-zhao 6db8a133de fix(接口自动化): 修复端口是变量的问题 2021-03-30 15:52:25 +08:00
Captain.B 7185961ad2 Merge branch 'v1.8' 2021-03-30 15:43:52 +08:00
fit2-zhao 22b63d03df Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:35:39 +08:00
fit2-zhao 81645d4387 fix(接口自动化): 选中模块创建数据，默认放到当前选择的模块下 2021-03-30 15:35:11 +08:00
Captain.B 3a11fd16eb chore: sync 2021-03-30 15:31:27 +08:00
fit2-zhao a05d1a773a fix(测试用例，接口定义，接口自动化): 默认添加的模块，不能编辑也不能删除。 2021-03-30 15:20:34 +08:00
fit2-zhao 015c665bcf Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 15:03:46 +08:00
fit2-zhao cff32b828c fix(测试用例，接口定义，接口自动化): 增加默认模块，默认创建用例都放到默认模块下 2021-03-30 15:03:31 +08:00
Captain.B 575cc7dbed Merge branch 'v1.8' 2021-03-30 14:53:13 +08:00
Captain.B 0f1676166c fix: 修复文件名过短导致场景无法引入，文件重复弹框提示优化 2021-03-30 14:52:34 +08:00
Captain.B 6bc2601bc7 Merge branch 'v1.8' 2021-03-30 14:11:52 +08:00
fit2-zhao c84d1e8535 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-30 13:55:37 +08:00
fit2-zhao 6303bcb42e fix(测试用例，接口定义，接口自动化): 增加默认模块，默认创建用例都放到默认模块下 2021-03-30 13:55:32 +08:00
Captain.B b67a6fafe2 Merge branch 'v1.8' 2021-03-30 12:59:33 +08:00
Captain.B 2b32f119a0 chore: sync 2021-03-30 12:58:52 +08:00
fit2-zhao 4f4aa6f5d2 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
 2021-03-30 11:50:34 +08:00
fit2-zhao e0182038b9 fix(接口定义): 修改默认模块 2021-03-30 11:46:22 +08:00
song.tianyang 33e0207d84 fix(推荐断言弹框可以点击空白关闭): 推荐断言弹框可以点击空白关闭 2021-03-30 11:44:35 +08:00
Captain.B f18f2f2559 Merge branch 'v1.8' 2021-03-30 10:28:23 +08:00
Captain.B f2a6341b4c fix: 修复文件加载时文件名重复没有显示文件名的bug 2021-03-30 10:27:04 +08:00
Captain.B 391a2924c8 chore: sync 2021-03-30 10:04:58 +08:00
Captain.B 0cfd281d07 feat(性能测试): 限制普通线程组的预热时间最大值不能超多压测时长 2021-03-30 10:04:20 +08:00
shiziyuan9527 47120c97cb refactor(场景自动化): 回退运行环境配置 2021-03-29 22:41:29 +08:00
fit2-zhao 61f7a82371 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-29 19:34:31 +08:00
chenjianxing c832bbed3e Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-29 18:51:58 +08:00
fit2-zhao 09c027a79c fix(场景自动化): 修复最大化切换数据展示问题 2021-03-29 18:38:06 +08:00
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