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

3502 Commits

Author SHA1 Message Date
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
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
song.tianyang 71686be223 Merge remote-tracking branch 'origin/master' 2020-12-23 15:25:31 +08:00
fit2-zhao 39cfe385c4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 15:18:17 +08:00
fit2-zhao 8009ed2945 fix(接口自动化): 部分缺陷修复 2020-12-23 15:17:54 +08:00
shiziyuan9527 d4ec0c44ec fix(测试用例): 修复导入测试用例未刷新模块树的问题 2020-12-23 15:09:48 +08:00
Captain.B b99e219d7c refactor: 重构资源池页面 2020-12-23 15:00:51 +08:00
chenjianxing ae42f30ca5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 14:42:12 +08:00
chenjianxing 9c199766b0 feat: 测试计划-统计报告 2020-12-23 14:38:36 +08:00
Captain.B 69715c2af7 fix: 新增修改资源池数据项提示 2020-12-23 14:36:55 +08:00
Captain.B 19436fff26 fix: 新增修改资源池数据项提示 2020-12-23 14:28:09 +08:00
fit2-zhao 5299e251d7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 13:12:22 +08:00
fit2-zhao 4e01bf5af3 fix(接口自动化): 外部导入和执行重构去除域名部分 2020-12-23 13:11:56 +08:00
song.tianyang b9afa3c298 fix(接口自动化): 定时任务弹框报错 
修复接口自动化定时任务弹框报错的问题
 2020-12-23 12:33:23 +08:00
q4speed fec5cf30f0 Merge remote-tracking branch 'origin/master' 2020-12-23 10:57:59 +08:00
q4speed f1dcd2191a fix(接口测试): 修复条件控制器添加后无法正确显示的bug 2020-12-23 10:57:41 +08:00
fit2-zhao abda6aa758 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-23 10:44:09 +08:00
fit2-zhao 5ceae4727e fix(接口自动化): 修复场景拖拽问题 2020-12-23 10:43:52 +08:00
Captain.B fe4220897b fix: 只读用户权限设置 2020-12-23 10:20:13 +08:00
fit2-zhao a34d9c8ca1 fix(接口自动化): 修改TAG样式 2020-12-23 10:00:02 +08:00
chenjianxing 1fee4b682c fix: 测试计划调整时，名称显示错误 2020-12-22 22:51:18 +08:00
chenjianxing 18afa7a13a fix: 接口用例编辑页面环境无法选择 2020-12-22 22:31:09 +08:00
chenjianxing a7ecfb5ba1 fix: 接口定义sql数据源无法切换 2020-12-22 22:25:34 +08:00
chenjianxing 8f23ae9473 feat: 测试计划接口测试批量执行 2020-12-22 21:58:44 +08:00
chenjianxing 2581666165 fix: 解决冲突 2020-12-22 20:58:27 +08:00
chenjianxing 5a076ed70f fix: 测试计划关联多个项目接口列表出错 2020-12-22 20:55:05 +08:00
song.tianyang 128f98849c Merge remote-tracking branch 'origin/master' 2020-12-22 20:12:02 +08:00
song.tianyang b060bcb389 fix(接口测试功能首页): 修复tips不随机更换、数据统计的缺陷 
修复tips不随机更换的缺陷，改为每次进入页面随机更换tips；修复接口用例数量统计：未覆盖+已覆盖总数超过了接口总数的错误；修复统计已删除至回收站中的接口的错误；修复首页数据每次都要刷新浏览器才更新数据的错误
 2020-12-22 20:11:52 +08:00
fit2-zhao c4197029f7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 20:02:56 +08:00
fit2-zhao 8ed6857960 fix(接口自动化): 修复部分缺陷 2020-12-22 20:02:37 +08:00
song.tianyang cac54095aa Merge remote-tracking branch 'origin/master' 2020-12-22 19:04:29 +08:00
song.tianyang 4552b58b0c feat(接口自动化): 增加定时任务功能 
为场景增加定时任务功能，功能位置放于场景表格每一行都"操作"处
 2020-12-22 19:03:52 +08:00
song.tianyang ae647f79c3 Merge remote-tracking branch 'origin/master' 2020-12-22 20:08:41 +08:00
song.tianyang e997234fda Merge remote-tracking branch 'origin/master' 2020-12-22 20:02:17 +08:00
song.tianyang 5180210910 style: 更改首页统计详情字体 
更改首页统计卡牌右下角的统计详情字体
 2020-12-22 20:02:07 +08:00
Captain.B 5105160715 Merge remote-tracking branch 'origin/master' into master 2020-12-22 18:36:24 +08:00
Captain.B 8659c67c02 fix: 尝试修复firefox无法展示图标的问题 2020-12-22 18:36:05 +08:00
fit2-zhao 2a75fd8d4e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 18:18:50 +08:00
fit2-zhao fb46812176 fix(接口自动化): 修改用例缺陷 2020-12-22 18:18:32 +08:00
Captain.B 5835bc6ab3 refactor(性能测试): 查询报告日志修改 2020-12-22 18:03:56 +08:00
fit2-zhao 8e7b1f7489 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 17:43:02 +08:00
fit2-zhao 93914ed5b6 fix(接口自动化): 修复场景引用缺陷 2020-12-22 17:42:53 +08:00
chenjianxing 9ecb428004 fix: 解决冲突 2020-12-22 17:35:29 +08:00
chenjianxing 471f88aac6 feat: 接口测试关联场景用例 2020-12-22 17:27:30 +08:00
Captain.B bb3845e28f Merge remote-tracking branch 'origin/master' into master 2020-12-22 17:17:06 +08:00
Captain.B 2face9c83a feat: 资源池支持image 2020-12-22 17:16:55 +08:00
fit2-zhao 936b8637d5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-22 17:08:12 +08:00
fit2-zhao 41d063fde7 refactor(接口自动化): 重构标签 2020-12-22 17:07:50 +08:00
shiziyuan9527 5353a1b3b7 refactor(性能测试): 调整样式 2020-12-22 17:02:41 +08:00
fit2-zhao ef2412a3e2 feat(接口自动化): 标签定义 2020-12-22 16:49:47 +08:00
BugKing 2cf68db349 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2020-12-22 16:45:43 +08:00
shiziyuan9527 58a52520b1 fix: 修复LDAP登入请求重定向的问题 2020-12-22 16:34:22 +08:00
BugKing 3f9fe798d7 fix(接口自动化): 修改添加自定义请求名称 label 2020-12-22 16:32:03 +08:00
Captain.B cfd203623e Merge remote-tracking branch 'origin/master' into master 2020-12-22 15:55:59 +08:00
Captain.B 588e5b17eb refactor: 显示avgTransactions 2020-12-22 15:55:14 +08:00
shiziyuan9527 73a24895a7 feat(测试跟踪): 测试计划页面添加评论列表 2020-12-22 15:21:38 +08:00
fit2-zhao 6b83a68db2 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
 2020-12-22 14:08:52 +08:00
fit2-zhao 5b6a4ddd82 fix(接口自动化):修复部分缺陷，合并sql 脚本 2020-12-22 14:05:53 +08:00
wenyann f63b20ba2e Merge remote-tracking branch 'origin/master' 2020-12-22 11:00:22 +08:00
wenyann ec9b3ac37a fix:编辑个人信息，电话必填项 2020-12-22 10:59:47 +08:00
song.tianyang bf400b5d3c Merge remote-tracking branch 'origin/master' 2020-12-22 10:55:16 +08:00
song.tianyang f905aa62cb style: 调整数据统计方位、增加确认框 
调整接口数量统计、接口用力数量统计的不同接口数量统计显示区域的位置；在关闭定时任务时增加确认框防止误操作
 2020-12-22 10:55:02 +08:00
fit2-zhao 41146ad7d1 fix(接口自动化):修复执行缺陷 2020-12-22 10:12:24 +08:00
chenjianxing ecfb1cf2fe refactor: 代码整理 2020-12-21 21:46:15 +08:00
chenjianxing 642de28841 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-21 19:38:04 +08:00
chenjianxing 434bf22bd9 fix: 解决冲突 2020-12-21 19:37:49 +08:00
fit2-zhao 045681c68a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-21 19:28:25 +08:00
fit2-zhao 3d302ac30b fix(接口自动化):修复DUBBO 协议执行缺陷 2020-12-21 19:28:06 +08:00
chenjianxing ab7b06296f fix: 解决冲突 2020-12-21 19:25:46 +08:00
shiziyuan9527 c05723fad2 fix(测试用例): 修复批量编辑用例成功后用例列表显示所有用例的问题 2020-12-21 18:35:29 +08:00
song.tianyang 60d40f48ab fix(接口自动化页面进入报错): 删除过期的页面引用 
删除由于引用了过期画面而导致的console报错
 2020-12-21 18:26:30 +08:00
chenjianxing 1b8291bf0d fix: 解决冲突 2020-12-21 18:22:22 +08:00
song.tianyang 5cbbb73405 Merge remote-tracking branch 'origin/master' 2020-12-21 18:19:31 +08:00
song.tianyang 5b0be270d2 refactor(接口测试功能首页): 接口测试首页样式及统计数据更换 
接口测试首页由于更换了样式、展示数据等，重新开发该页面的
 2020-12-21 18:19:13 +08:00
chenjianxing 8090c2d700 feat: 测试计划接口用例关联 2020-12-21 18:05:19 +08:00
Captain.B e2e740693c Merge remote-tracking branch 'origin/master' into master 2020-12-21 17:58:26 +08:00
Captain.B 95e437f6e5 refactor: 性能测试报告label修改 2020-12-21 17:58:08 +08:00
fit2-zhao 99819b6163 fix(接口自动化):修复共享cookie 问题 2020-12-21 17:54:58 +08:00
shiziyuan9527 6bf11a7334 refactor(测试用例): 修改查看用例页面样式 2020-12-21 17:27:49 +08:00
Captain.B 09b599e7e5 fix: 执行job前设置namespace 2020-12-21 16:59:23 +08:00
fit2-zhao c54d4d5153 fix(接口自动化): 执行完成后刷新列表 2020-12-21 16:19:05 +08:00
fit2-zhao 7f8f571ed4 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
 2020-12-21 16:14:35 +08:00
fit2-zhao de06ed0432 feat(接口自动化): 存储过程执行报告 2020-12-21 16:13:33 +08:00
Captain.B 51142905ad Merge remote-tracking branch 'origin/master' into master 2020-12-21 16:11:03 +08:00
Captain.B 21b4d9c568 refactor: 设置资源池，校验资源池修改 2020-12-21 15:13:47 +08:00
shiziyuan9527 3865bae5a4 fix(测试用例): 查看测试用例页面评论组件只读 2020-12-21 15:12:02 +08:00
song.tianyang 70ba39912d Merge remote-tracking branch 'origin/master' 2020-12-21 14:41:47 +08:00
shiziyuan9527 0540e15e86 feat(测试用例): 查看测试用例页面添加评论组件 2020-12-21 11:13:07 +08:00
fit2-zhao eefcfc84d8 fix(接口定义): 修复用例缺陷 2020-12-21 10:57:25 +08:00
fit2-zhao 0c2e372a13 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-21 10:30:45 +08:00
fit2-zhao e2f6403409 feat(接口自动化): 共享cookie 2020-12-21 10:30:26 +08:00
Captain.B db472877b4 chore: Sync 2020-12-21 09:46:11 +08:00
fit2-zhao 23f0c5d116 feat(接口自动化): 共享cookie 2020-12-18 19:43:50 +08:00
fit2-zhao 419d5b2129 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 18:42:34 +08:00
fit2-zhao 460c1dc976 fix(接口自动化): form -data 格式执行缺陷修复 2020-12-18 18:42:16 +08:00
shiziyuan9527 c0e607ccfc refactor: 删除无用组件 2020-12-18 18:34:48 +08:00
Captain.B 80eaf15b1f chore: Sync 2020-12-18 17:27:46 +08:00
shiziyuan9527 cfe621fe35 refactor(系统设置): 项目描述统一字体 2020-12-18 17:19:49 +08:00
fit2-zhao 616d00024c Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
 2020-12-18 17:14:44 +08:00
fit2-zhao 9ef40e9187 fix(接口自动化): 修复导入场景缺陷 2020-12-18 17:13:57 +08:00
shiziyuan9527 93369cb04a refactor(系统设置): 修改服务集成跳转关联项目路由 2020-12-18 16:40:25 +08:00
fit2-zhao ee9c1ba153 fix(接口自动化): 场景步骤权限控制 2020-12-18 16:37:27 +08:00
shiziyuan9527 f6ab4489be fix(测试计划): 修复输入框提示问题 2020-12-18 16:28:31 +08:00
shiziyuan9527 dc8b661616 fix(系统设置): 修复切换项目缺陷 2020-12-18 15:01:43 +08:00
fit2-zhao 55c26387dd Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 14:31:27 +08:00
fit2-zhao fdc408bfbf fix(接口自动化): 修复导入场景缺陷 2020-12-18 14:31:04 +08:00
wenyann 2ff9cdde0c Merge remote-tracking branch 'origin/master' 2020-12-18 12:58:43 +08:00
wenyann 602e500926 fix:首页切换 2020-12-18 12:58:17 +08:00
fit2-zhao a59238d93c fix(接口自动化): 修复场景步骤移除缺陷 2020-12-18 12:46:09 +08:00
fit2-zhao 096ee6bd5b fix(接口自动化): 修复重构缺陷 2020-12-18 11:35:17 +08:00
song.tianyang ab5fa68921 Merge remote-tracking branch 'origin/master' 2020-12-18 11:26:40 +08:00
fit2-zhao 3a174fcef0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-18 11:14:12 +08:00
fit2-zhao db0b1768a9 fix(接口自动化): 请求路径校验 2020-12-18 11:13:51 +08:00
shiziyuan9527 a4189ecacc fix(系统设置): 修复项目设置缺陷 2020-12-18 11:12:39 +08:00
shiziyuan9527 4ec766605c refactor: i18n 2020-12-18 10:56:18 +08:00
fit2-zhao 75eeae71de fix(接口自动化): 请求路径校验 2020-12-18 10:54:49 +08:00
fit2-zhao 3db39fb276 fix(接口自动化): 修复回收站恢复缺陷 2020-12-18 10:28:28 +08:00
fit2-zhao 3eba438fce fix(接口自动化): 修复报告缺陷 2020-12-18 10:12:29 +08:00
fit2-zhao 80c624d6b7 fix(接口自动化): 修复执行缺陷 2020-12-17 19:30:25 +08:00
fit2-zhao 97e5549bc1 fix(接口自动化): 修复执行缺陷 2020-12-17 19:27:01 +08:00
song.tianyang df2f5df2f7 refactor: 重构首页CSS样式 
清除无效CSS样式、未使用CSS样式
 2020-12-17 19:10:51 +08:00
fit2-zhao f0d45a9aa0 fix(接口自动化): 修复组件缺陷 2020-12-17 19:00:39 +08:00
fit2-zhao 3a7c731376 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/base/mapper/ApiDefinitionExecResultMapper.java
 2020-12-17 18:39:58 +08:00
fit2-zhao 310756d5f7 fix(接口定义): 修复部分缺陷 2020-12-17 18:32:54 +08:00
song.tianyang ac11493d77 fix: 样式定义错误 
修复样式：错误的将局部样式定义成了全局样式
 2020-12-17 18:28:53 +08:00
song.tianyang a14065a0cc Merge remote-tracking branch 'origin/master' 2020-12-17 18:22:55 +08:00
song.tianyang 3e4b38e394 fix: 新旧版本切换时首页展示问题 
修复缺陷：进行新旧版本切换时，接口测试功能的首页没有跟随新旧版本进行切换
 2020-12-17 18:22:18 +08:00
Captain.B f30493a881 chore: Sync 2020-12-17 18:08:37 +08:00
shiziyuan9527 d7f2494f84 fix(系统设置): 修复切换项目缺陷 2020-12-17 17:52:32 +08:00
shiziyuan9527 d7b4c140b7 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 17:43:23 +08:00
song.tianyang 66c01949af feat: 接口测试模块-首页页面展示以及后台接口适配 
接口测试模块-首页开发，包含接口、用例、场景、定时任务、失败案例和运行中任务等功能的开发
 2020-12-17 17:37:19 +08:00
shiziyuan9527 cfdbdb7fa3 fix(系统设置): 修复切换项目缺陷 2020-12-17 16:59:37 +08:00
fit2-zhao e05657fe11 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 16:47:36 +08:00
fit2-zhao 9482d72783 fix(接口定义): 修复部分缺陷 2020-12-17 16:47:18 +08:00
chenjianxing 556ddddd84 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 16:14:16 +08:00
chenjianxing 3b6e1748e8 fix: 添加接口用例，接口定义列表未更新 2020-12-17 16:14:02 +08:00
fit2-zhao 7a43d3d5fd Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 16:08:50 +08:00
fit2-zhao 8408cf902c fix(接口定义): 修复部分缺陷 2020-12-17 16:08:42 +08:00
chenjianxing 09bdbfc04a fix: 搜索用例时显示了新增用例 2020-12-17 16:00:20 +08:00
chenjianxing 65b702c9b5 fix: 复制接口用例没反应 2020-12-17 15:56:54 +08:00
shiziyuan9527 ab7c863acc Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 15:37:49 +08:00
chenjianxing cbf472dceb fix: 接口定义报告详情报错 2020-12-17 15:36:25 +08:00
shiziyuan9527 3f59ca5928 feat(测试跟踪): 测试用例添加评论 2020-12-17 15:35:16 +08:00
chenjianxing ba689c3e27 feat: 接口测试用例关联页面 2020-12-17 15:28:33 +08:00
fit2-zhao 3dda8e849d fix(接口定义): 修复导入API 编辑问题 2020-12-17 15:02:39 +08:00
chenjianxing f377bd251a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 14:34:17 +08:00
chenjianxing 173b7ef59d feat: 接口定义与接口用例切换 2020-12-17 14:33:59 +08:00
fit2-zhao 086b780dbe fix(接口定义): 认证密码长度修改 2020-12-17 13:44:46 +08:00
fit2-zhao 595db19f69 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-17 13:41:07 +08:00
fit2-zhao e18e136b27 fix(接口定义): 修复部分缺陷 2020-12-17 13:40:50 +08:00
BugKing cca4e4f129 refactor: 修改版本号 2020-12-17 12:55:56 +08:00
fit2-zhao 1c184a3865 fix(接口定义): 修复部分缺陷 2020-12-17 12:15:20 +08:00
wenyann 57d1518ff6 fix:空指针 2020-12-17 11:26:18 +08:00
fit2-zhao 45e1ecb9fa fix(接口自动化): 部分缺陷修复 2020-12-16 19:23:30 +08:00
fit2-zhao 6820c599b0 feat(接口定义): 其他设置 2020-12-16 18:38:59 +08:00
fit2-zhao 56d8d66e92 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-12-16 17:33:42 +08:00
fit2-zhao 8ac28a233f fix(接口自动化): 修复场景复制缺陷 2020-12-16 17:30:47 +08:00
chenjianxing 992b367f53 fix: 解决冲突 2020-12-16 17:04:45 +08:00
chenjianxing 7d1296b6d0 refactor: 重构apicaselist 2020-12-16 17:01:31 +08:00
wenyann 8342b10f0a Merge remote-tracking branch 'origin/master' 2020-12-16 16:38:59 +08:00
wenyann 09fabf35f2 fix:placeholder 2020-12-16 16:38:22 +08:00