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

811 Commits

Author SHA1 Message Date
chenjianxing 2957e5acef 饼图样式 2020-05-14 11:53:14 +08:00
chenjianxing 2b3e148463 重命名节点更新模块字段 2020-05-14 11:41:45 +08:00
Captain.B d082ebc7d2 zh-tw 2020-05-14 11:34:15 +08:00
chenjianxing d569ef8582 解决面包屑key重复 2020-05-14 10:09:04 +08:00
chenjianxing 8c286795f7 拖拽节点更新模块字段 2020-05-14 09:34:11 +08:00
shiziyuan9527 a8dd83b3cc i18n 2020-05-13 18:12:15 +08:00
shiziyuan9527 96e275c095 用户角色国际化 2020-05-13 17:58:26 +08:00
Captain.B 6c2df5f122 float right 2020-05-13 16:29:19 +08:00
Captain.B bef5533656 菜单 2020-05-13 16:26:51 +08:00
shiziyuan9527 3bb0c0eb1a 语言切换入口 2020-05-13 16:07:18 +08:00
q4speed 05a2cf846e Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 14:46:28 +08:00
q4speed 0cfc8c331b 先去掉描述 2020-05-13 14:46:12 +08:00
Captain.B 9d53c76e42 页面 2020-05-13 14:19:31 +08:00
q4speed cdf2d75e6f Merge remote-tracking branch 'origin/dev' into dev 2020-05-13 13:00:00 +08:00
q4speed 709c207fcc 场景公用变量和Header 2020-05-13 12:59:41 +08:00
chenjianxing c88030d1d2 节点操作点击事件禁止冒泡 2020-05-13 11:59:56 +08:00
chenjianxing 4c9f59d7d8 测试计划节点无法拖动 2020-05-13 11:56:51 +08:00
chenjianxing 93ae49263a 抽取表格过滤排序代码 2020-05-12 20:11:14 +08:00
chenjianxing dd7409681b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-12 19:19:57 +08:00
chenjianxing 833560a70e fix 节点数报错 2020-05-12 19:19:11 +08:00
王振 8f9ad16870 测试用例步骤编辑自适应文本高度 2020-05-12 18:54:35 +08:00
shiziyuan9527 0a2169b09e bug fix 点击个人信息切换英文 2020-05-12 17:50:18 +08:00
q4speed f334bee3cb 去掉console.log 2020-05-12 16:37:01 +08:00
q4speed dc5fbd083b 修复固定值问题 2020-05-12 16:32:06 +08:00
q4speed 80a50999a7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:27:10 +08:00
q4speed eddc19fa75 增加提取功能的JMX内容 2020-05-12 15:26:55 +08:00
shiziyuan9527 17be7deb21 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/business/components/settings/system/User.vue
 2020-05-12 15:23:42 +08:00
shiziyuan9527 a05782e6c1 设置系统管理员入口 2020-05-12 15:19:40 +08:00
Captain.B d9f6e6147e i18n 2020-05-12 14:56:02 +08:00
Captain.B 34ef1be442 i18n 2020-05-12 14:44:56 +08:00
王振 158f4b2d71 fix typo 2020-05-12 11:32:49 +08:00
q4speed bc294c354c Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/i18n/zh-CN.js
 2020-05-12 11:27:36 +08:00
q4speed 796f00f403 增加提取功能的页面 2020-05-12 11:25:04 +08:00
Captain.B 101401d6fc 样式 2020-05-12 11:24:38 +08:00
q4speed 3c10555c9e 修复按钮显示及禁用bug 2020-05-12 11:22:19 +08:00
shiziyuan9527 5ad9d37bda 删除无用代码 2020-05-12 11:01:56 +08:00
Captain.B 290df82611 样式 2020-05-12 10:56:41 +08:00
Captain.B f3766f3ef2 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 
 Conflicts:
	frontend/src/business/components/settings/personal/PersonSetting.vue
 2020-05-12 10:55:24 +08:00
Captain.B a89052bc6e 样式 2020-05-12 10:53:51 +08:00
wenyann d7ccef6ee5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 10:46:45 +08:00
wenyann 433bd0f8c1 密码 2020-05-12 10:46:21 +08:00
王振 833050a9ef 修改样式 2020-05-11 23:40:19 +08:00
王振 96b8c89071 修改关联测试用例弹框样式 2020-05-11 22:12:23 +08:00
BugKing 5719f67c04
Update zh-CN.js 2020-05-11 18:25:22 +08:00
shiziyuan9527 d183914eff i18n 2020-05-11 18:08:00 +08:00
Captain.B 2903d6d593 日志详情和日志下载 2020-05-11 17:29:25 +08:00
wenyann bd7841ddcc Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 16:12:26 +08:00
wenyann 54a3155461 id唯一性校验 2020-05-11 16:11:55 +08:00
shiziyuan9527 0db3832e08 管理员只能修改成员角色信息 frontend 2020-05-11 15:49:17 +08:00
shiziyuan9527 dff0c8a008 修改util.js 2020-05-11 15:33:40 +08:00
shiziyuan9527 12da2509d2 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/metersphere/service/UserService.java
 2020-05-11 14:48:17 +08:00
shiziyuan9527 5abece2d37 优化工作空间和组织相关部分 2020-05-11 14:44:53 +08:00
q4speed 599774ef0a 修复断言背景色 2020-05-11 14:25:48 +08:00
q4speed c80344813b 修复加载问题 2020-05-11 14:25:28 +08:00
wenyann 4a958d6f44 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 14:13:16 +08:00
wenyann 8880599f29 修改密码 2020-05-11 14:12:29 +08:00
q4speed f07078fdf6 修复element ui国际化文件加载失败的bug 2020-05-11 11:48:52 +08:00
wenyann 68efed66fe Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-10 21:32:10 +08:00
chenjianxing 7883b6ff43 用例导入时显示导入中 2020-05-09 20:06:32 +08:00
chenjianxing b941ffebf5 测试用例执行人显示名称 2020-05-09 19:26:42 +08:00
chenjianxing e50241158f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 19:03:35 +08:00
chenjianxing 08d3ec19ef 测试详筛选排序 2020-05-09 18:39:47 +08:00
chenjianxing f014d5267d fix 测试用例查询 2020-05-09 18:07:23 +08:00
chenjianxing 4df45d190c 测试用例筛选排序 2020-05-09 17:55:13 +08:00
wenyann a690ffecde Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 
 Conflicts:
	frontend/src/i18n/en-US.js
 2020-05-09 17:40:17 +08:00
wenyann 6924832fee demo 2020-05-09 17:38:30 +08:00
q4speed 7854c999c9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 16:03:44 +08:00
q4speed 29a78a42c7 API翻译同步 2020-05-09 16:03:30 +08:00
Captain.B 02b1f1f80b 使用operator button 2020-05-09 16:03:07 +08:00
Captain.B 3cfc37a2f7 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:58:36 +08:00
Captain.B 7ad65837fb 使用operator button 2020-05-09 15:44:33 +08:00
shiziyuan9527 f0427d4705 组织，工作空间管理员无法移除自身 2020-05-09 15:40:57 +08:00
q4speed c1035e00ae Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 15:33:00 +08:00
q4speed 85bf0d0ba1 修正指针形状 2020-05-09 15:31:49 +08:00
Captain.B 1a685ab202 删除不用的代码 2020-05-09 15:28:58 +08:00
q4speed efec984b90 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 14:51:51 +08:00
q4speed 2a7be35de1 API报告页面 2020-05-09 14:51:37 +08:00
Captain.B f3c04ce4eb Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-09 13:23:37 +08:00
chenjianxing 7c9004aaaa 测试用例，继续创建下一个 2020-05-09 13:01:32 +08:00
wenyann 6012004200 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 12:08:06 +08:00
wenyann 998134b1f1 修改用户密码 2020-05-09 12:06:09 +08:00
chenjianxing 18e2cc8960 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 11:36:19 +08:00
chenjianxing de3faf3ca5 用例模块等允许带空格 2020-05-09 11:36:01 +08:00
shiziyuan9527 0752a0c54b 修改个人信息 2020-05-09 11:05:03 +08:00
Captain.B 74075ddefc 样式 2020-05-09 11:01:09 +08:00
wenyann 43e5381a22 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 10:52:10 +08:00
chenjianxing 366ae5e95c 更新最近计划 2020-05-09 10:44:15 +08:00
chenjianxing e20f091f7a fix 模版编辑 2020-05-09 09:33:53 +08:00
chenjianxing 7dbd070736 浏览器回退，遮罩层无法关闭 2020-05-08 19:25:05 +08:00
wenyann b5760cd2b4 性能测试样式修改 2020-05-08 19:09:09 +08:00
chenjianxing 90c2e0d1f5 测试报告模版 2020-05-08 18:54:47 +08:00
chenjianxing 845439661e date picker 2020-05-08 18:43:12 +08:00
Captain.B 841019d4a7 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 
 Conflicts:
	frontend/src/i18n/zh-CN.js
 2020-05-08 18:03:34 +08:00
Captain.B 843d7ed3b1 日志下载 2020-05-08 18:02:58 +08:00
wenyann b8f10e2ea0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 17:42:03 +08:00
shiziyuan9527 bd023c1f27 修改Dialog按钮 2020-05-08 17:21:58 +08:00
wenyann 62ee448245 demo 2020-05-08 17:19:28 +08:00
chenjianxing 45ac65da59 报告图表 2020-05-08 17:06:29 +08:00
shiziyuan9527 6dc6cc8459 修改方法命名 2020-05-08 16:05:01 +08:00
chenjianxing b876ca0acc Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 15:59:44 +08:00
chenjianxing 48a6ae3952 测试报告组件编辑 2020-05-08 15:59:03 +08:00
shiziyuan9527 7d586af28b 优化代码 2020-05-08 15:34:45 +08:00
chenjianxing cff0b05b32 获取测试报告数据 2020-05-08 14:06:33 +08:00
shiziyuan9527 d38fe65d2b 优化代码 2020-05-08 12:11:02 +08:00
q4speed ae288e8ace Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 11:04:19 +08:00
q4speed 6745d8b5fc 修复key value不能正确显示的问题 2020-05-08 11:04:04 +08:00
chenjianxing 2a3b1a2036 导航栏样式 2020-05-08 00:38:26 +08:00
chenjianxing e5e7737f29 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 00:23:12 +08:00
chenjianxing c5fb011819 uuid 2020-05-08 00:22:35 +08:00
q4speed b5e7b74633 Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 00:00:05 +08:00
q4speed 39aed31aa5 生成report 2020-05-07 23:59:51 +08:00
shiziyuan9527 775950ec02 修改按钮 2020-05-07 18:03:22 +08:00
shiziyuan9527 f36c375467 阻止按钮回车事件 2020-05-07 16:03:40 +08:00
shiziyuan9527 74c8be756a 代码优化 2020-05-07 14:35:56 +08:00
Captain.B 02ab2f230a Merge remote-tracking branch 'origin/dev' into dev 2020-05-07 13:37:22 +08:00
Captain.B 17c8a98f56 修改资源池状态 2020-05-07 13:37:05 +08:00
shiziyuan9527 dee5790ae7 i18n 2020-05-07 11:37:39 +08:00
王振 dae2f9c41c 修改移动用例弹框文本 2020-05-07 11:19:45 +08:00
chenjianxing d0ebd18be5 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-06 20:29:57 +08:00
chenjianxing d511800cc8 查看编辑测试用例报告 2020-05-06 20:29:41 +08:00
shiziyuan9527 6f7848ee0d i18n 2020-05-06 18:04:56 +08:00
Captain.B 52aee15dc5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-06 17:31:25 +08:00
Captain.B cb24a51d7c label 2020-05-06 17:31:11 +08:00
shiziyuan9527 04cdf5ac06 修改菜单栏激活 2020-05-06 17:19:48 +08:00
chenjianxing 61256ee9e2 修改表结构 2020-05-06 16:42:58 +08:00
chenjianxing 52ead84a20 merge 2020-05-06 16:21:25 +08:00
chenjianxing 4dc949864b 测试报告模版curd 2020-05-06 16:03:39 +08:00
shiziyuan9527 cc53d07cd4 删除无用代码 2020-05-06 15:08:53 +08:00
shiziyuan9527 6a0c8a5c3d 性能报告头部面包屑 2020-05-06 15:01:05 +08:00
q4speed 94b7ceb1e9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-06 14:21:23 +08:00
q4speed 2bed94efce NaN 2020-05-06 14:21:10 +08:00
shiziyuan9527 b0c5bd52ec 组织，工作空间相关资源关联删除 2020-05-06 14:12:03 +08:00
q4speed 69586479ba Merge remote-tracking branch 'origin/dev' into dev 2020-05-05 19:49:48 +08:00
q4speed 53048f1f3f 生成jmx, run jmx, 未完待续 2020-05-05 19:49:32 +08:00
Captain.B 0fa7a87cff height 2020-04-30 18:10:06 +08:00
q4speed 1cae0333f9 Merge remote-tracking branch 'origin/dev' into dev 2020-04-30 16:50:59 +08:00
q4speed d97f72315c 生成jmx 2020-04-30 16:50:43 +08:00
Captain.B 0851c4fd19 loading 2020-04-30 16:04:52 +08:00
Captain.B 589846cad8 显示日志 2020-04-30 16:00:35 +08:00
Captain.B cec3af5062 选择资源池加上校验 2020-04-30 15:18:18 +08:00
chenjianxing e370620c97 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-29 19:01:16 +08:00
chenjianxing 1bd57e5186 测试报告列表 2020-04-29 19:00:58 +08:00
chenjianxing 2124226f0f 测试模版列表 2020-04-29 16:08:31 +08:00
Captain.B 563a16a0cf Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-04-29 15:54:59 +08:00
Captain.B 6cb04e0685 log save +1 2020-04-29 15:51:54 +08:00
chenjianxing 1c155bd982 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-29 15:50:21 +08:00
chenjianxing 09e4ce9ea2 测试报告图表 2020-04-29 15:49:38 +08:00
shiziyuan9527 73781d57c9 报告-请求统计添加合计行 2020-04-29 10:50:30 +08:00
chenjianxing 19c21dab23 测试报告sql 2020-04-28 21:14:09 +08:00
chenjianxing 1bd0a16ae4 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-28 16:42:06 +08:00
chenjianxing de5f9c993b 测试用例报告模版页面 2020-04-28 16:41:42 +08:00
shiziyuan9527 56d8182e01 代码优化 2020-04-28 11:38:30 +08:00
shiziyuan9527 e5ead937d7 修改消息提示 2020-04-27 18:20:23 +08:00
chenjianxing 0f32c916ba Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-27 17:36:15 +08:00
chenjianxing 362620b887 修改样式 2020-04-27 17:36:00 +08:00
q4speed 181c406826 Merge remote-tracking branch 'origin/dev' into dev 2020-04-27 17:10:36 +08:00
q4speed ec113b1b16 api测试保存jmx 2020-04-27 17:10:21 +08:00
shiziyuan9527 afbc7b5060 修改变量命名 2020-04-27 15:14:43 +08:00
shiziyuan9527 ca497f71b6 搜索框搜索 2020-04-27 14:14:37 +08:00
chenjianxing cdde7781c2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-27 09:43:26 +08:00
chenjianxing e4b02ec997 删除计划前校验 2020-04-27 09:43:08 +08:00
shiziyuan9527 25baf6f133 删除无用样式 2020-04-26 17:42:26 +08:00
chenjianxing 4b96010d3a Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-26 16:56:08 +08:00
chenjianxing 6854a6f5d3 测试用例批量移动 2020-04-26 16:55:50 +08:00
shiziyuan9527 e0a47493ab 修改图表 2020-04-26 15:27:24 +08:00
chenjianxing bc518448a6 fix 测试用例 2020-04-26 14:25:22 +08:00
chenjianxing d02edcb1b3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-26 10:40:45 +08:00
chenjianxing 2262f83c41 创建用例设置默认值 2020-04-26 10:40:12 +08:00
q4speed 573d42230a fix null 2020-04-26 10:33:12 +08:00
chenjianxing 4e98172502 样式 2020-04-26 09:45:36 +08:00
shiziyuan9527 f3b9026421 修改消息提示 2020-04-24 18:04:45 +08:00
shiziyuan9527 dcef65f719 修改消息提示 2020-04-24 17:56:17 +08:00
shiziyuan9527 0bf42358e7 修改消息提示 2020-04-24 17:36:28 +08:00
chenjianxing 288dd65b70 修改测试计划阶段 2020-04-24 17:00:24 +08:00
q4speed 874f3c627e Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 16:03:04 +08:00
q4speed ec0a630c1b message 2020-04-24 16:02:52 +08:00
chenjianxing 89cea4833e Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-24 15:08:43 +08:00
chenjianxing 83ce0f228a 编辑时更新测试用例状态 2020-04-24 15:08:21 +08:00
chenjianxing 1b728ce0cf 上一个下一个自动保存 2020-04-24 14:12:41 +08:00
q4speed 5c40ea5327 Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 14:09:22 +08:00
q4speed 290532224a NaN 2020-04-24 14:09:10 +08:00
chenjianxing c6479e7183 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-24 13:56:57 +08:00
chenjianxing 6e3ec26fc0 克隆测试用例 2020-04-24 13:56:32 +08:00
Captain.B 9e5aad7831 Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 09:51:24 +08:00
Captain.B dcd33833af check status 2020-04-24 09:51:08 +08:00
chenjianxing bccc1e3b1c 点击测试用例展示详情 2020-04-24 09:42:48 +08:00
chenjianxing 2f81508a0e Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-24 00:39:06 +08:00
chenjianxing 8f09b254ab fix bug 2020-04-24 00:38:41 +08:00
Captain.B d0ddd8d869 Merge remote-tracking branch 'origin/dev' into dev 2020-04-23 18:51:55 +08:00
Captain.B cebfba849e reporting 2020-04-23 18:51:00 +08:00
shiziyuan9527 618ab09d97 Merge remote-tracking branch 'origin/dev' into dev 2020-04-23 17:26:13 +08:00
shiziyuan9527 39eb3135d4 修改表头 2020-04-23 17:25:57 +08:00
chenjianxing 6705bd98fd Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-23 17:25:27 +08:00
chenjianxing d2b65e104e 封装表格操作按钮 2020-04-23 17:25:04 +08:00
q4speed 1294739df6 run button 2020-04-23 17:08:48 +08:00
chenjianxing 2290c94fec 修改包名 2020-04-23 16:40:04 +08:00
q4speed 39fc93946b Merge remote-tracking branch 'origin/dev' into dev 2020-04-23 15:40:19 +08:00
q4speed 6ac1c90931 api测试界面，未完待续 2020-04-23 15:40:06 +08:00
chenjianxing 096aa4da2d Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-23 15:34:59 +08:00
chenjianxing 0af7abd6a8 修复顶级菜单样式 2020-04-23 15:34:38 +08:00