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

3456 Commits

Author SHA1 Message Date
chenjianxing d08717c352 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 13:46:46 +08:00
chenjianxing 73d63ce072 refactor: 环境变量添加描述和复制功能 2021-01-20 13:44:21 +08:00
fit2-zhao 0070123bef feat(接口定义): 增加用例批量编辑功能 2021-01-20 13:12:09 +08:00
fit2-zhao 81165295e3 fix(接口定义): 批量执行用例校验 2021-01-20 12:50:10 +08:00
fit2-zhao 269ee4d7b0 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 11:53:06 +08:00
fit2-zhao 67635aebbd fix(接口定义): 用例状态统计不准确问题修复 2021-01-20 11:52:37 +08:00
chenjianxing deb0a636d9 fix: 解决冲突 2021-01-20 11:51:27 +08:00
chenjianxing 23a92b8e19 refactor: 用例列表页面优化 2021-01-20 11:06:03 +08:00
fit2-zhao ea7090b3eb refactor(接口定义): 重构用例存储及结果统计 2021-01-20 10:29:17 +08:00
chenjianxing ed349c5071 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 20:30:40 +08:00
chenjianxing f9e2c089ef fix: 接口用例页面响应组件优化 2021-01-19 20:30:30 +08:00
fit2-zhao 9b17d887ee Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 18:36:34 +08:00
fit2-zhao a1881d0f51 fix(接口自动化): 引用场景校验 2021-01-19 18:36:14 +08:00
song.tianyang 9527c29d96 Merge remote-tracking branch 'origin/master' 2021-01-19 18:32:41 +08:00
song.tianyang adcd180e44 fix: 修改用例图标 
修改用例图标
 2021-01-19 18:32:16 +08:00
fit2-zhao 4aa1c0cf57 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 18:01:29 +08:00
fit2-zhao 8a47dfa112 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-01-19 18:01:07 +08:00
shiziyuan9527 5b48087c22 fix(测试计划): 修复Dialog遮罩层问题 2021-01-19 17:30:27 +08:00
Captain.B 67f03a4d33 Merge remote-tracking branch 'origin/master' 2021-01-19 17:03:20 +08:00
Captain.B 0516111190 refactor: cas 不允许修改密码 2021-01-19 16:45:55 +08:00
shiziyuan9527 64a511fe00 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 16:33:25 +08:00
shiziyuan9527 086a1e50bb feat(测试计划): 性能测试用例按照名称或ID查询 2021-01-19 16:30:47 +08:00
BugKing 339c739bc2 refactor(系统设置): 调整项目管理和个人信息子菜单位置 2021-01-19 16:29:41 +08:00
Captain.B f666b140bb feat(xPack): cas 认证源设置 2021-01-19 16:22:32 +08:00
song.tianyang c7dfb4160b fix: 修改图标、修改"一件创建性能测试"时压力配置下方显示的内容 
修改图标、修改"一件创建性能测试"时压力配置下方显示的内容
 2021-01-19 16:16:58 +08:00
fit2-zhao f6490cb5ed Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 15:54:42 +08:00
fit2-zhao 387c685455 fix(接口自动化): 循环控制器死循环问题修复 2021-01-19 15:54:13 +08:00
Captain.B 9dde59379d Merge remote-tracking branch 'origin/master' 2021-01-19 15:50:20 +08:00
Captain.B 43ae3dd2ce feat(xPack): CAS 登录 2021-01-19 15:49:20 +08:00
shiziyuan9527 0b128343ef refactor(测试计划): 性能测试用例优化 2021-01-19 15:42:08 +08:00
song.tianyang 0f983aae63 fix: 修复测试计划手动保存报告不成功的问题 
修复测试计划手动保存报告不成功的问题
 2021-01-19 14:43:13 +08:00
song.tianyang e4b16c31d4 feat: 测试计划-增加定时任务、修改接口列表、接口自动化的按钮 
测试计划-增加定时任务、修改接口列表、接口自动化的按钮
 2021-01-19 14:26:58 +08:00
chenjianxing c964785385 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 13:50:57 +08:00
chenjianxing 56f38b5698 refactor: 环境批量添加变量和请求头 2021-01-19 13:50:49 +08:00
fit2-zhao e2356c1849 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 13:12:58 +08:00
fit2-zhao 4c882ffafd feat(接口定义): 测试步骤位置调整 2021-01-19 13:12:35 +08:00
chenjianxing 8f49a7fdd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 11:16:33 +08:00
chenjianxing 5938bc747f refactor: 从接口列表导入支持翻页多选 2021-01-19 11:16:16 +08:00
fit2-zhao ac4e52091d feat(接口自动化): 循环状态控制 ，当循环下只有一个请求时，可以开启/关闭； 当循环下超过一个请求时，则只能开启。 2021-01-19 10:12:08 +08:00
Captain.B 26edcd1e0c chore: Sync 2021-01-19 09:43:23 +08:00
chenjianxing 8589eeb47b refactor: 场景组件点击名称编辑自动获取焦点 2021-01-18 20:35:34 +08:00
chenjianxing 2baa9682e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 19:23:07 +08:00
chenjianxing 49071d1145 refactor: 用例列表添加批量执行 2021-01-18 19:22:58 +08:00
fit2-zhao 6e4e42812a fix(接口自动化): 循环控制器处理 2021-01-18 18:26:45 +08:00
fit2-zhao 7fdf8b4154 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
 2021-01-18 18:15:31 +08:00
fit2-zhao ba6c5b85a6 fix(接口自动化): 修复执行报告场景名称问题 2021-01-18 18:12:02 +08:00
wenyann 3c36edbb96 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
 2021-01-18 18:07:57 +08:00
wenyann 5b2359ec3c feat: swagger定时自动同步 2021-01-18 18:05:25 +08:00
shiziyuan9527 07de54a8e5 refactor(测试跟踪): 关联项目处增加说明图标 2021-01-18 17:54:07 +08:00
song.tianyang 3cbca58209 fix: 修复全选统计错误的缺陷、修复测试计划定时任务的缺陷 
修复全选统计错误的缺陷、修复测试计划定时任务的缺陷
 2021-01-18 17:45:01 +08:00
shiziyuan9527 de31246d53 refactor(测试跟踪): 用例评审优化 2021-01-18 17:28:12 +08:00
chenjianxing 0e88589142 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 17:10:55 +08:00
chenjianxing 51ca545122 fix: 修改接口用例空指针 2021-01-18 17:07:12 +08:00
fit2-zhao cb73ebc2a3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 15:44:40 +08:00
fit2-zhao 17fc35d01e fix(接口定义): 单条用例执行时保存变化内容 2021-01-18 15:44:19 +08:00
chenjianxing 7cb3d59d02 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 15:38:46 +08:00
chenjianxing 6bb13a7a59 refactor: json响应自动格式化 2021-01-18 15:38:27 +08:00
fit2-zhao 8653a20c60 fix(接口定义): 现实执行脚本 2021-01-18 15:20:40 +08:00
fit2-zhao 7766db552c style(接口测试): 统一接口定义和接口自动化 Tab 添加样式 2021-01-18 14:22:14 +08:00
fit2-zhao 6d6853101b fix(接口自动化): 复制组件放到一起 2021-01-18 13:42:55 +08:00
fit2-zhao 20f7e727ea fix(接口定义): JSON-SCHEMA转换问题修复 2021-01-18 13:31:52 +08:00
fit2-zhao c1303bd8a8 refactor(接口定义): 重构HTTP请求，规范代码 2021-01-18 13:25:44 +08:00
fit2-zhao b0d01bebba fix(接口定义): 修复用例执行成功后，结果未更新，响应内容为空 2021-01-18 13:02:23 +08:00
fit2-zhao ab421ae204 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 12:44:38 +08:00
fit2-zhao 46a9600908 refactor(接口自动化): 重构添加组件方法 2021-01-18 12:44:02 +08:00
chenjianxing 49c0de83b6 refactor: 测试计划编辑用例按钮小屏适配 2021-01-18 11:39:51 +08:00
chenjianxing c53687d37d fix: 接口测试文件上传失败 2021-01-18 11:12:28 +08:00
chenjianxing b024c5da54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 10:29:10 +08:00
fit2-zhao b0c158235c fix(接口自动化): 修改变量统计问题 2021-01-18 09:50:42 +08:00
fit2-zhao bd505a5c32 style(接口自动化): 统一步骤样式 2021-01-13 18:18:50 +08:00
song.tianyang 8d152a077e feat(测试计划增加定时任务、增加测试报告查看页面): 
测试计划增加定时任务、增加测试报告查看页面
 2021-01-13 16:51:02 +08:00
fit2-zhao 4069654f7d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 16:34:00 +08:00
fit2-zhao a315a77055 style(接口定义): JSON-SCHEMA 样式调整 2021-01-13 16:33:39 +08:00
shiziyuan9527 93654862ef refactor(测试计划): 性能测试用例执行 2021-01-13 16:17:18 +08:00
chenjianxing 2dee505e53 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 16:04:27 +08:00
chenjianxing 0a8a2b55bf fix: 嵌套表格全选样式生效 2021-01-13 16:04:10 +08:00
fit2-zhao 41f928aa89 feat(接口定义): 接口用例增加执行结果展示 2021-01-13 15:25:05 +08:00
chenjianxing d24d7e5144 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 15:02:34 +08:00
chenjianxing b4d1b25cdf refactor: 用例列表全屏显示 2021-01-13 15:02:14 +08:00
fit2-zhao c8b9b2babb fix(接口自动化): 数据迁移，模块以树形结构展示 2021-01-13 14:34:43 +08:00
fit2-zhao 0230aba400 fix(接口自动化): 解决无法创建场景问题 2021-01-13 11:24:20 +08:00
chenjianxing 6f67e89a9d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 11:20:44 +08:00
chenjianxing 1ec251c65a refactor: 测试用例列表页面优化 2021-01-13 11:20:27 +08:00
shiziyuan9527 6811a5c9a2 refactor(测试计划): 统计报告优化 2021-01-13 11:19:22 +08:00
fit2-zhao 4654e5fff2 提交误删除引用 2021-01-13 10:20:59 +08:00
chenjianxing 53c2d6f7fa Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 09:56:52 +08:00
chenjianxing 5aa5b5ebc3 refactor: 场景和模块树页面优化 2021-01-13 09:56:33 +08:00
shiziyuan9527 1c4365cc28 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 18:09:26 +08:00
shiziyuan9527 17ecef469b feat(测试计划): 统计报告新增性能测试用例饼图 2021-01-12 18:08:40 +08:00
fit2-zhao dfd7f6de59 fix(接口自动化): LOOP 页面下拉选项丢失找回 2021-01-12 18:07:32 +08:00
fit2-zhao 20c9d9b50c fix(接口定义): 不允许拖拽 2021-01-12 18:02:23 +08:00
fit2-zhao 14a54cabcc Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/definition/components/processor/Jsr233Processor.vue
 2021-01-12 18:00:26 +08:00
fit2-zhao 930850031e style(接口定义): 脚本样式优化 2021-01-12 17:55:41 +08:00
chenjianxing 4ffa2b045d fix: 解决冲突 2021-01-12 17:39:49 +08:00
chenjianxing 255e31e2d9 refactor: 接口定义组件优化 2021-01-12 17:34:52 +08:00
fit2-zhao 413241a688 fix(接口自动化): 修改移动问题 2021-01-12 17:31:29 +08:00
fit2-zhao cc1e26fbdc Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiComponent.vue
#	frontend/src/business/components/api/automation/scenario/IfController.vue
#	frontend/src/business/components/api/automation/scenario/Jsr233Processor.vue
#	frontend/src/business/components/api/automation/scenario/LoopController.vue
#	frontend/src/business/components/api/definition/components/assertion/ApiAssertions.vue
#	frontend/src/business/components/api/definition/components/extract/ApiExtract.vue
 2021-01-12 17:29:57 +08:00
fit2-zhao 59301d63ce fix(接口自动化): 解决场景自动化步骤编辑不能全选问题 2021-01-12 16:57:41 +08:00
chenjianxing 7f49a1b8ef Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 16:28:54 +08:00
chenjianxing 283912edc1 refactor: 重构接口自动化组件 2021-01-12 16:28:34 +08:00
fit2-zhao 0903d7f878 fix(接口定义): 默认添加一条用例 2021-01-12 16:13:03 +08:00
shiziyuan9527 30b3f83725 feat(测试计划): 性能测试用例展示ID列 2021-01-12 15:41:14 +08:00
shiziyuan9527 4cef65d9f8 feat(性能测试): 测试列表添加ID列 2021-01-12 15:22:08 +08:00
Captain.B d7dbcf0860 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/xpack
 2021-01-12 15:09:04 +08:00
Captain.B c3673be342 feat: 配置认证源 2021-01-12 15:08:07 +08:00
fit2-zhao a1eac0996f feat(接口自动化): 修复部分缺陷 2021-01-12 14:51:15 +08:00
fit2-zhao 86b19b68fc feat(接口自动化): 报告优化 2021-01-12 11:16:46 +08:00
fit2-zhao a023b85f99 fix(接口自动化): 冲突合并 2021-01-11 19:00:47 +08:00
chenjianxing 5781cc7b1e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 18:14:48 +08:00
chenjianxing 07b500331d feat: 接口定义TCP 2021-01-11 18:14:35 +08:00
fit2-zhao c15cd077bc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 15:55:17 +08:00
fit2-zhao 6b57e3a3e2 fix(接口自动化): 所有高级搜索增加TAGS 2021-01-11 15:54:49 +08:00
shiziyuan9527 6ab9e3ade8 refactor(测试计划): 性能测试用例列表i18n 2021-01-11 15:54:30 +08:00
shiziyuan9527 60374f6094 fix(性能测试): 再次执行测试时avgTransactions未初始化 2021-01-11 14:55:03 +08:00
fit2-zhao bcbc9e5a53 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 14:45:33 +08:00
fit2-zhao fa53228f97 fix(接口自动化): 修复SQL类型请求无法切换环境问题 2021-01-11 14:45:11 +08:00
Captain.B 2564c81302 Merge remote-tracking branch 'origin/master' 2021-01-11 14:19:25 +08:00
Captain.B d64691fe9a refactor: 性能测试表头优化 2021-01-11 14:08:48 +08:00
fit2-zhao b542049389 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 13:47:29 +08:00
fit2-zhao 489b2b8f10 feat(接口定义): 高级查询 2021-01-11 13:46:56 +08:00
Captain.B a00334acf3 fix: 修复查询个人信息时越权的问题 
Closes #1089
 2021-01-11 11:38:24 +08:00
fit2-zhao 5c8b5be24f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 18:34:55 +08:00
fit2-zhao 3ea76df748 feat(接口自动化): 场景变量页面i18n 提示优化 2021-01-08 18:32:24 +08:00
shiziyuan9527 313fb0a244 feat(测试计划): 性能测试用例执行结果 2021-01-08 18:13:47 +08:00
BugKing fb681bf9b3 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-01-08 17:56:09 +08:00
BugKing f541a70235 fix(系统设置): 修复项目列表环境管理按钮丢失问题 2021-01-08 17:54:18 +08:00
fit2-zhao f22a917f12 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 17:54:16 +08:00
fit2-zhao a57e07bba5 feat(接口自动化): 完成场景变量 2021-01-08 17:54:09 +08:00
fit2-zhao fe74a26fd2 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
 2021-01-08 17:53:45 +08:00
chenjianxing 9723f85c46 fix: 解决冲突 2021-01-08 17:16:32 +08:00
chenjianxing 5465d9cf64 feat: 场景添加jsonpath功能 2021-01-08 17:12:06 +08:00
shiziyuan9527 2bba395f40 refactor(测试计划): 性能测试用例执行优化 2021-01-08 16:18:37 +08:00
fit2-zhao 30762dae9f feat(接口自动化): 完成场景变量基础存储功能 2021-01-08 15:54:45 +08:00
Captain.B 1c385a991f Merge remote-tracking branch 'origin/master' 2021-01-08 15:22:56 +08:00
Captain.B e98d1eee56 refactor: 接口测试用例列表表头优化 2021-01-08 15:22:37 +08:00
chenjianxing a7bc099305 refactor: 全选按钮样式 2021-01-08 15:18:04 +08:00
chenjianxing 46736b254f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 14:52:34 +08:00
chenjianxing e188bb203f refactor: 固定场景保存按钮 2021-01-08 14:51:38 +08:00
chenjianxing 2286f66e0c fix: 解决冲突 2021-01-08 14:50:24 +08:00
Captain.B d37ae32045 refactor: 接口列表表头优化 2021-01-08 14:43:06 +08:00
shiziyuan9527 2f8d0e9163 feat(测试计划): 批量取消性能测试用例关联 2021-01-08 14:20:04 +08:00
chenjianxing 5cbaeb06c4 refactor: 接口用例和接口自动化页面全选框样式 2021-01-08 14:12:25 +08:00
fit2-zhao 7c3b718863 fix(接口定义): 冲突合并 2021-01-08 13:49:58 +08:00
Captain.B ed819b4710 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-01-08 13:37:18 +08:00
Captain.B 67c71ff01a refactor: 统一显示标签 2021-01-08 13:35:43 +08:00
fit2-zhao c291de3292 feat(接口自动化): 场景变量处理 2021-01-08 13:29:00 +08:00
shiziyuan9527 a8a9664070 feat(测试计划): 取消项目关联时取消性能测试用例关联 2021-01-08 11:36:41 +08:00
shiziyuan9527 963156a969 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 11:34:24 +08:00
chenjianxing 252f26ae61 fix: 接口列表tag报错 2021-01-08 11:13:50 +08:00
chenjianxing 0ab925251c feat: 添加jsonpath提取推荐 2021-01-08 11:05:35 +08:00
shiziyuan9527 0caf64769a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-08 10:22:58 +08:00
chenjianxing 529a8b74ac Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 19:34:13 +08:00
chenjianxing 37da6206ea feat: jsonpaht断言推荐 2021-01-07 19:34:00 +08:00
shiziyuan9527 a2856898d6 refactor(测试计划): 性能测试用例按照项目查询 2021-01-07 18:57:12 +08:00
fit2-zhao f70e241602 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 18:32:48 +08:00
fit2-zhao 1852c8296f fix(接口自动化): 场景变量基础页面完成 2021-01-07 18:32:41 +08:00
Captain.B 73f09844bb Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
 2021-01-07 17:57:20 +08:00
Captain.B 460b4daff6 feat: 显示标签列 2021-01-07 17:53:36 +08:00
shiziyuan9527 0e1b379b67 feat(测试计划): 性能测试用例执行 2021-01-07 17:17:44 +08:00
Captain.B a2c1baece6 feat: 测试用例保存tag 2021-01-07 16:03:02 +08:00
song.tianyang a70b8b31ab refactor: 合并分支 feature_1000439 解决冲突 
合并分支 feature_1000439 解决冲突
 2021-01-07 15:26:20 +08:00
Captain.B 18340d16e5 feat: 接口测试用例保存tag 2021-01-07 15:18:52 +08:00
Captain.B 590e6c9a9c Merge remote-tracking branch 'origin/master' 2021-01-07 14:07:42 +08:00
song.tianyang 1909c4267f Merge branch 'feature_1000439' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/APITestController.java
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/api/definition/components/reference/ApiExtendBtns.vue
 2021-01-07 14:06:26 +08:00
Captain.B c609ce254f feat: 接口定义保存tag 2021-01-07 14:04:21 +08:00
song.tianyang 2ebdaf6832 Merge remote-tracking branch 'origin/master' 2021-01-07 13:42:23 +08:00
song.tianyang d208d358be feat: 测试计划增加定时任务,执行接口案例和场景案例 
测试计划增加定时任务,执行接口案例和场景案例
 2021-01-07 13:41:54 +08:00
shiziyuan9527 555d60fb07 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 11:10:53 +08:00
shiziyuan9527 657d800536 feat(测试计划): 测试计划增加性能测试用例 2021-01-07 11:10:19 +08:00
fit2-zhao c0fb16571a fix(接口自动化): 解决sql类型数据源 无法回显问题，并对历史数据进行兼容 2021-01-07 10:41:57 +08:00
shiziyuan9527 87a074310f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-07 10:22:59 +08:00
fit2-zhao d1c179fc5c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 18:27:10 +08:00
fit2-zhao f096e1e52b feat(接口自动化): 循环控制器 2021-01-06 18:26:52 +08:00
shiziyuan9527 42217eb1c6 feat(测试计划): 增加性能测试用例 2021-01-06 18:14:47 +08:00
Captain.B 9bd8a55f2e chore: Sync 2021-01-06 15:26:47 +08:00
Captain.B f02477ce05 Merge remote-tracking branch 'origin/master' 2021-01-06 15:11:32 +08:00
Captain.B a71f4a6610 Merge branch 'tmp' 2021-01-06 15:10:42 +08:00
Captain.B 5952b01646 refactor: 按照迭代次数和执行时间区分性能测试 2021-01-06 14:59:35 +08:00
fit2-zhao 3789365746 feat(接口自动化): 循环控制器 2021-01-06 14:49:33 +08:00
fit2-zhao 5ec2e11ca5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 14:19:11 +08:00
chenjianxing baea09fcae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-06 14:05:47 +08:00
chenjianxing d2fd83389c fix: 解决冲突 2021-01-06 14:01:21 +08:00
fit2-zhao 643db9c863 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/APITestController.java
 2021-01-06 13:49:43 +08:00
fit2-zhao f810d15bfb style(系统管理): 样式调整 2021-01-06 13:45:23 +08:00
fit2-zhao 624970c16d Merge branch 'v1.6' of https://github.com/metersphere/metersphere into v1.6 
# Conflicts:
#	frontend/src/business/components/settings/project/MsProject.vue
 2021-01-06 13:43:30 +08:00
fit2-zhao 09fd2c2ab6 feat(接口自动化): 增加URL唯一性校验开关，控制URL校验规则 2021-01-06 13:38:17 +08:00
chenjianxing f01c7f9d59 refator: 项目列表添加jar包上传 2021-01-06 13:35:27 +08:00
fit2-zhao fc8c997716 feat(接口自动化): 数据迁移初版 2021-01-06 12:24:13 +08:00
song.tianyang 5f26ee9e26 Merge remote-tracking branch 'origin/master' 2021-01-06 10:18:10 +08:00
song.tianyang 9b22917e8c fix: 首页跳转场景修改页面控制套报错 
修复首页跳转场景修改页面控制套报错的问题
 2021-01-06 10:17:55 +08:00
Captain.B e937b3d949 Merge remote-tracking branch 'origin/master' 2021-01-06 10:04:52 +08:00
Captain.B f3dc01d3a9 Merge branch 'v1.6' 2021-01-06 10:04:27 +08:00
song.tianyang b402acfeda fix: 场景跳转数据查询功能失效 
修复场景跳转数据查询功能失效的问题
 2021-01-05 18:20:51 +08:00
song.tianyang 252f5f3c10 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-01-05 18:05:46 +08:00
song.tianyang 9a32e83a01 feat: 接口测试首页优化 
接口测试首页优化
 2021-01-05 17:43:55 +08:00
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