Commit Graph

4571 Commits

Author SHA1 Message Date
chenjianxing
f40726a74a fix: 解决冲突 2020-12-31 09:46:03 +08:00
zwp201301
9279deb3e9
Bug修复:swagger接口的入参必填与非必填。目前是没有判断swagger的必填与否,全部固定为必填。 (#1025)
1、KeyValue中的required属性不能写死,需要在对象构造的时候初始化;
2、HeaderParameter和CookieParameter类型参数,增加required属性;
3、FormParameter、QueryParameter、HeaderParameter和CookieParameter均增加required属性动态传递给KeyValue
2020-12-31 09:30:29 +08:00
chenjianxing
79b6c9cb3f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-30 22:01:26 +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
e9454d273b fix(测试计划): 修复编辑测试计划缺陷 2020-12-30 20:31:49 +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
fit2-zhao
d8d572fb14 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-30 16:55:27 +08:00
fit2-zhao
56d0a24fd8 fix(接口自动化): 修复通用请求头问题 2020-12-30 16:55:12 +08:00
song.tianyang
c8ceae2845 refactor: 创建接口、场景模块为空下拉框优化
创建接口、场景模块为空时,下拉框增加"去添加"的按钮,点击即可增加
2020-12-30 16:53:18 +08:00
song.tianyang
a1c1a023a6 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-30 14:43:43 +08:00
song.tianyang
d32000e0bd feat: 接口定义-案例表格增加全部数据批量操作支持
接口定义-案例表格增加全部数据批量操作支持
2020-12-30 14:42:48 +08:00
fit2-zhao
a683bb27ff fix(接口自动化): 修复http环境请求头公共参数无效问题 2020-12-30 11:25:26 +08:00
Captain.B
b7325171ab Merge branch 'v1.6' 2020-12-30 10:41:02 +08:00
Captain.B
22e8bf6def refactor: k8s 环境指定namespace 2020-12-30 10:40:37 +08:00
Captain.B
7ef0be2783 Merge branch 'v1.6' 2020-12-30 10:35:16 +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
3506c2fdd2 Merge remote-tracking branch 'origin/master' 2020-12-29 15:23:44 +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
song.tianyang
f1564b5751 Merge remote-tracking branch 'origin/v1.6' into v1.6 2020-12-29 15:19:47 +08:00
shiziyuan9527
57f6515d89 Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 2020-12-29 15:19:36 +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
fit2-zhao
fb8abc6c18 fix(接口自动化): 执行场景没有步骤时保护 2020-12-29 15:17:55 +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
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
89714f530e Merge remote-tracking branch 'origin/master' 2020-12-29 11:04:20 +08:00
Captain.B
1f611e3f5c Merge branch 'v1.6' 2020-12-29 11:03:58 +08:00
Captain.B
1154b3ce80 fix: 修改k8s资源池节点验证信息 2020-12-29 11:03:24 +08:00
Captain.B
c52fddbe19 refactor: 国际化 not support key 显示具体的key 2020-12-29 10:54:08 +08:00
fit2-zhao
16163203d9 Merge branch 'v1.6' 2020-12-29 10:18:31 +08:00
fit2-zhao
711c787f8d fix(接口自动化): 添加执行时 mock 处理 2020-12-29 09:56:26 +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