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

3770 Commits

Author SHA1 Message Date
chenjianxing 03a8401b1b fix: 修复_fileter和_sort方法引用 2021-02-03 19:22:34 +08:00
chenjianxing 9b66d9c261 Merge branch 'v1.7' 2021-02-03 19:07:03 +08:00
chenjianxing 9ed341da50 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 19:05:12 +08:00
chenjianxing c115ea22e5 refactor: 代码优化 2021-02-03 19:04:50 +08:00
fit2-zhao 76bcd14500 fix(接口定义): 排序修改 2021-02-03 18:50:02 +08:00
chenjianxing 947ec17383 refactor: 抽取表格相关代码 2021-02-03 18:17:29 +08:00
fit2-zhao e69ee40438 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-03 17:48:37 +08:00
chenjianxing 937ce3f3c6 refactor: jar包管理优化 2021-02-03 17:21:20 +08:00
song.tianyang 683c533db0 Merge branch 'v1.7' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/track/service/TestPlanService.java
#	frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
#	frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
 2021-02-03 17:11:04 +08:00
song.tianyang e3903adcd0 refactor: 添加国际化字段 
添加国际化字段
 2021-02-03 16:57:04 +08:00
shiziyuan9527 117571cd94 feat: 组织、工作空间下拉列表增加滚动条 2021-02-03 16:43:59 +08:00
fit2-zhao a803225644 fix(接口定义): 历史JDBC数据兼容处理 2021-02-03 15:25:51 +08:00
fit2-zhao 54d88a077f fix(场景自动化): 历史数据兼容处理 2021-02-03 14:22:28 +08:00
Coooder-X 21f8e54069 fit: 解决冲突 2021-02-03 11:54:44 +08:00
Coooder-X 9a9f8f628b fear: (系统设置) 项目-jar包管理，支持查找 (#1350) 2021-02-03 11:23:17 +08:00
chenjianxing 171c7bc3b9 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 11:22:37 +08:00
Coooder-X 893485d592
fear: (系统设置) 项目-jar包管理，支持查找 (#1350) 2021-02-03 11:20:15 +08:00
chenjianxing b6f59bb15c fix: 滚动条宽度变化导致关联页面页面变形 2021-02-03 11:18:54 +08:00
fit2-zhao 3ba281e53c Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-03 10:47:22 +08:00
fit2-zhao f41beb6147 style(接口自动化): 整体展示样式优化 2021-02-03 10:46:56 +08:00
song.tianyang a09b8afb52 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-03 10:38:35 +08:00
song.tianyang 8e0d57a6d2 fix: 测试计划-关联功能测试用例-查看报告统计-切回到功能测试用例页后左侧模块列消失 
解决测试计划-关联功能测试用例-查看报告统计-切回到功能测试用例页后左侧模块列消失的缺陷
 2021-02-03 10:37:22 +08:00
chenjianxing f26b96a38b fix: 国际化 2021-02-02 19:42:14 +08:00
chenjianxing 80f34e4056 fix: 删除无用代码 2021-02-02 19:22:59 +08:00
chenjianxing ee1e55ac29 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-02 18:54:19 +08:00
chenjianxing 3e4e1272e6 fix: 测试计划场景列表tag显示问题 2021-02-02 18:53:57 +08:00
fit2-zhao 0217f0e0ed Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-02 17:46:13 +08:00
fit2-zhao c74e88c3f3 refactor(接口自动化): 场景导入 ms，postman 基本完成 2021-02-02 17:46:00 +08:00
shiziyuan9527 f8d5ad2363 feat(用例评审): 批量修改评审结果 2021-02-02 17:29:25 +08:00
chenjianxing f70995e175 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-02 16:14:45 +08:00
chenjianxing 6dcd2c5f48 fix: 模块移动国际化 2021-02-02 16:14:28 +08:00
song.tianyang c504b51625 fix: 针对场景批量添加到测试计划，不选计划的提示优化 
针对场景批量添加到测试计划，不选计划的提示优化
 2021-02-02 15:07:31 +08:00
song.tianyang 311e163a4c fix: 接口定义、场景、测试计划功能用例的表格，列拖动设置最小拖动植 
接口定义、场景、测试计划功能用例的表格，列拖动设置最小拖动植，防止因表头换行导致的表格错位问题
 2021-02-02 14:41:29 +08:00
song.tianyang 67a2752439 fix: 列拖宽时字符显示不完整 
解决列拖宽时字符显示不完整的问题
 2021-02-02 13:57:44 +08:00
chenjianxing f84f5fbbb3 refactor: 滚动条加粗 2021-02-02 12:06:16 +08:00
Coooder-X 66e9f091c2 fix: 解决 接口自动化-添加场景变量，焦点错误切换 (#1342) 2021-02-02 11:16:21 +08:00
Coooder-X eb589b741e
fix: (接口定义) 将接口另存为新用例后，方法名会被前端自动替换为协议 (#1341) 2021-02-02 11:02:19 +08:00
Coooder-X bd2596a603
fix: 解决 接口自动化-添加场景变量，焦点错误切换 (#1342) 2021-02-02 11:01:49 +08:00
Captain.B d21ec14290 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 10:54:08 +08:00
Captain.B 99b46de258 fix: 修复下载jtl过大导致oom的问题 2021-02-02 10:53:55 +08:00
fit2-zhao 5272593a61 refactor(接口定义): 去除多余 日志输出 2021-02-02 10:03:26 +08:00
fit2-zhao 141f69e374 fix(接口自动化): 修复DUBBO协议快捷调试 method 错误问题 2021-02-02 10:02:04 +08:00
chenjianxing 0f67b6fc9f fix: 接口测试转性能测试报错 2021-02-01 20:22:15 +08:00
chenjianxing acc2a27d69 refactor: jar包管理加滚动条 2021-02-01 20:13:05 +08:00
chenjianxing fa457c1aa8 fix: TCP自定义请求 2021-02-01 20:07:12 +08:00
chenjianxing b136576c40 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-01 18:51:26 +08:00
chenjianxing 50d3f75a33 fix: 无法使用环境的变量 2021-02-01 18:50:54 +08:00
wenyann 3cd7fa2620 fix: 手机号不必填 2021-02-01 18:50:45 +08:00
wenyann 89d060b40c fix: 修改手机号 2021-02-01 18:48:56 +08:00
wenyann 6cc2b73d67 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 
 Conflicts:
	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-02-01 17:40:43 +08:00
wenyann 0077a4f047 feat: 接口定义批量移动 2021-02-01 17:37:20 +08:00
wenyann 89ad020b38 feat: 接口定义批量移动 2021-02-01 17:36:45 +08:00
fit2-zhao c94aab0219 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-01 16:04:17 +08:00
Coooder-X 384711ee8b fix:(接口测试) 解决场景步骤-等待控制器ctrl+s保存失败问题 (#1331) 2021-02-01 15:54:12 +08:00
Coooder-X 31c00e1271 fix: 系统设置-创建项目，取消回车保存功能 (#1329) 2021-02-01 15:54:00 +08:00
Coooder-X ecf4d9437b fix: 修复 系统设置-创建用户-手机号15和16号段不合法问题 (#1328) 2021-02-01 15:53:50 +08:00
Coooder-X 81d5ad7848 fix: (测试计划) 修复 测试计划-修改状态后时间显示有误 (#1291) 2021-02-01 15:53:38 +08:00
chenjianxing 32c414d8d0 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-01 15:52:21 +08:00
Coooder-X 56dfd41f46
fix:(接口测试) 解决场景步骤-等待控制器ctrl+s保存失败问题 (#1331) 2021-02-01 15:51:55 +08:00
Coooder-X a858b2cbe1
fix: 系统设置-创建项目，取消回车保存功能 (#1329) 2021-02-01 15:51:33 +08:00
Coooder-X ec973454f0
fix: 修复 系统设置-创建用户-手机号15和16号段不合法问题 (#1328) 2021-02-01 15:51:07 +08:00
chenjianxing 19b778dd36 fix: TCP自定义请求 2021-02-01 15:49:13 +08:00
shiziyuan9527 f9f897c027 refactor(测试计划): 清理无用代码 2021-02-01 15:21:22 +08:00
song.tianyang 32f734a445 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-01 15:03:14 +08:00
song.tianyang 879268610d fix: 固定列的表格，列宽设置 
针对固定列的表格，设置最小列宽，避免拖动过程中由于表头换行导致的表格固定列和普通列的错位
 2021-02-01 15:02:53 +08:00
fit2-zhao 561c9fea71 feat(接口自动化): 添加导入导出 2021-02-01 14:35:53 +08:00
Coooder-X 7aa5a6fc5c
fix: (测试计划) 修复 测试计划-修改状态后时间显示有误 (#1291) 2021-02-01 14:26:51 +08:00
Captain.B 2fe9ee15a2 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-01 14:01:16 +08:00
Captain.B 9752736e3a fix: 修复登录页面图片位置和显示title不对的bug 2021-02-01 14:00:21 +08:00
chenjianxing faaf58decf Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-01 13:50:45 +08:00
chenjianxing b02b1727ff fix: 解决冲突 2021-02-01 13:50:24 +08:00
song.tianyang 37feff4281 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-01 13:43:42 +08:00
song.tianyang 2d543af110 refactor: 重新设置接口测试-案例列表的部分列宽 
重新设置接口测试-案例列表的部分列宽
 2021-02-01 13:43:19 +08:00
chenjianxing 7ea1d3bcd6 fix: 引用的场景和接口测试复制和删除没反应 2021-02-01 11:57:02 +08:00
fit2-zhao 13407a007e fix(接口自动化): schema 图标修改 2021-02-01 11:04:27 +08:00
chenjianxing 26ae02300e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-01 10:58:59 +08:00
fit2-zhao 6015752196 fix(接口自动化): 完整url 处理判断 2021-02-01 10:04:52 +08:00
fit2-zhao 5f45c0d486 fix(接口自动化): 批量添加到测试计划，关闭处理 2021-01-29 18:14:39 +08:00
fit2-zhao 344e615ddb fix(接口自动化): 引用请求允许执行和复制操作 2021-01-29 17:50:50 +08:00
fit2-zhao 1f408959bc Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-01-29 16:33:44 +08:00
shiziyuan9527 58b6fc1534 refactor(系统设置): 组织菜单下工作空间列表样式优化 2021-01-29 15:57:56 +08:00
fit2-zhao f39d1d4339 fix(接口自动化): 修复场景高级结果处理 2021-01-29 15:09:55 +08:00
fit2-zhao 87d65f1c6f fix(接口定义): 修复tcp快捷调试问题 2021-01-29 14:52:53 +08:00
fit2-zhao 1b3a95fde2 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-01-29 14:45:36 +08:00
fit2-zhao fa9a0f6023 fix(接口自动化): 修复调试时csv不起作用问题 2021-01-29 14:45:18 +08:00
fit2-zhao 43137f54e4 fix(接口定义): 修复历史数据数据源无法选择问题 2021-01-29 14:11:12 +08:00
Captain.B fcf9c334a9 Merge branch 'v1.7' 2021-01-29 13:45:35 +08:00
wenyann 5ad5d1c702 fix: 空指针异常 2021-01-29 11:50:41 +08:00
wenyann 0b1a1e0135 fix: 默认值修改 2021-01-29 11:12:37 +08:00
wenyann 86c079c62a feat: swagger定时同步 2021-01-29 11:08:52 +08:00
Captain.B 1674cd44a7 refactor: 通知页面的按钮间距修改 2021-01-29 10:42:18 +08:00
fit2-zhao 871f1cbb51 fix(接口自动化): 场景变量删除问题修复 2021-01-28 18:35:38 +08:00
fit2-zhao ea79196478 fix(接口定义): 快捷调试默认放到bug目录下 2021-01-28 18:03:18 +08:00
fit2-zhao 21935279ce fix(接口定义): 复制优化 2021-01-28 16:54:49 +08:00
chenjianxing 381784d533 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 16:45:16 +08:00
chenjianxing 43aea99186 fix: 接口测试首页控制台报错 2021-01-28 16:45:01 +08:00
fit2-zhao 3bbed97a09 fix(接口自动化): 引用场景不能编辑，只能查看 2021-01-28 16:41:50 +08:00
fit2-zhao ed3dc1c25f fix(接口定义): i18n 名称提示问题修复 2021-01-28 16:36:06 +08:00
fit2-zhao 2df92c398f fix(场景自动化): 修复快捷调试相关问题 2021-01-28 16:25:33 +08:00
fit2-zhao 26a1acec56 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 16:17:56 +08:00
fit2-zhao cd33380763 fix(场景自动化): 修复认证问题 2021-01-28 16:17:14 +08:00
chenjianxing 04eab6633e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 15:31:09 +08:00
chenjianxing 48e4b0806e fix: 部分页面开启两个不项目窗口不同projectId问题 2021-01-28 15:30:44 +08:00
Captain.B 0b3b3f7d72 Merge branch 'v1.7' 2021-01-28 15:04:23 +08:00
Captain.B 215a181d23 fix: 修复添加认证源名称提示不对的问题 2021-01-28 14:58:09 +08:00
chenjianxing bacfd8fc64 fix: 登入页面文字描述 2021-01-28 14:47:44 +08:00
Captain.B 65446c1bb6 Merge branch 'master' into v1.7 2021-01-28 14:36:53 +08:00
Captain.B 0d366ce320 Merge remote-tracking branch 'origin/master' 2021-01-28 14:24:07 +08:00
Captain.B 05f543cb51 fix: 修复登录后系统参数配置-显示设置和认证设置不显示 2021-01-28 14:23:47 +08:00
chenjianxing b87d046dca Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 14:10:59 +08:00
chenjianxing 801e07da1a fix: 关联场景用例tag显示问题 2021-01-28 14:10:41 +08:00
fit2-zhao 04e30ba664 style(接口自动化): 修复数据源被删除显示问题 2021-01-28 13:47:42 +08:00
chenjianxing 50ea7f76bf fix: 关联场景用例tag显示出错 2021-01-28 12:57:48 +08:00
chenjianxing 363e58067c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 12:04:52 +08:00
chenjianxing 3de78ac3e8 refactor: 登入页面样式优化 2021-01-28 12:04:05 +08:00
song.tianyang ec55678e62 Merge remote-tracking branch 'origin/master' 2021-01-28 12:00:57 +08:00
song.tianyang ec06a36bab fix: 不应该跨协议修改请求类型 
修复跨协议修改请求类型的问题
 2021-01-28 12:00:29 +08:00
fit2-zhao c75e37c63b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 11:54:51 +08:00
fit2-zhao 65501566d5 style(接口自动化): 修复循环结果样式显示问题 2021-01-28 11:54:32 +08:00
song.tianyang 590e31eee8 Merge remote-tracking branch 'origin/master' 2021-01-28 11:14:13 +08:00
song.tianyang 5eec3db477 fix: 测试跟踪-测试用例-选择所有数据批量编辑-面板只显示当前页面数据 
修复测试跟踪-测试用例-选择所有数据批量编辑-面板只显示当前页面数据的问题
 2021-01-28 11:13:52 +08:00
shiziyuan9527 012b5d64a7 fix(测试计划): 场景用例显示标签、ID，修改搜索提示 2021-01-28 10:46:08 +08:00
fit2-zhao 87d9a046ae style(接口自动化): 修复提取参数显示不全问题 2021-01-28 10:40:58 +08:00
fit2-zhao 6c74486f57 fix(接口定义): 获取焦点问题修改 2021-01-28 10:31:21 +08:00
fit2-zhao 267dd14a93 fix(接口定义): 修复数据源删除后页面显示问题 2021-01-28 09:56:55 +08:00
fit2-zhao ae29a9046c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 09:41:13 +08:00
chenjianxing e5c0ecd96c fix: 场景查看引用文字格式不统一 2021-01-27 22:27:15 +08:00
chenjianxing f6fb6fb9ab fix: 登入页面图片缺失 2021-01-27 22:22:29 +08:00
chenjianxing 97589f90d9 fix: 关联场景用例标签不显示 2021-01-27 20:49:40 +08:00
chenjianxing 0534a3b87d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 20:41:59 +08:00
chenjianxing 07b4724248 fix: 接口定义切换协议数据更新错误 2021-01-27 20:41:44 +08:00
song.tianyang 986dcd840c Merge remote-tracking branch 'origin/master' 2021-01-27 20:19:38 +08:00
chenjianxing 0fb4fdb8ae Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 20:07:29 +08:00
chenjianxing d97f8e8f65 feat: 登入页面重构 2021-01-27 20:07:03 +08:00
fit2-zhao 19fe757774 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 19:55:34 +08:00
fit2-zhao 4f4f8aa38d style(接口自动化): 样式调整 2021-01-27 19:55:13 +08:00
song.tianyang 8ab5feb852 feat: 场景导入接口，选择http协议，会出现其他协议的接口 
修复场景导入接口，选择http协议，会出现其他协议的接口的问题
 2021-01-27 19:40:19 +08:00
song.tianyang 48f9e6a363 Merge remote-tracking branch 'origin/master' 2021-01-27 19:30:54 +08:00
song.tianyang 2ef18e5eb0 feat: 接口定义表格-请求类型下来筛选框的值随着接口类型变动 
接口定义表格-请求类型下来筛选框的值随着接口类型变动
 2021-01-27 19:30:29 +08:00
Coooder-X 5e292f2cfc
fix: (测试计划) 解决关联场景用例时tag字段不显示 (#1276) 2021-01-27 19:20:56 +08:00
Coooder-X 00a382b736
fix: (接口定义) 解决在回收站中，Case切换到Api时未显示回收站内容问题 (#1271) 2021-01-27 19:20:45 +08:00
song.tianyang 6d664448dc Merge remote-tracking branch 'origin/master' 2021-01-27 19:13:46 +08:00
song.tianyang 137d714003 feat: 设置定时任务的弹窗中增加滑动开关 
设置定时任务的弹窗中增加滑动开关
 2021-01-27 19:13:27 +08:00
Captain.B ac95fca6fe refactor: 认证源设置页面国际化 2021-01-27 18:34:07 +08:00
wenyann b9522607ef Merge remote-tracking branch 'origin/master' 2021-01-27 18:20:29 +08:00
wenyann c04aeae9df feat: 弹框优化 2021-01-27 18:19:48 +08:00
song.tianyang f2b64c9a20 Merge remote-tracking branch 'origin/master' 2021-01-27 18:10:28 +08:00
song.tianyang 8e2bd2224e fix: 复制场景修改场景名称后，tab页的名称没跟着变 
修复复制场景修改场景名称后，tab页的名称没跟着变的问题
 2021-01-27 18:10:04 +08:00
shiziyuan9527 a9f918716a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 18:06:29 +08:00
shiziyuan9527 4235003784 fix(接口定义): 修复用例列表-复制用例，标签没复制 2021-01-27 18:05:38 +08:00