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

4442 Commits

Author SHA1 Message Date
shiziyuan9527 f5796eb602 fix(测试跟踪): 修复首页跳转问题 2021-03-26 14:14:40 +08:00
Captain.B 371628ba54 fix: 处理冲突 2021-03-26 14:10:04 +08:00
Captain.B cb4ad5bca4 Merge branch 'master' into compare 
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
 2021-03-26 14:04:21 +08:00
Captain.B 6fcc8536d0 chore: sync 2021-03-26 14:00:34 +08:00
wenyann deaf05dd5f fix:修复编辑用例js报错 2021-03-26 13:14:43 +08:00
fit2-zhao e903441002 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-26 11:21:52 +08:00
fit2-zhao ba76c82851 fix(接口自动化): 修复复制场景，场景变量不能编辑问题 2021-03-26 11:21:38 +08:00
Captain.B 767faf9dfe fix: 尝试修复表格固定列之后错乱的问题 2021-03-26 09:52:03 +08:00
fit2-zhao 6257fce4a9 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 19:34:48 +08:00
Captain.B ef6c7ae83c chore: sync 2021-03-25 19:26:42 +08:00
Captain.B 612d8438c9 Merge remote-tracking branch 'origin/v1.8' into v1.8 2021-03-25 19:25:24 +08:00
Captain.B b4bb64f9da fix(性能测试): 修复最大并发数没有按照资源池来限制的bug 
Closes #1708
 2021-03-25 19:25:08 +08:00
fit2-zhao 0bbd35a493 Merge branch 'v1.8' of https://github.com/metersphere/metersphere into v1.8 2021-03-25 18:40:17 +08:00
fit2-zhao 12a32b8bc4 fix(接口自动化): 修复场景移动后，移动到的模块名称不能修改问题 2021-03-25 18:40:11 +08:00
shiziyuan9527 a8b54c9d74 refactor: 打开环境配置时默认选中当前配置 2021-03-25 18:33:03 +08:00
fit2-zhao c43a258780 fix(接口自动化): 修复jmx导出消息体数据类型设置错误问题 2021-03-25 17:53:26 +08:00
song.tianyang 24c9b5d0a1 fix: 文档不超过5个数据时下滚出现问题 
文档不超过5个数据时下滚出现问题
 2021-03-25 17:02:59 +08:00
Captain.B 1c773f83de fix: 尝试修复表格固定列之后错乱的问题 2021-03-25 16:57:15 +08:00
Captain.B 8328cab574 chore: sync 2021-03-25 15:44:06 +08:00
chenjianxing 25d11cd5e6 Merge branch 'v1.8' of github.com:metersphere/metersphere into v1.8 2021-03-25 15:33:58 +08:00
Captain.B 806772a339 fix(测试跟踪): 修复planId可能为空调用后台报错的问题 2021-03-25 14:54:59 +08:00
fit2-zhao e2ae033d87 fix(接口自动化): 修复if条件不起作用问题 2021-03-25 14:44:34 +08:00
chenjianxing fa78e9a7f5 refactor: 去掉控制台打印 2021-03-25 14:08:54 +08:00
chenjianxing 21bf611d2a Merge branch 'master' into v1.8 2021-03-25 14:06:20 +08:00
chenjianxing 7ac98d98cf fix: 测试用例列表标签显示问题 2021-03-25 14:05:37 +08:00
Captain.B 08d46862eb chore: sync 2021-03-25 12:24:45 +08:00
Captain.B 6e97d412ee fix(性能测试): 修复用例和场景转换性能测试保存文件的问题 2021-03-25 12:22:07 +08:00
song.tianyang cf39bb066d Merge remote-tracking branch 'origin/master' 2021-03-25 12:02:19 +08:00
song.tianyang 7780bf980d fix: 转性能测试增加参数 
转性能测试增加参数
 2021-03-25 11:59:54 +08:00
Captain.B 4aadacdf98 Merge remote-tracking branch 'origin/master' 2021-03-25 11:20:46 +08:00
Captain.B 21de1ba11f fix(性能测试): 提供文件更新的功能 2021-03-25 11:20:32 +08:00
song.tianyang abe7b9fae8 Merge remote-tracking branch 'origin/master' 2021-03-25 11:10:18 +08:00
song.tianyang 28b2048fcb fix: 测试计划关联跨项目场景用例，批量选中不显示数量的问题 
测试计划关联跨项目场景用例，批量选中不显示数量的问题
 2021-03-25 11:08:53 +08:00
fit2-zhao e0fd1422ab fix(接口自动化): 去除最大化关闭按钮 2021-03-25 11:08:17 +08:00
shiziyuan9527 83ee946f31 fix(测试跟踪): 修复测试评审关联用例页面默认未选中当前项目的问题 2021-03-25 10:24:41 +08:00
Captain.B 4e270cd409 fix(性能测试): 保证每次从接口测试都能创建新的性能测试 2021-03-25 10:20:36 +08:00
Captain.B c6319bf763 Merge remote-tracking branch 'origin/master' 2021-03-25 10:15:50 +08:00
Captain.B 0db75e1b12 fix(性能测试): 保证每次从接口测试都能创建新的性能测试 2021-03-25 10:15:33 +08:00
fit2-zhao b1e48675c1 refactor(接口自动化): 优化部分代码 2021-03-25 10:02:57 +08:00
chenjianxing 6a45fe5f57 fix: 页面刷新projectId为空 2021-03-25 09:49:34 +08:00
wenyann 52ef34c78b fix:jenkins通知 2021-03-25 08:41:01 +08:00
wenyann 51948d79a0 Merge remote-tracking branch 'origin/master' 2021-03-25 01:46:29 +08:00
wenyann 6c1daf4620 fix: 初始化自定义表头 2021-03-25 01:45:56 +08:00
Captain.B 0664c5a569 fix(性能测试): 修复从接口自动化创建性能测试没有场景的bug 2021-03-25 00:19:39 +08:00
Captain.B 73e9824c5f chore: sync 2021-03-24 23:05:38 +08:00
chenjianxing 8c10f3d5b4 refactor: 初始化vuex清除projectId 2021-03-24 22:25:59 +08:00
chenjianxing f80f6c74d1 fix: 工作空间无项目时报错 2021-03-24 22:21:51 +08:00
chenjianxing 6dd49752fc Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 22:13:10 +08:00
chenjianxing 6a79dcba08 refactor: 模块名称不能带'\' 2021-03-24 22:12:58 +08:00
Captain.B 51e820d697 refactor(测试跟踪): 删掉不用的代码 2021-03-24 21:56:29 +08:00
chenjianxing d03976d8e1 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 21:30:17 +08:00
chenjianxing 519c868418 refactor: 测试用例模块名称长度改为100 2021-03-24 21:30:07 +08:00
song.tianyang 9d134f85a4 Merge remote-tracking branch 'origin/master' 2021-03-24 20:20:49 +08:00
song.tianyang c90ab047bb fix: 修复接口定义-接口列表-文档-仅选中get请求接口-按更新时间从前到后显示，选中某个接口后，焦点不是选中的接口的问题 
修复接口定义-接口列表-文档-仅选中get请求接口-按更新时间从前到后显示，选中某个接口后，焦点不是选中的接口的问题
 2021-03-24 20:18:36 +08:00
fit2-zhao a611768e52 fix(接口自动化): 去掉脚本成功后缓存 2021-03-24 20:15:37 +08:00
fit2-zhao 0948132bae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 20:11:32 +08:00
chenjianxing 406a8ff935 fix: 测试计划-脑图用例状态未更新 2021-03-24 20:04:44 +08:00
chenjianxing 0fa16caf5a Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 19:57:18 +08:00
Coooder-X f115f25f87
fix: 测试计划的通过率前端值类型转换 (#1700) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* feat(测试计划): 执行用例或定时任务结束后，自动更新测试计划的状态

* fix: 测试计划的通过率前端值类型转换

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-03-24 19:54:14 +08:00
chenjianxing 8cb054df86 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 19:53:19 +08:00
chenjianxing 21a4586ddc refactor: 编辑新增测试用例实时更新脑图 2021-03-24 19:53:08 +08:00
fit2-zhao 4c3e69cdf1 fix(接口自动化): 修复引用步骤执行结果内容运行复制 2021-03-24 19:27:11 +08:00
BugKing 5fce9a65bd Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-24 19:15:04 +08:00
BugKing 77a550dd3a refactor: 修改版本号 2021-03-24 19:14:54 +08:00
wenyann beac8a9a14 Merge remote-tracking branch 'origin/master' 2021-03-24 19:11:18 +08:00
wenyann e9c004d8ef fix:merge 2021-03-24 19:11:00 +08:00
Captain.B dfb0f1c12f Merge remote-tracking branch 'origin/master' 2021-03-24 19:07:14 +08:00
wenyann 95baefb1c9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseEdit.vue
 2021-03-24 19:07:06 +08:00
Captain.B d92526ab4e chore: sync 2021-03-24 19:06:59 +08:00
song.tianyang 27e405fde5 Merge remote-tracking branch 'origin/master' 2021-03-24 19:05:17 +08:00
shiziyuan9527 f9eba24408 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/track/case/components/TestCaseEdit.vue
 2021-03-24 19:00:05 +08:00
song.tianyang 6ee42fbbea fix: 修复工作空间权限问题 
修复工作空间权限问题
 2021-03-24 18:59:15 +08:00
shiziyuan9527 0abec56775 fix(测试跟踪): 修复新建用例缺陷 2021-03-24 18:59:10 +08:00
wenyann 22d437cc85 fix:projectId 2021-03-24 18:58:26 +08:00
fit2-zhao c3937b1c44 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 18:58:05 +08:00
wenyann ad5346d7e8 fix:合并 2021-03-24 18:52:07 +08:00
fit2-zhao fca46fd9e7 fix(接口定义): 修复另存新接口路径不更新问题 2021-03-24 18:51:24 +08:00
wenyann efae6aae5b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/track/case/components/TestCaseEdit.vue
 2021-03-24 18:40:05 +08:00
wenyann 53fc7b6eaf fix:创建用例关联测试显示问题 2021-03-24 18:33:56 +08:00
fit2-zhao 637f0ea707 fix(接口自动化): 修复另存接口协议错误问题 2021-03-24 18:10:22 +08:00
Captain.B ebc1013c89 Merge remote-tracking branch 'origin/master' 2021-03-24 17:54:07 +08:00
fit2-zhao 9a6b47051b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 17:53:56 +08:00
shiziyuan9527 599a78995c fix(场景自动化): 跨项目sql用例环境问题 2021-03-24 17:52:26 +08:00
Captain.B 4b9b9f4953 Merge remote-tracking branch 'origin/master' 2021-03-24 17:51:59 +08:00
chenjianxing 3e52d67914 fix: 新增编辑用例更新脑图 2021-03-24 17:51:51 +08:00
Captain.B ac1a5f1d77 refactor: 邮件模版显示修改 2021-03-24 17:51:41 +08:00
Coooder-X e22118de55
fix: 接口定义http响应体、状态码参数前的checkbox不显示 (#1698) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* fix: 接口定义http响应体、状态码参数前的checkbox不显示
 2021-03-24 17:50:49 +08:00
fit2-zhao 321f2b4db9 fix(接口自动化): 查看场景变量时禁用操作 2021-03-24 17:48:02 +08:00
BugKing d1c1957a10 Merge branch 'master' of https://github.com/metersphere/metersphere into master 2021-03-24 17:43:12 +08:00
BugKing 98a4b77dca style(接口测试): 前后置脚本编辑框限定最小高度 2021-03-24 17:40:19 +08:00
song.tianyang 27db2f0153 Merge remote-tracking branch 'origin/master' 2021-03-24 17:38:57 +08:00
song.tianyang 70d15e2ee1 fix: 测试计划的定时任务，下次执行时间不是实时的问题；系统设置-批量添加用户到工作空间添加角色功能优化 
测试计划的定时任务，下次执行时间不是实时的问题；系统设置-批量添加用户到工作空间添加角色功能优化
 2021-03-24 17:35:27 +08:00
fit2-zhao 5b4740f838 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 17:25:07 +08:00
fit2-zhao 8cf3e3f9ce fix(接口自动化): 修复导出jmx校验问题 2021-03-24 17:25:00 +08:00
Captain.B 95be5207b2 Merge remote-tracking branch 'origin/master' 2021-03-24 17:01:36 +08:00
Captain.B f0456b36e9 fix: 修复只读用户点击保存用例跳转到设置的bug 2021-03-24 17:01:19 +08:00
fit2-zhao bd0a6132e6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 16:18:22 +08:00
fit2-zhao f8d171d124 fix(接口定义): 接口快捷调试另存新用例 问题修复 2021-03-24 16:18:08 +08:00
shiziyuan9527 35217aeef9 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 15:57:03 +08:00
shiziyuan9527 2a74eedfb6 fix: 修复路由跳转错误 2021-03-24 15:56:35 +08:00
song.tianyang a365dc0b42 Merge remote-tracking branch 'origin/master' 2021-03-24 15:54:13 +08:00
song.tianyang bf73aa5e30 fix: 解决文档不现实回收站内的接口信息问题 
解决文档不现实回收站内的接口信息问题
 2021-03-24 15:53:07 +08:00
fit2-zhao 3c328f4826 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 15:39:40 +08:00
fit2-zhao 7ec678acad fix(接口自动化): 修复步骤另存新接口问题 2021-03-24 15:39:34 +08:00
shiziyuan9527 792a5afa7d fix(场景自动化): 修复步骤与环境设置不匹配的问题 2021-03-24 14:13:47 +08:00
shiziyuan9527 c99e59a044 fix(场景自动化): 修复导入场景时列表数据显示错误的问题 2021-03-24 13:47:29 +08:00
shiziyuan9527 f13746e655 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 13:40:23 +08:00
Captain.B 5a25f3ad97 Merge remote-tracking branch 'origin/master' 2021-03-24 13:30:26 +08:00
Captain.B 50c71ac1f9 refactor(性能测试): 项目文件管理页面重构 2021-03-24 13:30:04 +08:00
fit2-zhao 0655c509bf Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 13:24:14 +08:00
fit2-zhao 034042fca5 fix(接口定义): 修复JSON-SCHEMA 自定义转换器，修复场景步骤引用权限控制问题 2021-03-24 13:23:53 +08:00
Captain.B b6ec991ce7 refactor(性能测试): 新建和编辑性能测试上传文件逻辑修改 2021-03-24 13:20:32 +08:00
shiziyuan9527 b86a220007 refactor(测试计划): 去掉无用代码 2021-03-24 11:43:51 +08:00
shiziyuan9527 1b5288756a fix(测试计划): 测试计划执行时未显示测试步骤 2021-03-24 11:27:38 +08:00
song.tianyang 4d25ab60a0 Merge remote-tracking branch 'origin/master' 2021-03-24 11:18:49 +08:00
song.tianyang 00e2932148 refactor: 解决无效参数导致的页面报错 
解决无效参数导致的页面报错
 2021-03-24 11:18:38 +08:00
chenjianxing b3675c3a41 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-24 11:15:30 +08:00
chenjianxing d4f813decd refactor: 关联接口用例搜索描述 2021-03-24 11:15:16 +08:00
song.tianyang 2c5c924244 Merge remote-tracking branch 'origin/master' 2021-03-24 11:10:10 +08:00
song.tianyang 53fb641a10 refactor: 解决页面拖拽导致esb请求响应表格断行的问题 
解决页面拖拽导致esb请求响应表格断行的问题  参数名的宽度稍微增加；取消描述字段的长度限制，改为最小长度
 2021-03-24 11:09:54 +08:00
BugKing bfe6e732d5 style(测试跟踪): 修改测试计划用力列表标签列格式 2021-03-24 10:32:15 +08:00
fit2-zhao 3d321b37c6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-24 10:15:55 +08:00
fit2-zhao b02868245b fix(接口定义): 用例执行dubbo协议不强制选择环境 2021-03-24 10:15:36 +08:00
Coooder-X 36e3e001d4
feat(测试计划): 执行用例或定时任务结束后，自动更新测试计划的状态 (#1694) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: schedule表对旧数据name字段兼容的补充

* feat(测试计划): 执行用例或定时任务结束后，自动更新测试计划的状态
 2021-03-24 10:06:01 +08:00
Captain.B d2fabf8e93 fix: 修复创建性能测试查询文件的提示，计算图表不去单个计算 2021-03-24 09:55:08 +08:00
shiziyuan9527 3cc4c181b8 fix(接口自动化): 导入场景项目名称显示问题 2021-03-23 22:23:38 +08:00
song.tianyang bd48741020 refactor: 按照命名规范重新命名文件夹名称 
按照命名规范重新命名文件夹名称
 2021-03-23 22:12:21 +08:00
song.tianyang 4293aa0f3d refactor: 按照命名规范重新命名文件夹名称 
按照命名规范重新命名文件夹名称
 2021-03-23 22:10:56 +08:00
song.tianyang 7b55b15b5a fix: 更改接口文档搜索框的位置 
更改接口文档搜索框的位置
 2021-03-23 22:03:28 +08:00
song.tianyang ed7aeb10e5 Merge remote-tracking branch 'origin/master' 2021-03-23 21:46:37 +08:00
shiziyuan9527 01d2f96ff6 fix: 修复组织和空间名过长显示不正确 
Closes #1693
 2021-03-23 21:39:35 +08:00
song.tianyang 47ec0a77da fix: API文档分享链接失效的问题 
API文档分享链接失效的问题
 2021-03-23 21:27:19 +08:00
chenjianxing 44f289f752 fix: msDrawer随窗口大小变化 2021-03-23 21:26:51 +08:00
chenjianxing a6d3fb5694 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 20:59:56 +08:00
chenjianxing e92d346202 refactor: 脑图非全屏高度适配 2021-03-23 20:59:46 +08:00
song.tianyang 691cf5a380 Merge remote-tracking branch 'origin/master' 2021-03-23 20:20:08 +08:00
chenjianxing 17e9f41833 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-23 20:15:52 +08:00
chenjianxing 9c4b6614bf fix: 解决冲突 2021-03-23 20:15:26 +08:00
Captain.B 0c54407aca Merge remote-tracking branch 'origin/master' 2021-03-23 20:11:02 +08:00
chenjianxing b2514df363 fix: 测试跟踪从vuex获取项目id 2021-03-23 20:10:55 +08:00
Captain.B b60b534f48 fix: 修复创建性能测试查询文件是否存在的bug 2021-03-23 20:10:47 +08:00
shiziyuan9527 266fbd008f fix(测试跟踪): 修复首页图表数据错误的问题 2021-03-23 19:44:50 +08:00
song.tianyang 9e57b0e45e fix: 文档：将搜索栏上移，并减少行间距 
文档：将搜索栏上移，并减少行间距
 2021-03-23 19:42:15 +08:00
fit2-zhao d744621491 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-23 19:37:56 +08:00
fit2-zhao c02b8dff1b fix(接口定义，接口自动化): 点击树节点 ，右侧Tab恢复到列表页面 2021-03-23 19:37:48 +08:00
fit2-zhao 41c46740b3 fix(接口定义): 切换code选项格式调整 2021-03-23 19:05:42 +08:00
wenyann 186e5efa1d fix:创建用例报错 2021-03-23 18:43:25 +08:00
song.tianyang b2daeb76c2 Merge remote-tracking branch 'origin/master' 2021-03-23 18:26:34 +08:00
fit2-zhao 4640746de5 fix(接口自动化): 场景步骤协议展示及另存为新接口问题修复 2021-03-23 18:20:31 +08:00
BugKing a1fdc25a96 style(性能测试): 修改性能测试压力配置样式 2021-03-23 18:10:06 +08:00