Commit Graph

3261 Commits

Author SHA1 Message Date
wenyann 2d609fded2 Merge remote-tracking branch 'origin/master' 2021-01-05 17:37:13 +08:00
wenyann 1a43a1605a fix: 更换jenkins查询测试计划接口 2021-01-05 17:32:28 +08:00
chenjianxing 2a605a77c0 refactor: 去掉测试接口用例添加到测试计划按钮 2021-01-05 16:21:13 +08:00
chenjianxing e8afbf3cb5 refactor: 全选框样式优化 2021-01-05 16:00:25 +08:00
chenjianxing 606a8fb38e fix: 关联用例小屏适配 2021-01-05 16:00:11 +08:00
chenjianxing 1f51cb63e0 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-05 15:40:33 +08:00
chenjianxing 37acc581f2 refactor: 全选框样式优化 2021-01-05 15:40:02 +08:00
fit2-zhao b65c79424b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-05 15:34:31 +08:00
chenjianxing c39e71b626 fix: 关联用例小屏适配 2021-01-05 15:22:21 +08:00
chenjianxing 6e7560cf6a Merge branch 'v1.6' 2021-01-05 15:11:53 +08:00
fit2-zhao 25caf3c48e fix(接口定义): url 规范问题修改 2021-01-05 14:43:02 +08:00
shiziyuan9527 b824302acf feat(测试计划): 接口测试用例页面添加ID列 2021-01-05 14:27:47 +08:00
fit2-zhao 1e6b252d12 feat(接口定义): 增加批量修改用例信息功能 2021-01-05 14:23:13 +08:00
wenyann d984b2f08a Merge remote-tracking branch 'origin/master' 2021-01-05 14:21:01 +08:00
wenyann 5aa46f6656 feat: 添加邮件测试 2021-01-05 14:20:32 +08:00
chenjianxing af8b6e4ae0 fix: 测试计划自报告自定义表格样式问题 2021-01-05 13:44:55 +08:00
Captain.B 9fc151f6e2 chore: Sync 2021-01-05 12:59:03 +08:00
fit2-zhao 554af29606 refactor(接口定义): 增加JSON-SCHEMA开关 2021-01-05 12:46:07 +08:00
fit2-zhao 02c99498e7 refactor(接口定义): 规范JSON控件的i18n 2021-01-05 10:08:45 +08:00
chenjianxing 6b076416fb fix: 旧版复制请求,文件上传参数同步修改问题 2021-01-05 10:05:17 +08:00
fit2-zhao 4fb1a6319a Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2021-01-05 09:34:02 +08:00
chenjianxing 24e89b5b3c refactor: 测试计划关联页面优化 2021-01-04 19:46:48 +08:00
chenjianxing e7d489a469 fix: python脚本无法使用 2021-01-04 19:15:16 +08:00
fit2-zhao cd44e90808 feat(接口定义): 完成json编辑器 2021-01-04 19:05:31 +08:00
chenjianxing 29cc8caff3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-04 18:05:50 +08:00
chenjianxing 1fede9b66b refactor: 封装全选组件 2021-01-04 15:56:31 +08:00
shiziyuan9527 ad597dcd79 fix: 修复菜单组件会重复监听事件的问题 2021-01-04 15:44:38 +08:00
wenyann b9b95d63d8 feat: 删除按钮增加确认弹框 2021-01-04 14:13:11 +08:00
song.tianyang b0f9723dd4 refactor: 接口用例、用例列表、场景用例列表增加创建性能测试的功能
接口用例、用例列表、场景用例列表增加创建性能测试的功能  原来是跳转之后后台直接创建,现在跳转到创建页面
2021-01-04 12:39:19 +08:00
chenjianxing 170c358d72 refactor: 分页改为10条 2021-01-04 11:51:56 +08:00
song.tianyang 8e5105d579 feat: 接口用例、用例列表、场景用例列表增加创建性能测试的功能
接口用例、用例列表、场景用例列表增加创建性能测试的功能
2021-01-04 11:28:17 +08:00
fit2-zhao 9c4e5bfbdb fix(接口自动化): json 处理 2020-12-31 18:49:23 +08:00
chenjianxing 1ed90fdd63 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 16:40:17 +08:00
chenjianxing 12436d51b5 refator: 样式优化 2020-12-31 16:40:02 +08:00
fit2-zhao d29c8bf2a2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 16:22:09 +08:00
fit2-zhao a2e2994dbc fix(接口自动化): 预览 2020-12-31 16:00:23 +08:00
Captain.B 3801ab6bb5 Merge branch 'v1.6' 2020-12-31 15:49:38 +08:00
fit2-zhao 221f0e2048 fix(接口自动化): 修复sql类型显示问题 2020-12-31 15:41:07 +08:00
chenjianxing b9848e452c fix: 导入接口重复替换,删除测试计划删除关联的接口用例 2020-12-31 15:40:00 +08:00
song.tianyang 0548e2361b Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-31 15:31:58 +08:00
song.tianyang cd14c9667d fix: 接口定义-案例列表-批量修改时显示总条数错我
修复接口定义-案例列表-批量修改时显示总条数错误的问题
2020-12-31 15:27:55 +08:00
fit2-zhao 4b5e4bbea9 fix(接口自动化): 修改转换方法 2020-12-31 15:03:44 +08:00
fit2-zhao 199327be75 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 15:02:37 +08:00
BugKing a19e3521e2 Merge branch 'master' into v1.6 2020-12-31 14:32:32 +08:00
chenjianxing d4fd50b274 refactor: 测试用例名称长度增大 2020-12-31 14:06:20 +08:00
fit2-zhao 75bb894228 fix(接口自动化): 存储JSON-SCHEMA 2020-12-31 13:48:47 +08:00
chenjianxing 69414cae58 fix:导出json路径为空是,模块显示id 2020-12-31 11:22:51 +08:00
chenjianxing ab495f21f4 fix: swagger 3 堆栈溢出 2020-12-31 10:48:01 +08:00
fit2-zhao d3cd2f4843 fix(接口自动化): 修复执行类型为空时错误 2020-12-31 10:44:20 +08:00
fit2-zhao f9746619f2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-31 09:57:49 +08:00
fit2-zhao 1d908479e5 feat(接口定义): 添加JSON编辑器,处理导入JSON数据 2020-12-31 09:57:37 +08:00
chenjianxing 3f80c98d76 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 22:00:23 +08:00
chenjianxing aed55a9709 refactor: 支持swagger 3.0 2020-12-30 22:00:00 +08:00
shiziyuan9527 03135592b0 refactor: 测试计划所属项目名显示问题 2020-12-30 18:59:24 +08:00
shiziyuan9527 987ab3b395 fix(测试跟踪): 修复测试跟踪首页数据查询问题 2020-12-30 18:50:06 +08:00
shiziyuan9527 6ba32fbda9 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 18:16:18 +08:00
shiziyuan9527 1631803bbd refactor(测试计划): 测试计划优化 2020-12-30 18:15:07 +08:00
song.tianyang c8ceae2845 refactor: 创建接口、场景模块为空下拉框优化
创建接口、场景模块为空时,下拉框增加"去添加"的按钮,点击即可增加
2020-12-30 16:53:18 +08:00
fit2-zhao 0a85155932 fix(接口自动化): JSON-SCHEMA 编辑器添加 2020-12-30 16:48:16 +08:00
song.tianyang d32000e0bd feat: 接口定义-案例表格增加全部数据批量操作支持
接口定义-案例表格增加全部数据批量操作支持
2020-12-30 14:42:48 +08:00
fit2-zhao 4b975918e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-30 11:27:22 +08:00
fit2-zhao 22fee64092 fix(接口自动化): 增加json 列表编辑器 2020-12-30 11:03:59 +08:00
Captain.B 4cf7c06f07 refactor: k8s 环境指定namespace 2020-12-30 10:34:17 +08:00
song.tianyang 9be10ec291 refactor: 处理上次提交合并冲突时未删除的代码块
处理上次提交合并冲突时未删除的代码块
2020-12-29 18:00:03 +08:00
song.tianyang 7cc9f8c01d Merge remote-tracking branch 'origin/v1.6' into v1.6
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
2020-12-29 17:46:22 +08:00
song.tianyang f2908ac330 feat: 接口定义页面增加"选择所有数据"操作
接口定义页增加"选择所有数据"功能,用于批量修改、批量删除
2020-12-29 17:41:35 +08:00
chenjianxing af61afde13 refactor: 测试计划关联按钮样式 2020-12-29 17:06:16 +08:00
chenjianxing 62ac695a0b refactor: 测试计划关联列表只列出有未关联用例的接口 2020-12-29 16:43:29 +08:00
chenjianxing 2ff0726965 fix: 解决冲突 2020-12-29 15:39:51 +08:00
chenjianxing 9ce507d201 refactor: 测试计划获取关联接口列表 2020-12-29 15:32:57 +08:00
Captain.B f11e0af0bf Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:22:47 +08:00
Captain.B 5cc8399e15 fix: 修改 statistics 显示 2020-12-29 15:22:28 +08:00
shiziyuan9527 3b50e38f04 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-29 15:20:57 +08:00
shiziyuan9527 213a7db8fd fix(测试计划): 查询缺陷失败时捕获异常 2020-12-29 15:18:42 +08:00
song.tianyang fbc19a6f32 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:18:05 +08:00
song.tianyang 669cfd168b feat: 增加"选择所有数据"功能
接口自动化页面、测试报告页面,增加"选择所有数据"功能,用于批量操作
2020-12-29 15:17:43 +08:00
fit2-zhao 88a633237f fix(接口定义): 用例运行环境更换位置 2020-12-29 14:40:09 +08:00
fit2-zhao 68e58a9b1b feat(接口定义): JSON 模版初版 2020-12-29 14:37:22 +08:00
chenjianxing 8d8292227f refactor: 代码优化 2020-12-29 14:15:58 +08:00
chenjianxing daa8f3821e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-29 11:05:25 +08:00
chenjianxing df1ebcdb96 refactor: 场景编辑页面优化 2020-12-29 11:05:06 +08:00
Captain.B 1f611e3f5c Merge branch 'v1.6' 2020-12-29 11:03:58 +08:00
fit2-zhao 16163203d9 Merge branch 'v1.6' 2020-12-29 10:18:31 +08:00
fit2-zhao f5ea7d25b9 fix(接口自动化): 执行场景非变量的参数不做处理 2020-12-28 19:36:58 +08:00
chenjianxing 8f7a32698f Merge branch 'v1.6' 2020-12-28 17:46:30 +08:00
Captain.B 5d9da617be Merge branch 'v1.6' 2020-12-28 16:52:50 +08:00
fit2-zhao bee13b6b94 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 16:14:16 +08:00
fit2-zhao fbeb1ded75 fix(接口自动化): 修复执行单个步骤无公共参数问题 2020-12-28 16:12:55 +08:00
chenjianxing 883fff3808 全局左右拖拽组件 2020-12-28 16:04:52 +08:00
shiziyuan9527 be1779c546 refactor(性能测试): 修改性能测试执行页面文本描述
Closes #939
2020-12-28 15:06:40 +08:00
chenjianxing 8e1d3a3da7 fix: 更新提交 2020-12-28 14:44:46 +08:00
Captain.B 271275f4bd chore: Sync 2020-12-28 14:25:07 +08:00
chenjianxing 85b90f3226 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 14:20:51 +08:00
chenjianxing f323e737e1 fix: 性能测试列表为空 2020-12-28 14:20:26 +08:00
chenjianxing 5f1adb6d34 fix: 性能测试列表为空 2020-12-28 14:19:49 +08:00
Captain.B 6ee91faf9e Merge remote-tracking branch 'origin/master' 2020-12-28 14:14:28 +08:00
Captain.B 6dfda405ec Revert "refactor: 用户首次登录后跳转到跟踪页面"
回退提交,如果用户没有权限会陷入死循环

This reverts commit 84208e12
2020-12-28 14:13:31 +08:00
Guan 0163e8673e
refactor(接口测试):接口测试列表宽度改为可拖拽 (#914) 2020-12-28 13:54:52 +08:00
Captain.B 0a72802884 fix(性能测试): 测试文件大小用kb计算
Closes #852
2020-12-28 13:43:40 +08:00
Captain.B 84208e1230 refactor: 用户首次登录后跳转到跟踪页面
Closes #96
2020-12-28 11:19:32 +08:00
Captain.B dd5b0d9cab chore: Sync 2020-12-28 10:50:01 +08:00
chenjianxing 007ede7069 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-28 10:43:31 +08:00
chenjianxing 08b75e5ddb 解决${}变量请求体格式化问题 2020-12-28 10:43:03 +08:00
shiziyuan9527 e6f5b717b4 feat(接口): 接口相关列表添加ID列 2020-12-25 21:52:52 +08:00
chenjianxing 7f52b22864 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 18:23:19 +08:00
chenjianxing 1c5f83a1b3 refactor: 导出带模块,导入自动生成模块 2020-12-25 18:22:55 +08:00
fit2-zhao 76b3624aac Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 18:00:30 +08:00
fit2-zhao ee27fa0c5e fix(接口自动化): 模块同级别排序 2020-12-25 18:00:05 +08:00
fit2-zhao 1e180af32d feat(接口测试): 添加控制台 2020-12-25 16:42:41 +08:00
Captain.B fa5a693d1f refactor: 去掉 $$get 方法 2020-12-25 15:40:28 +08:00
Captain.B f33b3b5343 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-25 14:43:43 +08:00
Captain.B ad550fcab8 fix: 只读用户不能删除报告 2020-12-25 14:42:18 +08:00
chenjianxing 9d2d4a8427 refactor: 测试计划详情页面出现滚动条 2020-12-25 14:33:30 +08:00
Captain.B 6e3139d24f chore: Sync 2020-12-25 13:31:00 +08:00
chenjianxing cd3e68ab4d refactor: 接口导入到选中模块 2020-12-25 12:07:06 +08:00
chenjianxing a09c4e3b04 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 11:18:12 +08:00
chenjianxing a923a5b55e fix: 没选项目报错 2020-12-25 11:17:59 +08:00
fit2-zhao 68ad16412d Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-25 11:16:51 +08:00
fit2-zhao 312b028ade fix(接口自动化): 修复导入接口列表内容查询问题 2020-12-25 11:16:35 +08:00
song.tianyang 79ef041153 fix: 接口测试,定时任务数量统计,统计了手动执行的次数
修复接口测试,定时任务数量统计,统计了手动执行的次数的问题
2020-12-25 11:08:44 +08:00
fit2-zhao caa7a5d4d7 fix(接口自动化): 添加断言规则,修复执行报告缺陷 2020-12-25 10:35:50 +08:00
fit2-zhao 8d378c163d fix(接口自动化): 批量执行优化 2020-12-24 19:01:44 +08:00
fit2-zhao f9d3e9be95 fix(接口自动化): 修复引用状态问题 2020-12-24 18:51:52 +08:00
fit2-zhao 2ec31650d0 fix(接口自动化): 修复选择权限问题 2020-12-24 18:43:31 +08:00
chenjianxing 0e876bdc22 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 18:21:59 +08:00
chenjianxing 479b4e3a25 refactor: 模块🌲添加节点优化 2020-12-24 18:21:43 +08:00
fit2-zhao 84633c80e5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 18:15:46 +08:00
fit2-zhao 4e8deba17b fix(接口自动化): 报告优化 2020-12-24 18:15:28 +08:00
Captain.B 6b01aaa878 chore: Sync 2020-12-24 18:15:03 +08:00
fit2-zhao ea5ff734b6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 17:36:14 +08:00
fit2-zhao c36952b0ba fix(接口自动化): 执行结果重构 2020-12-24 17:35:57 +08:00
chenjianxing 9bc45b83dd refactor: 用例列表添加路径排序 2020-12-24 15:52:03 +08:00
chenjianxing bc585eeca4 fix: 接口定义导出问题 2020-12-24 15:42:35 +08:00
chenjianxing d925e9cbac refactor: 按钮样式 2020-12-24 15:20:12 +08:00
chenjianxing bcbcfebe61 Merge branch 'master' of https://github.com/metersphere/metersphere into v1.6 2020-12-24 15:06:41 +08:00
chenjianxing d35d7de2ac refactor: 场景按钮样式调整 2020-12-24 15:06:30 +08:00
fit2-zhao f15f738ad2 fix(接口自动化): 修复报告保存问题 2020-12-24 15:04:54 +08:00
fit2-zhao 9aa9a3bbf5 feat(接口自动化): 添加 v-tester 权限控制 2020-12-24 14:56:59 +08:00
Captain.B 59d43f73bf chore: Sync 2020-12-24 14:44:46 +08:00
fit2-zhao 55194beabf fix(接口自动化): 修复导出问题 2020-12-24 14:31:47 +08:00
chenjianxing ecdf6ac23f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 14:27:47 +08:00
Captain.B e929c0f6a9 Merge branch 'master' of github.com:metersphere/metersphere 2020-12-24 14:24:58 +08:00
chenjianxing 1035b9f9ec Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 14:20:23 +08:00
chenjianxing 92e1411289 fix: 接口场景导入名称修改 2020-12-24 14:20:14 +08:00
song.tianyang 9253d25b5d Merge remote-tracking branch 'origin/master' 2020-12-24 14:15:17 +08:00
song.tianyang f09cc98b67 style: 首页tips超链接颜色是紫色
修复首页tips超链接颜色是紫色的问题,并只针对地址做了超链接
2020-12-24 14:14:51 +08:00
chenjianxing e522ab0034 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 14:12:32 +08:00
chenjianxing f98dc1a001 refactor: 测试计划报告创建优化 2020-12-24 14:10:52 +08:00
Captain.B b339a69de3 chore: Sync 2020-12-24 14:09:13 +08:00
Captain.B d7827ccc7b Merge branch 'master' of github.com:metersphere/metersphere
 Conflicts:
	frontend/src/business/components/api/definition/components/list/ApiList.vue
2020-12-24 14:08:44 +08:00
Captain.B cc62a7a1b1 Merge branch 'v1.6' 2020-12-24 14:00:08 +08:00
fit2-zhao 4309a300d6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 13:58:40 +08:00
fit2-zhao fb4d232be4 fix(接口自动化): 修改执行结果报告 2020-12-24 13:58:20 +08:00
Captain.B 838927a321 refactor: 增加一个 v-tester 指令,当用户只有当前工作空间的只读权限的时候隐藏操作按钮 2020-12-24 13:57:37 +08:00
q4speed 55a80bda95 Merge remote-tracking branch 'origin/master' 2020-12-24 13:53:40 +08:00
q4speed 57caae9a2f refactor(接口自动化): FAB按钮点击空白不再自动关闭。 2020-12-24 13:53:28 +08:00
wenyann 89a8643c4d fix: 模版修改 2020-12-24 13:47:48 +08:00
chenjianxing 24b30a73fa refactor: 去掉旧版查看报告按钮 2020-12-24 13:14:50 +08:00
chenjianxing 2415f16200 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 13:00:38 +08:00
chenjianxing d430e509dc refacotr: 场景引用列表优化 2020-12-24 12:59:48 +08:00
Captain.B ed68556937 Merge remote-tracking branch 'origin/master' 2020-12-24 12:45:34 +08:00
Captain.B 025a5c5638 fix: 设置测试参数-执行测试后报告页并发数显示默认值 2020-12-24 12:44:13 +08:00
fit2-zhao caa36951cc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 12:17:45 +08:00
fit2-zhao be6d3e9e66 refactor(接口自动化): 重构场景加入到测试计划方法 2020-12-24 12:17:27 +08:00
q4speed 79d38eb9d8 refactor(接口自动化): 合并代码 2020-12-24 12:09:18 +08:00
q4speed 8c2a2621e8 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
2020-12-24 11:55:51 +08:00
q4speed 611b1e3c97 refactor(接口自动化): 修改页面布局和FAB按钮位置 2020-12-24 11:45:15 +08:00
chenjianxing 54247fc15c fix: 用例列表无法删除用例 2020-12-24 11:40:41 +08:00
chenjianxing 0de9d0a073 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-24 11:37:28 +08:00
chenjianxing e4dba81ad7 refactor: 接口自动化接口导入优化 2020-12-24 11:37:11 +08:00
fit2-zhao 30b4e8f4cb Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 21:21:44 +08:00
fit2-zhao 39b61d21fb fix(接口定义): 修复请求体样式问题 2020-12-23 21:21:27 +08:00
chenjianxing 5a43793ce4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 21:09:13 +08:00
chenjianxing 529beec3e3 refactor: 调整用例弹框列表高度 2020-12-23 21:09:00 +08:00
fit2-zhao fe64de4bad fix(接口定义): 修复JSON 编辑器问题 2020-12-23 21:04:06 +08:00
fit2-zhao 8d042e2487 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 20:57:38 +08:00
fit2-zhao b9143716f7 fix(接口定义): 修复自定义请求执行缺陷 2020-12-23 20:57:28 +08:00
chenjianxing 1f321eb871 fix: 场景导入jar包无效 2020-12-23 20:43:43 +08:00
chenjianxing 17581da725 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 19:09:28 +08:00
chenjianxing c3819b6431 refactor: 固定用例弹框表头 2020-12-23 19:09:03 +08:00
fit2-zhao 2ae6f3ff62 fix(接口定义): 批量选择处理 2020-12-23 19:02:31 +08:00
fit2-zhao e54c956781 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
2020-12-23 18:52:10 +08:00
fit2-zhao 0665359d60 Merge branch 'master' of https://github.com/metersphere/metersphere
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
2020-12-23 18:51:54 +08:00
fit2-zhao c1322327f9 fix(接口自动化): 创建场景优化,紧凑布局 2020-12-23 18:28:56 +08:00
q4speed 0da578c0ce Merge remote-tracking branch 'origin/master' 2020-12-23 18:27:40 +08:00
q4speed 8094b2126d feat(接口自动化): 按钮改为FAB按钮 2020-12-23 18:27:28 +08:00
song.tianyang 9d4e86ec31 Merge remote-tracking branch 'origin/master' 2020-12-23 18:03:52 +08:00
song.tianyang 45d9a21512 fix: 首页接口数据统计、场景删除回收站数据
修复场景删除回收站数据异常的问题,首页接口数据统计增加情景接口的统计
2020-12-23 18:03:15 +08:00
fit2-zhao 6a80fd29c1 fix(接口定义): 用例头部样式调整 2020-12-23 18:02:33 +08:00
fit2-zhao 6625b77ad9 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 17:54:02 +08:00
fit2-zhao 7e1f9127a8 fix(接口定义): 修复环境选择问题 2020-12-23 17:53:45 +08:00
chenjianxing 22cd448b0f refactor: 接口定义列表切换添加提示 2020-12-23 17:46:28 +08:00
fit2-zhao 6e75c66673 fix(接口定义): 修复执行缺陷 2020-12-23 17:34:21 +08:00
chenjianxing 576b858977 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 17:21:47 +08:00
chenjianxing f6f142d7ba fix: 测试计划报告,测试计划结果为空 2020-12-23 17:21:07 +08:00
fit2-zhao 15c18a0012 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 17:17:49 +08:00
fit2-zhao 8238ee323b fix(接口定义): 修复回收站恢复问题,添加引用全选功能 2020-12-23 17:17:21 +08:00
chenjianxing cae9c24e4f refactor: 测试计划报告优化 2020-12-23 16:58:56 +08:00
chenjianxing 9143b48e05 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 16:25:10 +08:00
chenjianxing 4d7b794436 feat: 测试计划-失败计划列表 2020-12-23 16:25:01 +08:00