Commit Graph

1874 Commits

Author SHA1 Message Date
wenyann c2cef4bd70 fix: 用例导出优化 2020-08-28 16:38:44 +08:00
Captain.B 8298781148 fix: 修复切换路由之后执行时间没有查询的问题 2020-08-28 16:26:18 +08:00
Captain.B 0757d0f6ab fix: 修复资源池下拉框显示uuid的问题 2020-08-28 16:03:09 +08:00
wenyann 082c634611 Merge branch 'v1.2' of https://github.com/metersphere/metersphere into v1.2 2020-08-28 13:35:54 +08:00
chenjianxing 46cab70f36 refactor: 对话框不点击外部自动关闭 2020-08-28 12:10:54 +08:00
chenjianxing 0dc6e10529 Merge branch 'master' of https://github.com/metersphere/server 2020-08-28 11:39:06 +08:00
chenjianxing 2548bad565 Merge branch 'v1.2' 2020-08-28 11:38:35 +08:00
q4speed ac3093641f refactor: 优化代码 2020-08-28 11:26:32 +08:00
wenyann f529d7f6bb Merge branch 'master' into v1.2 2020-08-28 10:38:55 +08:00
wenyann 00c269ff8d fix:创建测试用例点击窗口外区域不关闭当前窗口
fix:测试名称校验
2020-08-28 10:30:42 +08:00
chenjianxing b0f720bb1e fix(接口测试): 代码模版添加undefined问题 2020-08-27 17:58:48 +08:00
chenjianxing e07f24b817 fix(测试跟踪): 测试步骤列表高度问题 2020-08-27 17:50:13 +08:00
wenyann 98b0391234 fix: 一键运行同一项目报错提示 2020-08-27 15:51:44 +08:00
wenyann d8094b3907 fix: 一键运行同一项目报错提示 2020-08-27 14:59:18 +08:00
Captain.B 788e020168 fix: 修复 this 绑定偶现的问题 2020-08-27 10:26:16 +08:00
Captain.B 117a1c0e98 Merge remote-tracking branch 'origin/master' into master 2020-08-27 10:17:45 +08:00
Captain.B c7e04f2f32 fix: 修复 echart title 消失的问题 2020-08-27 10:17:27 +08:00
wenyann 7ddd9f23d2 fix: 测试结果统计图页面修改 2020-08-27 10:15:40 +08:00
chenjianxing 9d88665a1a fix: Login.vue 控制台报错 2020-08-26 21:31:39 +08:00
chenjianxing 6604834cbf Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 18:49:12 +08:00
chenjianxing 2bf023ecac fix(接口测试): 请求超时时间限制最小值 2020-08-26 18:48:45 +08:00
shiziyuan9527 00acafbcdc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-26 18:05:52 +08:00
shiziyuan9527 a68990a27d refactor: 修改测试计划搜索框的提示 2020-08-26 18:05:24 +08:00
chenjianxing 8dc66e9268 fix(接口测试): 禁用场景不校验 2020-08-26 17:57:34 +08:00
chenjianxing 8eeb51258f Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 17:48:57 +08:00
chenjianxing 1f6fffad2c refactor: 复制测试可填写测试名称 2020-08-26 17:20:56 +08:00
Captain.B 395344b53c Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-08-26 16:59:02 +08:00
Captain.B 9ae8305b2c refactor: 修改 chart title 2020-08-26 16:58:36 +08:00
wenyann a0c389a0c9 Merge remote-tracking branch 'origin/master' 2020-08-26 16:54:19 +08:00
wenyann d52819d0d2 fix: 测试结果页面修改 2020-08-26 16:53:56 +08:00
Captain.B 7dba6df7b1 Merge remote-tracking branch 'origin/master' into master 2020-08-26 16:24:09 +08:00
Captain.B b653848594 refactor: 默认使用svg渲染echart 2020-08-26 16:23:31 +08:00
chenjianxing 5b017a42a5 fix(接口测试): 无可用请求时可保存不可执行 2020-08-26 16:04:53 +08:00
chenjianxing 6550c47338 Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 16:02:14 +08:00
chenjianxing 205f4ce4ed refactor(接口测试): 没有可用请求时提示 2020-08-26 16:02:06 +08:00
Captain.B e483748b97 Merge remote-tracking branch 'origin/master' into master 2020-08-26 15:52:36 +08:00
chenjianxing e8ee29da09 fix(接口测试): body 文件上传大小限制 2020-08-26 15:46:47 +08:00
Captain.B a487a1f2aa refactor: 为路由设置roles 2020-08-26 15:45:43 +08:00
chenjianxing d7313eabdd fix(接口测试): 禁用请求不校验 2020-08-26 15:34:36 +08:00
Captain.B 1af11f2bc0 refactor: 去掉import的警告 2020-08-26 14:43:03 +08:00
BugKing 1cc6476f15 refactor(测试跟踪): 修改用例批量操作文本提示 2020-08-26 14:00:20 +08:00
wenyann e44311c2a8 Merge remote-tracking branch 'origin/master' 2020-08-26 13:29:54 +08:00
wenyann 7afbe8fa3f fix: 修复缺陷描述,测试结果列表表格太长 2020-08-26 13:29:29 +08:00
chenjianxing ec4632be45 Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 13:03:23 +08:00
chenjianxing 9ffffe5703 fix(接口测试): 文件上传调试执行失败 2020-08-26 13:03:03 +08:00
Captain.B b8bf889e94 fix: 修复 api header menus undefine 的问题 2020-08-26 11:56:55 +08:00
Captain.B f642b5ace1 refactor(接口测试): 接口测试报告页面调整 2020-08-26 11:32:40 +08:00
Captain.B 3aa9c19468 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-08-26 11:29:13 +08:00
Captain.B 71bea4e0f4 refactor(接口测试): 接口测试页面调整 2020-08-26 11:28:34 +08:00
shiziyuan9527 4bef8a0edc fix: 去掉测试用例测试计划列表上方的批量操作按钮 2020-08-26 11:28:33 +08:00
chenjianxing 895c43bbaf Merge branch 'master' of https://github.com/metersphere/server 2020-08-26 10:49:39 +08:00
chenjianxing 3882914c6b refactor(接口测试): 单接口执行页面优化 2020-08-26 10:48:00 +08:00
q4speed 4632afab9c chore: update submodule 2020-08-26 10:14:25 +08:00
shiziyuan9527 5bd35fa4f1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-25 18:18:59 +08:00
shiziyuan9527 b82ffef3cf fix: 提缺陷时生成缺陷描述 2020-08-25 18:18:50 +08:00
q4speed 54f025e6a2 Merge remote-tracking branch 'origin/master' 2020-08-25 17:48:13 +08:00
q4speed 954262a631 style: 修复表格抖动bug 2020-08-25 17:47:58 +08:00
Captain.B a34cb53bbb Merge remote-tracking branch 'origin/master' into master 2020-08-25 17:45:35 +08:00
Captain.B 20a124b593 feat: 修改列表项刷新head 2020-08-25 17:44:49 +08:00
chenjianxing 5424f9b505 fix(接口测试): 前置脚本禁用获取响应代码模版 2020-08-25 17:31:32 +08:00
chenjianxing 8531e7e176 fix(测试跟踪): 快速点击模块树报错问题 2020-08-25 17:14:30 +08:00
chenjianxing d4a722033e Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 16:50:58 +08:00
chenjianxing d5727857e5 fix(接口测试): 超时设置上限 2020-08-25 16:50:42 +08:00
wenyann 7f0f245609 Merge remote-tracking branch 'origin/master' 2020-08-25 16:06:47 +08:00
wenyann 8a60a57102 fix: 修复一键运行uuid重复 2020-08-25 16:05:58 +08:00
chenjianxing ae8389bb90 fix: body json 格式化大数字异常 2020-08-25 16:03:14 +08:00
chenjianxing 19224b367d Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 15:48:44 +08:00
shiziyuan9527 3c482f4840 refactor: 修改系统组织菜单下成员列表的表格样式 2020-08-25 15:48:16 +08:00
chenjianxing b055fac758 Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 15:44:26 +08:00
chenjianxing 52049d61d4 refacotr: 合并v1.1 2020-08-25 15:44:07 +08:00
shiziyuan9527 75ae9f6ce4 fix: 修改缺陷预览样式 2020-08-25 15:42:20 +08:00
chenjianxing 1e870fd04e fix(接口测试): 首次提取失败问题 2020-08-25 15:24:49 +08:00
chenjianxing 7ed2d30acd refactor(接口测试): 前后置脚本排版优化 2020-08-25 14:22:19 +08:00
chenjianxing dc64026250 Merge branch 'master' of https://github.com/metersphere/server 2020-08-25 14:15:24 +08:00
chenjianxing 51fb3466ae refactor: 用例名称长度限制改为50 2020-08-25 14:15:06 +08:00
wenyann e93622d8ec Merge remote-tracking branch 'origin/master' 2020-08-25 14:08:36 +08:00
wenyann e743be130c fix: 修复一键运行报错 2020-08-25 14:08:12 +08:00
chenjianxing 050a519d54 refactor: 解决冲突 2020-08-25 13:44:50 +08:00
chenjianxing d54b32ced3 feat(接口测试): 接口测试支持文件上传 2020-08-25 13:42:31 +08:00
Captain.B ea9378c81d style: 格式化vue代码 2020-08-25 10:17:55 +08:00
q4speed abd9bad78b Merge remote-tracking branch 'origin/master' 2020-08-24 18:42:49 +08:00
q4speed 62899cbd22 perf: 路由懒加载 2020-08-24 18:42:35 +08:00
q4speed cc3f2a68e1 refactor: 优化代码 2020-08-24 18:41:53 +08:00
shiziyuan9527 cbf1bc09e2 fix: 测试计划可以关联多个模块下的用例 2020-08-24 18:09:08 +08:00
wenyann 9f76a15120 Merge remote-tracking branch 'origin/master' 2020-08-24 16:51:57 +08:00
wenyann e33ffa6542 fix: 缺陷列表按时间排序 2020-08-24 16:51:33 +08:00
shiziyuan9527 f1846943be fix: 提交缺陷后隐藏输入框 2020-08-24 16:48:02 +08:00
shiziyuan9527 88b1cfd71a refactor: 修改搜索框的提示 2020-08-24 16:35:52 +08:00
shiziyuan9527 694f712f52 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-24 16:14:10 +08:00
wenyann e0de47e1cc fix: 缺陷列表当前处理人修改 2020-08-24 16:11:37 +08:00
shiziyuan9527 8fcf7aea75 fix: 缺陷添加创建时间 2020-08-24 16:10:12 +08:00
wenyann e8918c08c4 fix: 修改模块显示路径,时间排序 2020-08-24 16:08:52 +08:00
shiziyuan9527 9ad4da05cd fix: 修改缺陷标题长度 2020-08-24 14:11:08 +08:00
shiziyuan9527 e00c3ddab0 fix: 测试计划切换用例时更新缺陷信息 2020-08-21 17:44:42 +08:00
wenyann 001e275a83 Merge remote-tracking branch 'origin/master' 2020-08-21 16:37:51 +08:00
wenyann ff955209b2 fix: 修改关联其他测试提示 2020-08-21 16:37:19 +08:00
shiziyuan9527 8572956083 refactor: i18n 2020-08-21 14:46:50 +08:00
q4speed be574b1b40 chore: update submodule 2020-08-21 14:29:00 +08:00
q4speed cb8b73d9ad feat(性能测试): 增加资源池限额过滤 2020-08-21 11:14:47 +08:00
wenyann 83f90d7d12 Merge remote-tracking branch 'origin/master' 2020-08-20 19:11:09 +08:00
wenyann 0a39e34b37 fix: 修改时间 2020-08-20 19:10:23 +08:00
Captain.B ae7d030577 Merge remote-tracking branch 'origin/master' into master 2020-08-20 18:58:35 +08:00
Captain.B 246b63d432 fix: 修复jmeter内置函数的提示 2020-08-20 18:58:20 +08:00
chenjianxing 9a9d702aca Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 18:16:45 +08:00
chenjianxing eceb099545 feactor: 用户ID支持特殊字符 2020-08-20 18:16:28 +08:00
q4speed 22b6fb25c4 chore: update submodule 2020-08-20 18:08:08 +08:00
wenyann 56914fa834 style:禁掉导出按钮 2020-08-20 17:41:52 +08:00
wenyann a722d6419e Merge remote-tracking branch 'origin/master' 2020-08-20 16:51:06 +08:00
wenyann ad808590e7 fix: 修复接口报告不更新问题 2020-08-20 16:50:34 +08:00
chenjianxing c4d4284957 fix(接口测试): 只读用户单接口调试 2020-08-20 16:02:14 +08:00
chenjianxing 72010207ea Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 15:53:52 +08:00
chenjianxing 53b2833ee4 fix(测试跟踪): 只读用户创建用户测试报告 2020-08-20 15:53:16 +08:00
shiziyuan9527 1038f50c3f fix: 修改缺陷描述 2020-08-20 15:00:18 +08:00
chenjianxing 3ebee20b90 Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 14:37:25 +08:00
chenjianxing 84e9c23486 feat(接口测试): 添加超时设置 2020-08-20 14:37:05 +08:00
Captain.B a50666f1d6 Updating the submodule to the latest version 2020-08-20 12:12:20 +08:00
chenjianxing fbed4ecda4 fix: 解决冲突 2020-08-19 18:10:31 +08:00
chenjianxing 948e489626 fix(接口调试): 接口调试响应不更新问题 2020-08-19 18:04:42 +08:00
shiziyuan9527 7445f06d58 refactor: i18n 2020-08-19 17:05:31 +08:00
Captain.B 4c0ca40b1a Merge remote-tracking branch 'origin/master' into master 2020-08-19 16:36:05 +08:00
Captain.B e3ce7c0db2 fix: 修复删除测试和报告的时候没有及时刷新 recent 列表的问题 2020-08-19 16:35:37 +08:00
shiziyuan9527 4efcd10bae refactor: 修改服务集成样式 2020-08-19 15:56:57 +08:00
chenjianxing 83c21a33b5 Merge branch 'master' of https://github.com/metersphere/server 2020-08-19 15:41:24 +08:00
chenjianxing 478d6db83b feat(接口测试): 场景和接口支持禁用和启用 2020-08-19 15:41:14 +08:00
shiziyuan9527 fabba9a364 refactor: i18n 2020-08-19 11:55:00 +08:00
Captain.B b5fab0f8a6 refactor: Api Keys 前端页面修改 2020-08-19 11:50:08 +08:00
Captain.B a435a5194d refactor: Api Keys 前端页面修改 2020-08-19 11:46:01 +08:00
Captain.B 759fd8cadd Merge remote-tracking branch 'origin/master' into master 2020-08-19 11:00:09 +08:00
Captain.B 4b4b3d92dc refactor: 系统设置前端页面修改 2020-08-19 10:58:35 +08:00
wenyann dea1884cc2 Merge remote-tracking branch 'origin/master' 2020-08-19 10:46:08 +08:00
wenyann 88429985c6 style(LDAP): 删掉无用代码 2020-08-19 10:45:40 +08:00
q4speed 0197515077 chore: 子模块 2020-08-19 10:22:04 +08:00
wenyann b60d296c85 feat(测试跟踪): 新增缺陷列表,缺陷数 2020-08-19 10:03:15 +08:00
wenyann 29f5e772a1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-19 10:02:22 +08:00
wenyann d9b3831b3e feat(测试跟踪): 新增缺陷列表,缺陷数 2020-08-19 10:02:02 +08:00
chenjianxing b04c573362 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 19:02:10 +08:00
chenjianxing d820bf400c feat(接口测试): dubbo BeanShell 2020-08-18 19:01:49 +08:00
shiziyuan9527 744e1fd7c2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 18:47:32 +08:00
shiziyuan9527 ae151e4535 refactor: 修改样式 2020-08-18 18:47:24 +08:00
chenjianxing 65a033ce3a Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 18:43:28 +08:00
chenjianxing f60e06d4c0 feat(接口测试): BeanShell 代码提示 2020-08-18 18:42:55 +08:00
q4speed cadcf9eb7b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-08-18 18:10:02 +08:00
q4speed a26a12fb17 fix: 修复保存工作控件配额时超出组织的配额的bug 2020-08-18 18:08:50 +08:00
shiziyuan9527 26895e0c57 feat: 修改密码时进行二次确认 2020-08-18 16:53:57 +08:00
shiziyuan9527 ea8445a676 fix: 关联用例时首次加载全部用例 2020-08-18 16:30:29 +08:00
wenyann 6e8f7f4796 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 16:10:29 +08:00
wenyann 509e5c9fbb feat(LDAP): 测试报告导出 2020-08-18 15:56:19 +08:00
shiziyuan9527 7ffb6812cf fix: 取消集成后,解除项目关联 2020-08-18 15:44:41 +08:00
shiziyuan9527 ab07bc3de8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 14:34:43 +08:00
shiziyuan9527 46d52334bf feat: 测试计划测试用例列表显示缺陷数 2020-08-18 14:33:52 +08:00
chenjianxing fcb8eeedf2 feat(接口测试): 支持Beanshell脚本 2020-08-18 14:32:24 +08:00
chenjianxing 163fae2e51 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 10:21:13 +08:00
chenjianxing a3bc670b44 fix: 修改sso名称 2020-08-18 10:20:39 +08:00
shiziyuan9527 240ac7ab26 feat: 集成Jira 2020-08-17 22:01:15 +08:00
chenjianxing 5ec095673c feat(接口测试): 前后置脚本页面 2020-08-17 19:23:29 +08:00
chenjianxing c1c2bc7f76 fix: swagger body参数循环依赖问题 2020-08-17 15:24:11 +08:00
chenjianxing 263aba9b57 fix: 单接口调试 2020-08-17 13:06:41 +08:00
chenjianxing 064304ba28 refactor: 适配cas 2020-08-17 10:09:19 +08:00
Captain.B 6e7fe725a1 Merge remote-tracking branch 'origin/master' 2020-08-14 19:20:11 +08:00
Captain.B fa23fcdfcd feat(接口测试): 代码调整 2020-08-14 19:19:53 +08:00
shiziyuan9527 f52a5cc078 feat: 集成Tapd 2020-08-14 18:07:42 +08:00
Captain.B b86fbafa00 feat(接口测试): Jmeter 函数说明 2020-08-14 16:51:36 +08:00
Captain.B ea872b5f79 feat(接口测试): Jmeter 函数说明 2020-08-14 16:50:12 +08:00
wenyann 1cff9c1d02 Merge remote-tracking branch 'origin/master' 2020-08-14 14:33:57 +08:00
wenyann 7e6530a591 style(测试跟踪): 测试报告优化 2020-08-14 14:33:02 +08:00
q4speed 2fb347bd85 Merge remote-tracking branch 'origin/master' 2020-08-14 13:35:34 +08:00
q4speed 3783d30d7e feat: 增加配额管理 2020-08-14 13:34:18 +08:00
Captain.B 26f29ade01 refactor: 高级参数设置组件 2020-08-14 13:15:02 +08:00
Captain.B 69bac33aa1 feat(接口测试): 处理变量 2020-08-14 12:19:41 +08:00
Captain.B 220c8fb099 Merge branch 'func' 2020-08-14 12:04:30 +08:00
Captain.B b63c136fb5 feat(接口测试): 处理变量 2020-08-14 12:02:20 +08:00
wenyann ccf7c0e52f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 19:09:14 +08:00
wenyann bf71b37cf4 style: 测试报告优化 2020-08-13 19:09:02 +08:00
shiziyuan9527 e8842accc2 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 17:15:40 +08:00
shiziyuan9527 f42a920fcf feat: 集成TAPD平台 2020-08-13 17:15:19 +08:00
Captain.B 01e22c9f1a feat(接口测试): 处理变量 2020-08-13 15:26:11 +08:00
Captain.B 9bad4b4a83 Merge branch 'master' into func 2020-08-13 14:12:16 +08:00
Captain.B 6461c1a6a6 feat(接口测试): 定义新的组件 2020-08-13 13:34:43 +08:00
Captain.B ad4709e502 feat: mock 数据 2020-08-13 11:11:14 +08:00
wenyann c3280f955d fix: 时间样式调整 2020-08-13 10:18:49 +08:00
Captain.B a1fa5de266 feat: mock 数据 2020-08-13 09:52:51 +08:00
wenyann 9e22233616 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 09:52:01 +08:00
wenyann 7530fff681 fix(接口测试): 报告页面时间显示调整,响应不刷新,页面全部展开 2020-08-13 09:51:03 +08:00
shiziyuan9527 47fad33be1 feat: 服务集成 2020-08-12 17:37:14 +08:00
wenyann b0e0aa1327 fix(接口测试): 报告 2020-08-12 16:48:54 +08:00
Captain.B 23f04146b3 Merge branch 'master' into func 2020-08-12 13:32:04 +08:00
Captain.B 6847ff0530 fix: 非 GET 请求中支持 url 参数 2020-08-12 13:14:38 +08:00
Captain.B 42a3f7261b Revert "refactor: 请求参数修改"
This reverts commit 468eea3b
2020-08-12 12:56:52 +08:00
Captain.B 0263662f97 refactor: 请求参数修改 2020-08-12 12:55:41 +08:00
Captain.B be57bf66a5 Merge branch 'master' into func 2020-08-12 12:40:17 +08:00
Captain.B e512957cd6 refactor: 请求参数修改 2020-08-12 12:14:53 +08:00
wenyann 9dca87376e Merge remote-tracking branch 'origin/master' 2020-08-12 10:58:49 +08:00
wenyann 0222b053b0 fix(测试计划): 时间修改 2020-08-12 10:58:10 +08:00
shiziyuan9527 b13fb0f001 feat: 服务集成 2020-08-11 17:17:25 +08:00
wenyann 59c9cdfef2 fix(接口测试): 场景重复 2020-08-11 15:57:50 +08:00
wenyann a8671ca4f3 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/api/report/components/ScenarioResults.vue
	frontend/src/business/components/common/head/ShowAll.vue
2020-08-11 14:52:02 +08:00
wenyann 66b6c179e8 feat(接口测试):增加接口测试一键运行功能 2020-08-11 14:40:18 +08:00
Captain.B 468eea3b50 refactor: 请求参数修改 2020-08-11 14:28:20 +08:00
chenjianxing 9692b8d2a5 fix(测试跟踪): fix 提缺陷生成D实际结果不正确 2020-08-11 11:22:28 +08:00
chenjianxing b37d6a15f2 fix: 选择raw类型body后,切换成kv请求头错误 2020-08-11 11:15:16 +08:00