Commit Graph

6983 Commits

Author SHA1 Message Date
刘瑞斌 28acbc4d58
Merge branch 'dev' into pr@dev@feat_mock_info 2021-04-16 11:37:33 +08:00
Captain.B 95d9c198f1 fix(系统设置): 修复 Missing URI template variable, 修复初始化模块状态 2021-04-16 11:35:21 +08:00
song-tianyang d2b53fc94a feat: Mock服务功能开发完成
Mock服务功能开发完成
2021-04-16 11:00:31 +08:00
jianxing 03defc8950
fix: sql 文件冲突 (#2057) 2021-04-16 10:20:02 +08:00
metersphere-bot ad901fc2a0
feat: 项目关联模板 (#2052)
* feat: 自定义字段增删改查

* feat: 测试用例模板相关操作

* feat: 缺陷模板相关操作

* refactor: 代码优化

* refactor: 完善模板编辑

* refactor: 自定义模板资源工作空间隔离

* feat: 项目关联模板

* refactor: 代码规范

* refactor: 代码规范

* refactor: 代码规范

Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
2021-04-16 10:05:04 +08:00
Coooder-X 539d68dcff
refactor(测试跟踪): 测试用例用例步骤、备注等改成富文本框 (#2018)
* refactor(测试跟踪): 测试用例用例步骤、备注等改成富文本框

* style: 修改代码格式

* Update TestCaseStepRichText.vue

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
2021-04-16 09:51:42 +08:00
fit2-zhao f9aece0463 fix(接口自动化): 部分缺陷修复 2021-04-15 20:45:56 +08:00
fit2-zhao c8143a0f1f fix(系统设置): 环境默认数据展示 2021-04-15 17:08:00 +08:00
Captain.B 6cd7fd617b fix(系统设置): 修复禁用模块后没有隐藏入口 2021-04-15 17:07:25 +08:00
shiziyuan9527 bc74933ffc refactor(性能测试): 添加监控表单必填校验 2021-04-15 15:47:22 +08:00
shiziyuan9527 bbf6281627 refactor: 代码规范 2021-04-15 15:47:22 +08:00
shiziyuan9527 37a486bcc5 refactor: 代码规范 2021-04-15 15:47:22 +08:00
Captain.B 034b464a65 feat(性能测试): 性能测试报告页面数据自动更新时间可动态调整 2021-04-15 15:47:22 +08:00
shiziyuan9527 f8822370ad refactor: Prometheus地址添加到配置文件 2021-04-15 15:47:22 +08:00
shiziyuan9527 f7bd3d443d refactor(性能测试): 更改查询步长 2021-04-15 15:47:22 +08:00
shiziyuan9527 3d2bb18b8c refactor(性能测试): 调整监控图表,增加单位 2021-04-15 15:47:22 +08:00
shiziyuan9527 847d7a57a5 refactor(性能测试): 运行时默认监控资源池 2021-04-15 15:47:22 +08:00
Captain.B cb652f431c refactor(性能测试): 编辑资源池增加监控端口 2021-04-15 15:47:22 +08:00
Captain.B 7a3dafe272 refactor(性能测试): 提供类consul的接口 2021-04-15 15:47:22 +08:00
Captain.B aee02ea884 refactor(性能测试): 提供类consul的接口 2021-04-15 15:47:22 +08:00
shiziyuan9527 f101ce900e refactor(性能测试): 修改图表 2021-04-15 15:47:22 +08:00
shiziyuan9527 1807ff3538 feat(性能测试): 测试报告页面添加监控Tab 2021-04-15 15:47:22 +08:00
shiziyuan9527 814b5129eb feat(性能测试): 高级配置下添加监控配置 2021-04-15 15:47:22 +08:00
Captain.B 36f2bb3209 feat(系统设置): 功能模块支持启用、禁用(X-Pack) 2021-04-15 15:23:33 +08:00
fit2-zhao 63e9e0d5cf 冲突问题恢复 2021-04-15 14:50:54 +08:00
fit2-zhao 58593b4337 Merge branch 'v1.8' into pr@master@fix_合并1.8
# Conflicts:
#	frontend/src/business/components/api/automation/report/ApiReportDetail.vue
#	frontend/src/business/components/api/automation/report/components/RequestResult.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/common/components/MsModuleMinder.vue
#	frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
2021-04-15 14:47:03 +08:00
fit2-zhao 1578974237 Merge branch 'v1.8' into pr@master@fix_合并1.8
# Conflicts:
#	frontend/src/business/components/api/automation/report/ApiReportDetail.vue
#	frontend/src/business/components/api/automation/report/components/RequestResult.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/common/components/MsModuleMinder.vue
#	frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
2021-04-15 14:41:51 +08:00
fit2-zhao 8539b5d011 Merge branch 'v1.8' into pr@master@fix_合并1.8
# Conflicts:
#	frontend/src/business/components/api/automation/report/ApiReportDetail.vue
#	frontend/src/business/components/api/automation/report/components/RequestResult.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/common/components/MsModuleMinder.vue
#	frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
2021-04-15 14:14:07 +08:00
fit2-zhao 2187a96878 style(接口自动化): 一键展开按钮样式调整 2021-04-15 11:39:06 +08:00
fit2-zhao 6c46b17f86 feat(接口自动化): 执行策略调整 2021-04-15 10:22:02 +08:00
fit2-zhao 8423f59b9e fix(接口自动化): 1.8版本部分缺陷修复 2021-04-15 10:21:58 +08:00
fit2-zhao 2aca963926 feat(接口自动化 ): 多模式执行功能 2021-04-15 10:21:48 +08:00
fit2-zhao f19f05db17 feat(接口自动化 ): 多模式执行功能 2021-04-15 10:21:48 +08:00
fit2-zhao f6384b935c feat(系统管理): 环境新需求处理 2021-04-15 10:21:48 +08:00
fit2-zhao 94be7cd7e9 Merge branch 'v1.8'
# Conflicts:
#	frontend/src/business/components/api/automation/report/ApiReportDetail.vue
#	frontend/src/business/components/api/automation/report/components/RequestResult.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/common/components/MsModuleMinder.vue
#	frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
2021-04-15 10:20:41 +08:00
fit2-zhao d71226fd02 Merge branch 'v1.8'
# Conflicts:
#	frontend/src/business/components/api/automation/report/ApiReportDetail.vue
#	frontend/src/business/components/api/automation/report/components/RequestResult.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseList.vue
#	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
#	frontend/src/business/components/common/components/MsModuleMinder.vue
#	frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
2021-04-15 10:20:26 +08:00
wenyann 66a5d95f7f fix:代码规范 2021-04-15 10:17:20 +08:00
wenyann 0d3f3c2a2b fix:国际化 2021-04-15 10:17:20 +08:00
wenyann c6c14031da fix: 飞书webhook校验,国际化,变量增加 2021-04-15 10:17:20 +08:00
Coooder-X 78fcad3f42
fix(接口定义): 导出swagger时单个xml格式错误不会终止所有文件导出 (#2020) 2021-04-15 09:41:45 +08:00
Ambitiousliga d7b2318410
fix(测试跟踪):使非只读用户可以编辑测试计划所关联的用例 (#1973) 2021-04-12 19:01:08 +08:00
Coooder-X b5b08ff116
feat(测试跟踪): 测试用例备注 取消长度限制、附件增加txt格式 (#1969) 2021-04-12 18:59:59 +08:00
Tester_Z 3134622871 fix: 修复windows打包内存溢出扩大至4G
Windows执行 npm run build-win
2021-04-12 14:19:20 +08:00
Captain.B acc6e157a3 refactor(接口测试,性能测试): 修改js engine 2021-04-12 14:15:51 +08:00
Captain.B 5cd62ce5d6 feat(性能测试): 性能测试报告页面数据自动更新时间可动态调整 2021-04-12 14:15:51 +08:00
wenyann 71738935e6 feat(系统设置): 飞书机器人 2021-04-12 14:15:51 +08:00
wenyann 560883fbfb feat(系统设置): 飞书机器人 2021-04-12 14:15:51 +08:00
song-tianyang 0a78510ec4 refactor: 处理冲突 2021-04-12 14:15:51 +08:00
metersphere-bot 924dfede1f fix: 接口用例添加步骤没反应 (#1810) 2021-04-12 14:15:51 +08:00
metersphere-bot cd372cf53c fix: 新版本postman导入脚本类型不匹配 (#1809)
Co-authored-by: chenjianxing <jianxing.chen@fit2cloud.com>
Co-authored-by: BugKing <wangzhen@fit2cloud.com>
2021-04-12 14:15:51 +08:00