Commit Graph

7199 Commits

Author SHA1 Message Date
ibuler
cefa54c9db [Update] 修改select, 逻辑单一 2020-04-22 13:35:22 +08:00
Orange
1c28e885cb
Merge pull request #24 from jumpserver/orange_dev
[update]修改AutoDataForm组件以兼容Tree
2020-04-22 12:01:05 +08:00
jym503558564
37fb3bbee2 Merge branch 'master' into jym_dev 2020-04-22 10:00:20 +08:00
OrangeM21
24248b3430 [update]修改AutoDataForm组件以兼容Tree 2020-04-22 02:12:09 +08:00
ibuler
a67e06d764 [Update] 修改relation组件 2020-04-21 21:03:45 +08:00
jym503558564
5f4f959fb0 [Update] 修改权限管理详情组件和任务详情组件 2020-04-21 20:10:29 +08:00
OrangeM21
efd74f2c36 [update]添加命令过滤页面 2020-04-21 20:09:39 +08:00
ibuler
35e006b594 Merge branch 'master' of github.com:jumpserver/lina 2020-04-21 15:38:18 +08:00
ibuler
f5aab354d0 [Update] 修改菜单 2020-04-21 15:36:48 +08:00
OrangeM21
a46cb2757e Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-21 15:11:18 +08:00
ibuler
818a8ba6e4 [Update] 添加tab click 2020-04-21 15:03:20 +08:00
ibuler
b4aac49eb1 [Update] 修改generic detail 2020-04-21 14:36:49 +08:00
ibuler
668ac84e8a [Update] 修改详情页 2020-04-21 13:29:27 +08:00
ibuler
e02f7485b7 [Update] 修订update 2020-04-21 11:47:33 +08:00
OrangeM21
8d40492e91 [update]完善平台列表 2020-04-20 20:13:28 +08:00
OrangeM21
bf849dd8b7 [update]完善平台列表 2020-04-20 20:09:48 +08:00
ibuler
d949d87cdd [Update] 添加lodash到全局 2020-04-20 19:55:07 +08:00
ibuler
3986932ccd Merge branch 'master' of github.com:jumpserver/lina 2020-04-20 19:05:11 +08:00
ibuler
da55994a2d [Update] 改变link的默认颜色 2020-04-20 19:04:39 +08:00
ibuler
73bd10d5af [Update] 使用自己生成的theme 2020-04-20 18:55:48 +08:00
八千流
fdf0b34e71
Merge pull request #23 from jumpserver/jym_dev
[Update] 增加任务详情组件和修改授权详情组件
2020-04-20 18:37:37 +08:00
jym503558564
edb766eefa Merge branch 'master' into jym_dev 2020-04-20 18:35:48 +08:00
jym503558564
2b345beb6b [Update] 修改授权组件详情 2020-04-20 18:34:22 +08:00
jym503558564
9969d404ad [Update] 增加任务模块一些详情组件 2020-04-20 17:27:33 +08:00
Eric_Lee
15c29a4602
terminal detail page (#22) 2020-04-20 13:02:01 +08:00
ibuler
05be3508f1 Merge branch 'master' of github.com:jumpserver/lina 2020-04-19 10:26:04 +08:00
OrangeM21
fdb3195fd7 [update]完善Assets 2020-04-16 18:57:12 +08:00
OrangeM21
3b887c49e1 [update]完成资产列表 2020-04-16 16:42:48 +08:00
OrangeM21
2aa2e2d96a [update]完善ZTree样式 2020-04-16 15:58:05 +08:00
OrangeM21
5ac1d6ac37 [update]完善删除节点 2020-04-16 15:42:44 +08:00
OrangeM21
c0a193a8a1 [update]修复Url问题导致消息无法传递到子组件 2020-04-16 15:15:12 +08:00
八千流
aa3bdeb940
Merge pull request #21 from jumpserver/jym_dev
[Update] 初步实现授权模块详情
2020-04-15 18:05:31 +08:00
jym503558564
42cf5b814b [Update] 权限模块修改翻译和路由 2020-04-15 18:00:46 +08:00
OrangeM21
f6efefbc10 [update]抽象Ztree +3 2020-04-15 16:59:18 +08:00
jym503558564
41cf8a6ffb [Update] 去掉树 2020-04-15 16:37:06 +08:00
jym503558564
ec04cec4f4 [Merge] jym_dev merge master 2020-04-15 16:27:38 +08:00
jym503558564
db4cc16a55 [Update] 初步实现授权详情 2020-04-15 16:20:18 +08:00
Orange
15d2bcfc04
Merge pull request #20 from jumpserver/dev_orange
[update]抽象Ztree +2
2020-04-15 03:14:37 +08:00
OrangeM21
dd446f49bf [update]抽象Ztree +2 2020-04-15 03:12:22 +08:00
OrangeM21
3f91c8f433 [update]抽象Ztree 2020-04-15 02:59:25 +08:00
OrangeM21
450f98d35f Merge remote-tracking branch 'origin/master' 2020-04-13 19:59:04 +08:00
OrangeM21
e83828dd22 [update]添加Ztree 2020-04-13 19:58:39 +08:00
jym503558564
d473635ac9 Merge branch 'master' into jym_dev 2020-04-13 16:45:06 +08:00
jym503558564
83f80f4a6c [Update] 增加资产节点树 2020-04-13 16:42:55 +08:00
BaiJiangJie
920b86ef5b
Merge pull request #19 from jumpserver/bai_master
[Update] 修改Dialog组件确认出发的事件名: comfirm -> confirm
2020-04-13 14:55:28 +08:00
Bai
3274b14c4c [Update] 修改Dialog组件确认出发的事件名: comfirm -> confirm 2020-04-13 14:48:21 +08:00
BaiJiangJie
590fa3cef3
Merge pull request #18 from jumpserver/master_bai
[Update] 添加RemoteAppList
2020-04-13 10:30:20 +08:00
OrangeM21
d4a4acc089 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/components/TreeNode/index.vue
2020-04-13 01:58:51 +08:00
OrangeM21
83acf862ff [update]增加treeTable表格同步,修改Tree样式 2020-04-13 01:56:35 +08:00
ibuler
49829cb7b6 [Update] 修改base formatter 2020-04-10 21:03:33 +08:00