github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-08-13 12:26:07 +00:00
Code Issues Projects Releases Wiki Activity
7,143 Commits 103 Branches 218 Tags 37 MiB
pr@dev@fix_accout_push
Commit Graph

2116 Commits

Author SHA1 Message Date
Orange
5bed98b991
Merge pull request #133 from jumpserver/jym_dev 
fix: 优化表格宽度，优化资产树显示的位置大小可等比例缩放
 2020-07-03 17:37:54 +08:00
jym503558564
6d4c9f3676 fix: 修改资产树显示位置的大小可等比例缩放 2020-07-03 16:10:05 +08:00
jym503558564
e6295c9dc5 fix: 优化表格宽度 2020-07-03 16:02:38 +08:00
jym503558564
386afc9e0c fix: 整理统一 Lina List 2020-07-03 10:48:27 +08:00
Orange
863b89888d
Merge pull request #116 from jumpserver/update_xpack_and_fix_bugs 
fix: 修复资产页面Bug,更新Xpack依赖
 2020-07-01 17:11:16 +08:00
OrangeM21
85012d9558 [fix]更新XPack,修复资产页面Bugs 2020-07-01 17:04:28 +08:00
jym503558564
75e234e3e2 fix:修改资产模块可连接提示信息 2020-07-01 10:49:02 +08:00
jym503558564
7f8aa6a65a fix:修改资产模块可连接提示信息 2020-07-01 10:48:30 +08:00
jym503558564
f6aa6fc2ac fix: 优化导出、导出、刷新按钮添加文字提示信息 2020-07-01 10:41:17 +08:00
OrangeM21
55c959fd50 fix: 修复2.0.1的bugs 2020-06-30 14:41:04 +08:00
OrangeM21
c8bc3ff0d2 [fix] 2020-06-17 18:37:18 +08:00
OrangeM21
675e9d3005 Merge remote-tracking branch 'origin/dev' into dev 2020-06-17 11:42:17 +08:00
OrangeM21
f850cf0d55 [fix]修复命令执行问题过滤问题 2020-06-17 11:41:58 +08:00
ibuler
eee78a1f2c fix: 去除一部分debug 2020-06-16 19:55:10 +08:00
ibuler
bd690501eb fix: 修改用户授权资产loadding问题 2020-06-16 19:52:13 +08:00
Bai
7bc1912d6d Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 18:07:39 +08:00
Bai
f16d116234 [Update] 修改用户页面资产授权规则is_valid字段、授权的资产点击节点刷新table 2020-06-16 18:07:16 +08:00
ibuler
86306c7bc9 fix: 去掉debug 2020-06-16 18:05:08 +08:00
ibuler
6ccdaf71e4 fix: 修改table config，变化时自动reload 2020-06-16 17:39:44 +08:00
ibuler
2182cb33da Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 17:26:52 +08:00
ibuler
0a97ebd403 feat: 修改导出，修改用户创建和更新中的password 2020-06-16 17:22:41 +08:00
Eric
870285e8e8 fix current org id missed 2020-06-16 16:42:25 +08:00
OrangeM21
31bf2b85ae [merge ] 2020-06-16 16:20:06 +08:00
OrangeM21
850144a3a9 修复搜索栏选项多余的问题 2020-06-16 16:08:14 +08:00
ibuler
1d14aa8f75 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-16 15:19:36 +08:00
ibuler
efaa116605 feat: 修改detail 2020-06-16 15:19:13 +08:00
OrangeM21
537d945485 Merge remote-tracking branch 'origin/dev' into dev 2020-06-16 15:11:31 +08:00
ibuler
9d0562e11a fix: 修改资产标签 2020-06-16 15:05:45 +08:00
ibuler
345a962aac fix: 修改同步实例任务中的时间显示，feat: 完成执行同步实例大人物 2020-06-16 14:32:42 +08:00
OrangeM21
98991af6ef [fix]修复Tree右键删除2条提示的问题 2020-06-16 14:32:16 +08:00
ibuler
c73bb3f9c7 merge: with dev 2020-06-16 12:24:47 +08:00
ibuler
8e6a797d70 fix: 修复userpassword comp不能实时校验的问题 2020-06-16 11:21:20 +08:00
Bai
8ebd0b4807 [Update] 修改数据库授权详情用户、数据库页面table和card问题 2020-06-16 11:04:17 +08:00
ibuler
dc8939e0da feat: 添加密码组件 2020-06-16 10:49:43 +08:00
Bai
fda44265d8 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-15 19:43:37 +08:00
OrangeM21
93fa4ae28b [fix]修复MFA error提示 2020-06-15 17:59:49 +08:00
Bai
ca34ef5ac9 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-15 17:08:11 +08:00
OrangeM21
a0ca717aa2 [fix]修复创建Tree的错误提示 2020-06-15 16:31:15 +08:00
Bai
bf79d40c00 [Update] 资产详情，无关联标签时显示无 2020-06-15 15:51:50 +08:00
Bai
0c7abd5af6 [Update] 批量改密计划资产页面添加删除按钮 2020-06-15 14:57:23 +08:00
OrangeM21
3baa932d3a [fix]修复Tree右键菜单Error 2020-06-15 13:47:26 +08:00
Bai
ff1152c74c [Update] 修改翻译 2020-06-12 14:03:17 +08:00
OrangeM21
d789a2e0fc [fix]隐藏资产列表导入按钮 2020-06-12 13:59:08 +08:00
OrangeM21
52fbc747db Merge remote-tracking branch 'origin/dev' into dev 2020-06-12 13:49:19 +08:00
OrangeM21
cd754d5ce2 [fix]修复默认时间Error 2020-06-12 13:49:01 +08:00
ibuler
64cb063719 fix: 去掉一个console warn 2020-06-12 13:43:33 +08:00
Eric
9803208d22 fix getRoute 2020-06-12 12:43:16 +08:00
ibuler
2796f32df9 feat: 去掉console.log 2020-06-12 11:04:37 +08:00
ibuler
9a3e9b16b2 fix: 修改user group users tranform option 2020-06-11 20:49:28 +08:00
ibuler
1f4e24b681 feat: merge 2020-06-11 18:51:15 +08:00
ibuler
45f21c7abe fix: 修改翻译 2020-06-11 18:30:22 +08:00
OrangeM21
c4dc28314b [fix]给Tag增加默认值 2020-06-11 18:29:33 +08:00
Eric
fd8140bf29 preview img file 2020-06-11 15:46:45 +08:00
OrangeM21
839b954aae [fix]vault 2020-06-11 15:32:10 +08:00
ibuler
567af42bbf fix: 修复detail formatter的bug 2020-06-11 13:36:33 +08:00
ibuler
14aacdd55b feat: 修改detail formatter 2020-06-11 11:11:06 +08:00
ibuler
d9187d9b0a Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-10 20:35:47 +08:00
ibuler
abe8b0f673 feat: 修改request拦截 2020-06-10 20:32:58 +08:00
OrangeM21
e70fceacd0 Merge remote-tracking branch 'origin/dev' into dev 2020-06-10 20:32:17 +08:00
ibuler
68390ea3ea fix: 修改asset select 循环引用bug 2020-06-10 20:06:30 +08:00
OrangeM21
346b6fd7a8 [fix]添加删除提醒 2020-06-10 19:52:42 +08:00
ibuler
ffbd8ce88d fix: 修改dialog和select2 2020-06-10 18:47:28 +08:00
ibuler
2f7e817282 feat: 修改导入导出dialog 2020-06-10 18:20:22 +08:00
ibuler
ae39f2c61c feat: 修改一个css 2020-06-10 18:16:58 +08:00
ibuler
df3050b6f6 feat: 修改Upload key 2020-06-10 18:13:05 +08:00
ibuler
1b312b2ded feat: 修改select2 value值 2020-06-10 17:04:31 +08:00
ibuler
8b7f716f96 feat: 修改reset 2020-06-10 16:53:23 +08:00
ibuler
4805486131 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-10 15:07:32 +08:00
OrangeM21
80b67c6862 fix 2020-06-10 14:32:35 +08:00
OrangeM21
87dafbfdc2 添加Vault下载导入需要MFA确认 2020-06-10 14:30:55 +08:00
ibuler
dc35b2935d Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-10 13:58:49 +08:00
ibuler
a54cbec098 feat: 修改command filter 2020-06-10 13:20:29 +08:00
BaiJiangJie
2e0fd71945
Merge pull request #92 from jumpserver/dev_perms 
Dev perms
 2020-06-10 10:41:41 +08:00
ibuler
85ba553866 feat: 修改路由 2020-06-09 20:54:26 +08:00
Bai
d8b42b24ac [Update] 添加AssetRelationCard组件 2020-06-09 20:49:34 +08:00
ibuler
fbba875cfa feat: 修改ztree高度 2020-06-09 20:04:25 +08:00
ibuler
b8966748d6 feat: 修改asset select 2020-06-09 19:56:44 +08:00
Bai
6bfd5f4c4a [Update] 修改资产授权规则详情用户页reloadTable 2020-06-09 18:52:08 +08:00
ibuler
ed2c17bd4c feat: ztree添加高度 2020-06-09 18:27:57 +08:00
ibuler
bc400913e2 fix: 解决select2作为component的问题 2020-06-09 17:27:39 +08:00
ibuler
a8034bb0bf Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-09 16:50:51 +08:00
BaiJiangJie
429e639612
Merge pull request #91 from jumpserver/dev_assetTreeRMenu 
Dev asset tree r menu
 2020-06-09 16:49:56 +08:00
ibuler
40e118bb41 feat: 修改base api 2020-06-09 16:48:12 +08:00
Bai
38c0875a31 [Update] 完善AssetList rMenu 2020-06-09 16:46:29 +08:00
ibuler
fd95b0cd4e feat: 修改用户详情中的一个bug 2020-06-09 15:43:52 +08:00
ibuler
756a2dbd3b feat: 修改资产详情中布局的宽度 2020-06-09 15:14:54 +08:00
ibuler
f092181b84 feat: 修改网关创建和列表 2020-06-09 15:05:27 +08:00
Bai
baa9f3f7b5 [Update] 移动rMenu从TreeTable到AssetList页面 2020-06-09 14:47:57 +08:00
Bai
ac09a57684 [Update] Merge branch from dev to dev_treermenu 2020-06-09 11:00:21 +08:00
ibuler
bb1ba47856 feat: 修改asset user table 2020-06-09 10:14:42 +08:00
ibuler
ab03712220 feat: 将asset user table抽出来 2020-06-08 20:05:37 +08:00
ibuler
1f3a508155 feat: 将asset user抽出来 2020-06-08 17:14:40 +08:00
Bai
937d139a6b [Update] 添加显示节点信息的执行逻辑 2020-06-08 16:41:32 +08:00
Bai
8da771af3f [Update] 添加切换显示当前节点/所有子节点资产的执行逻辑 2020-06-08 15:20:40 +08:00
ibuler
92e846584b feat: 修改asset create中admin user的提示 2020-06-08 14:57:57 +08:00
Bai
0f46584a15 [Update] 添加测试节点资产可连接性执行逻辑 2020-06-08 14:06:02 +08:00
Bai
b29a61b792 [Update] 添加更新节点资产硬件信息执行逻辑 2020-06-08 14:02:59 +08:00
ibuler
b0f0c55063 feat: 优化创建是选择默认的资产和节点 feat: 优化protocols选择 2020-06-08 13:41:01 +08:00
Bai
a2b88067c3 [Update] 补充添加资产树节点右击菜单 2020-06-08 12:05:43 +08:00
OrangeM21
d536930568 [fix]修复资产模块问题 2020-06-07 22:27:39 +08:00
OrangeM21
549d4d5db5 [add]增加celeryLog界面 2020-06-06 15:39:37 +08:00
OrangeM21
a9716a0fa0 [update]命令执行修复 2020-06-05 20:28:10 +08:00
ibuler
f6959e6556 feat: merge 2020-06-05 17:57:40 +08:00
ibuler
d215942a44 feat: 修改权限控制 2020-06-05 17:56:18 +08:00
Eric
78c86f5a7e Merge branch 'dev' of https://github.com/jumpserver/lina into dev 2020-06-05 16:19:26 +08:00
ibuler
5fa9b1a3d0 fix: 修复select2默认值不全的问题 2020-06-05 15:39:27 +08:00
OrangeM21
312642d83f [fix]更新Tree右键菜单参数 2020-06-05 15:08:56 +08:00
ibuler
ead46856a3 fix: 修改toggletable的报错 2020-06-05 14:49:30 +08:00
Eric
67b074b2b3 add loading actions formatter 2020-06-05 14:39:21 +08:00
ibuler
6f439751cb fix: 修改自动生成的数据搜索,修改command execution日志列表 2020-06-05 14:29:16 +08:00
OrangeM21
c995604757 [fix]修复引用Ztree问题 2020-06-05 14:24:37 +08:00
OrangeM21
edb1105e9e [fix]修复引用Ztree问题 2020-06-05 14:21:42 +08:00
OrangeM21
0a41180c68 [fix]修复引用Ztree路径问题 2020-06-05 13:58:23 +08:00
ibuler
56170f67a1 feat: 去掉debug信息 2020-06-05 12:05:17 +08:00
ibuler
bdd270c56c feat: 修改组件detailcard 2020-06-05 12:02:58 +08:00
ibuler
02a8325b70 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-05 10:37:29 +08:00
OrangeM21
dae2450274 [fix]修复Tree Error 2020-06-04 20:53:08 +08:00
ibuler
6f0292354c feat: 修改ztree中menu样式 2020-06-04 20:40:40 +08:00
Eric
8268862b52 add dialogDetailformatter 2020-06-04 17:58:10 +08:00
OrangeM21
6f93349c29 [fix]更新右键菜单样式 更新资产列表Dialog 2020-06-04 14:08:06 +08:00
OrangeM21
59480a2136 [fix]修改提示样式 2020-06-04 12:03:32 +08:00
OrangeM21
889dfa4f17 [fix]修改Tree移动节点的提示信息 2020-06-04 11:48:34 +08:00
OrangeM21
ea8ab91e59 [fix]修复可连接性测试问题 2020-06-04 11:41:54 +08:00
OrangeM21
ad1bfe46f1 [fix]优化Ztree 2020-06-03 18:54:41 +08:00
OrangeM21
f8acc688f6 Merge remote-tracking branch 'origin/dev' into dev 2020-06-03 18:50:47 +08:00
ibuler
9e33a4426e feat: 需要时间组件的添加日期 2020-06-03 18:07:51 +08:00
ibuler
d9e465fd10 fix: 修改datetimerange component 2020-06-03 17:32:59 +08:00
ibuler
760c928901 fix: 修复用户切换和时间日期 2020-06-03 16:58:35 +08:00
OrangeM21
55d744e30f [update]优化用户体验 2020-06-03 16:28:07 +08:00
ibuler
ce84d51d88 Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-02 20:33:59 +08:00
ibuler
70d4f6a71f fix: 修复组织如果不对的问题，feat: 添加 submitting button 2020-06-02 20:29:51 +08:00
OrangeM21
ca2db6de4a [fix]修复路径引用问题 2020-06-02 20:18:32 +08:00
OrangeM21
d99a322a50 [fix]修复路径引用问题 2020-06-02 20:03:23 +08:00
OrangeM21
a7de450f36 [fix]系统用户和管理用户的Actions 2020-06-02 18:02:53 +08:00
ibuler
2ec7f4eceb feat: auto date search添加boolean的搜索 2020-06-02 16:41:51 +08:00
OrangeM21
5c84c55c46 [fix]修改组件样式,更新时可以传值 2020-06-02 16:22:48 +08:00
ibuler
1c0cab434d feat: 修改datetime picker增加最近一天 2020-06-02 16:10:34 +08:00
ibuler
11170a3c91 fix: 修复xpack中云管name无法跳转 2020-06-02 15:15:49 +08:00
ibuler
d8b8b796d7 feat: processResult => transformOption 2020-06-02 14:03:15 +08:00
ibuler
defd199567 feat: tag search添加快捷操作 2020-06-02 12:07:58 +08:00
ibuler
974288455a Merge branch 'dev' of github.com:jumpserver/lina into dev 2020-06-02 11:39:20 +08:00
ibuler
69ceea5fc6 feat: 优化 400请求的提示，优化tagsearch 2020-06-02 11:38:51 +08:00
ibuler
8d688ee2df feat: 优化 loginlog，和tag search 2020-06-02 10:52:48 +08:00
OrangeM21
e571a1af75 [fix] 2020-06-02 02:53:25 +08:00
Orange
fa1e7da539
Merge pull request #78 from jumpserver/orange_fix_tree_build_error 
Orange fix tree build error
 2020-06-02 02:24:58 +08:00
OrangeM21
eea802a7f3 [fix] 2020-06-02 02:21:53 +08:00
OrangeM21
cc83b3ab2f [fix] 2020-06-02 02:16:47 +08:00
OrangeM21
f577e46328 [fix]测试BASE_API 2020-06-02 02:09:24 +08:00
OrangeM21
53d0da6a5f Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 02:02:37 +08:00
OrangeM21
9f0e4e903e [fix]修复创建资产tree组件异常 2020-06-02 01:50:52 +08:00
ibuler
df645eaeff fix: 修复asset select组件的bug 2020-06-01 19:33:27 +08:00
Orange
92ff7ef784
Merge pull request #76 from jumpserver/master 
[fix]修复时间过滤异常及创建资产异常
 2020-06-01 17:07:34 +08:00
OrangeM21
70c349d34f [fix]修复创建资产组件异常 2020-06-01 16:46:44 +08:00
OrangeM21
57a95d10d6 [update]完成时间组件，待测试。 2020-06-01 15:56:53 +08:00
OrangeM21
d7341c13a1 [fix]修复el-render-table 组件 Bug 2020-06-01 14:46:59 +08:00
ibuler
191ef09d61 fix: 修复导入导出 对齐问题 2020-06-01 14:34:50 +08:00
OrangeM21
7341a955b4 [fix]修复组件bug 2020-06-01 14:27:50 +08:00
OrangeM21
8e659b64c7 [update]测试默认时间选择器 2020-06-01 13:34:06 +08:00
ibuler
0c9507645b feat: 修复formatter args的错误 2020-06-01 11:39:37 +08:00
ibuler
fa68f329bf [Update] 修改iconfig 2020-05-29 21:06:20 +08:00
ibuler
8b95a5fdf9 merge: with master 2020-05-29 20:41:55 +08:00
ibuler
f456dff551 [Update] 修改asset select2 2020-05-29 20:37:23 +08:00
Orange
25cab3f741
Merge pull request #71 from jumpserver/orange_tmp 
[update]添加根据时间搜索条
 2020-05-29 18:04:56 +08:00
OrangeM21
995553c79e [update]添加根据时间搜索条 2020-05-29 18:02:28 +08:00
Bai
06eae02750 [Update] 修改ActionsFormatter问题 2020-05-29 17:17:05 +08:00
Bai
27c16c25e7 [Update] 修改AutoDataTable构造actions col时去掉actions, 添加formatterArgs 2020-05-29 15:38:05 +08:00
ibuler
6bbde66516 feat: 修改一些拼写错误 2020-05-29 10:54:56 +08:00
ibuler
7de7a9274a feat: 优化asset 弹窗 2020-05-28 20:33:19 +08:00
ibuler
380b0a35ae merge: with master 2020-05-28 18:44:25 +08:00
ibuler
a0633e3a0d [Update] 修改一些formatter格式 2020-05-28 18:42:43 +08:00
OrangeM21
81be1e046e Merge remote-tracking branch 'origin/master' 2020-05-28 16:21:46 +08:00
ibuler
ae855ea3f6 merge: with master 2020-05-28 16:13:01 +08:00
ibuler
52bfe6510f [Udpate] 修改detail formatter 2020-05-28 16:10:46 +08:00
ibuler
13589ce9cb feat: 修改actions formatter 使用formatterAegs 2020-05-28 16:06:57 +08:00
OrangeM21
00fc974a8b [fix]修复AssetSelect组件初始化获取状态问题 2020-05-28 15:57:05 +08:00
xinwen
54ac9b5109 [Update] 进入 Detail 页面可以指定 Tab 2020-05-28 14:30:54 +08:00
ibuler
dbe17fbc04 [Update] 修改core 2020-05-27 19:29:49 +08:00
ibuler
25a2cdca44 Merge branch 'master' of github.com:jumpserver/lina 2020-05-27 15:55:21 +08:00
ibuler
462bf02fa6 [Feature] 重命名一些组件 2020-05-27 15:45:03 +08:00
Eric
81fbec6a01 update img src 2020-05-27 15:13:35 +08:00
ibuler
57fa0bc947 [Feat] 完成重命名Jobcenter 2020-05-27 15:07:10 +08:00
ibuler
cf7fe1c129 [Update] 完善代码 2020-05-27 11:14:32 +08:00
ibuler
1ccdaef999 [Update] 优化搜索的问题 2020-05-26 16:29:49 +08:00
ibuler
0475149bae [UPdate] 修改tag search 2020-05-26 14:48:09 +08:00
ibuler
27a24bb5dd [Update] merge 2020-05-25 17:41:43 +08:00
ibuler
38a97781c3 [Update] 修改i18n 2020-05-25 17:36:51 +08:00
jym503558564
fb1ded679b [fix] 修改一些小问题 2020-05-25 17:31:17 +08:00
jym503558564
e0db4a1889 [Update] 权限管理详情添加更新删除信息 2020-05-25 14:28:39 +08:00
OrangeM21
45ca9454f3 [update]完成APIkey页面 修复bug 2020-05-24 18:14:36 +08:00
OrangeM21
c6c0f8f279 [fix]修复组件框编译引用路径Bug 2020-05-23 16:20:29 +08:00
OrangeM21
58b4c19c11 [fix]修复组件框编译引用路径Bug 2020-05-23 14:42:10 +08:00
OrangeM21
b0be59eb7c Merge remote-tracking branch 'origin/master' 2020-05-23 03:51:44 +08:00
OrangeM21
13ddb769b1 [fix]修复生产环境Bug 2020-05-23 01:46:31 +08:00
ibuler
e7dc42fd07 Merge branch 'master' of github.com:jumpserver/lina 2020-05-22 18:38:28 +08:00
ibuler
a54b8b3c8e [Update] 去掉一些import export 2020-05-22 18:37:34 +08:00
Bai
c6c39477e9 [Update] Merge from master to cap 2020-05-22 18:05:58 +08:00
ibuler
b32bb59c70 [Update] 继续优化select2组件 2020-05-22 15:59:23 +08:00
ibuler
5d5680e9b6 [Update] 修改select2 watch 2020-05-22 15:38:51 +08:00
ibuler
d4b9ec7d02 [Update] 修改一部分翻译 2020-05-22 14:57:36 +08:00
ibuler
2cf0af422d [Update] Merge 2020-05-22 11:36:06 +08:00
ibuler
f6d8a1479f [Update] 整理i18n 2020-05-22 11:34:28 +08:00
Bai
ca0aac5eab [Update] 修改ActionFormatter超过2个即显示更多操作 2020-05-21 20:35:56 +08:00
ibuler
84fcc34a59 [Update] 修改permission.js的拼写错误 2020-05-21 20:28:33 +08:00
jym503558564
b3d4b4a89f [Update] 修改授权管理详情 2020-05-21 20:14:37 +08:00
ibuler
32084c328b Merge branch 'master' of github.com:jumpserver/lina 2020-05-21 19:09:51 +08:00
ibuler
5ea4ba4867 [Update] 小调整一些内容 2020-05-21 19:05:58 +08:00
OrangeM21
063863b5f5 Merge remote-tracking branch 'origin/master' 2020-05-21 18:17:35 +08:00
OrangeM21
9cfce136d1 [fix]添加上传私钥组件,修复翻译bug 2020-05-21 18:17:19 +08:00
jym503558564
aaa1ba329e [Update] 修改任务详情组件 2020-05-21 17:38:23 +08:00
ibuler
d43a30932e [Update] 优化一些问题 2020-05-21 16:18:28 +08:00
ibuler
b107726479 [Update] dashboard基本完成 2020-05-21 11:26:34 +08:00
ibuler
a47f8d1974 [Update] 修改top 10 2020-05-20 21:00:14 +08:00
ibuler
ed98028fff [Merge] 2020-05-20 19:40:50 +08:00
OrangeM21
b1969f1f11 [fix] 2020-05-20 18:21:17 +08:00
OrangeM21
d90b01923b Merge remote-tracking branch 'origin/master' 2020-05-20 17:29:48 +08:00
OrangeM21
2bfd6f2045 [update]完善用户界面 2020-05-20 17:29:00 +08:00
Eric_Lee
049db348c6
[Update] interface view (#55) 2020-05-20 17:25:25 +08:00
ibuler
8c46abbd64 [Update] 重命名 TimeLine => Timeline 2020-05-20 14:02:09 +08:00
ibuler
45d1ce2d96 [Update] 完成组件timeline card 2020-05-20 13:59:59 +08:00
ibuler
6385a1929d [Update] Merge it 2020-05-19 21:08:50 +08:00
ibuler
03450c05ed [Update] 添加dashboard 2020-05-19 19:57:26 +08:00
Eric
429378fd67 add UploadField 2020-05-19 18:52:59 +08:00
ibuler
9cf93cbc52 Merge branch 'master' of github.com:jumpserver/lina 2020-05-19 11:10:55 +08:00
BaiJiangJie
16400a80c5
Merge pull request #54 from jumpserver/dashboard 
Dashboard
 2020-05-19 11:10:34 +08:00
ibuler
e83d2d8e5a Merge branch 'master' of github.com:jumpserver/lina 2020-05-19 11:06:29 +08:00
ibuler
0fa2db5c96 [Update] 修改导入导出 2020-05-19 11:05:58 +08:00
OrangeM21
3f908fcee3 [update]添加命令执行页面 2020-05-19 01:48:58 +08:00
ibuler
f07e68113d [Update] 更新store settings 2020-05-18 15:52:08 +08:00
Bai
ad18663a39 [Update] Dashboard (2) 2020-05-18 12:02:19 +08:00
ibuler
f8fb2ede10 [Update] 修改导入导出 2020-05-15 13:30:42 +08:00
ibuler
c5ab4befab [Update] 拆分table action left side 2020-05-15 12:24:34 +08:00
ibuler
7b98582a7f [Update] 修改一些翻译 2020-05-14 17:58:53 +08:00
ibuler
efafcd0fd1 [Update] 修改 table form tooltips 2020-05-14 15:20:03 +08:00
jym503558564
df6b5ffb0a Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-14 11:22:47 +08:00
jym503558564
1683e2a963 [Update] 授权管理详情添加或删除关系时reload页面 2020-05-14 11:21:00 +08:00
ibuler
540062fb09 [Update] 去掉默认使用tr的方式，避免i18n extract无法检测 2020-05-14 11:19:01 +08:00
ibuler
5dde2457d1 [Update] 统一更改了翻译 2020-05-13 20:38:03 +08:00
ibuler
a68ed8e6e4 Merge branch 'master' of github.com:jumpserver/lina 2020-05-13 17:47:46 +08:00
ibuler
f6e85771ec [Update] 去掉i18n检查 2020-05-13 17:47:23 +08:00
OrangeM21
1286277a3a Merge remote-tracking branch 'origin/master' 2020-05-13 17:15:30 +08:00
ibuler
d83684b1f1 [Update] Merge 2020-05-13 17:02:54 +08:00
ibuler
19ef8febd5 [Update] 暂时注释 2020-05-13 16:45:51 +08:00
ibuler
643cc1a355 [Update] 修改i18n 2020-05-13 16:04:39 +08:00
OrangeM21
8b9cf6bbe5 Merge remote-tracking branch 'origin/master' 2020-05-13 15:03:36 +08:00
jym503558564
1b0b67b2b5 [Merge] 合并冲突 2020-05-13 14:53:59 +08:00
jym503558564
6d476230e2 [Update] 修改工单详情组件 2020-05-13 14:51:09 +08:00
ibuler
8fd8edf845 [Update] 修改了翻译 2020-05-13 14:41:28 +08:00
OrangeM21
b94ce8b63b [fix]完善Assets 2020-05-13 14:32:34 +08:00
ibuler
a120438584 Merge branch 'master' of github.com:jumpserver/lina 2020-05-13 11:03:03 +08:00
ibuler
5000bb6d24 [Update] 修改routes 和 i18n 2020-05-13 11:02:36 +08:00
OrangeM21
e65da0e1cf Merge remote-tracking branch 'origin/master' 2020-05-12 20:41:32 +08:00
OrangeM21
08f84a73a0 [fix]完善Assets 2020-05-12 20:41:07 +08:00
jym503558564
d7feb3dac4 [Update] 初步实现工单管理详情组件 2020-05-12 19:42:14 +08:00
ibuler
743ed34b54 [Update] 完成用户模块 2020-05-12 14:28:56 +08:00
ibuler
aafffd1f56 [Update] 拆分i18n 2020-05-12 11:43:01 +08:00
ibuler
bd9f22d921 Merge branch 'master' of github.com:jumpserver/lina 2020-05-12 11:28:21 +08:00
ibuler
4da8085c03 [Update] 修改i18n 2020-05-12 11:26:21 +08:00
OrangeM21
da19464b36 [fix]添加Tree Loading 2020-05-12 02:32:12 +08:00
OrangeM21
b20f837714 [fix]修复高度问题 2020-05-12 01:53:53 +08:00
OrangeM21
31e653d0fc [fix]完成网关列表 2020-05-12 01:42:28 +08:00
OrangeM21
594102d03c Merge remote-tracking branch 'origin/master' 2020-05-11 20:11:55 +08:00
OrangeM21
5d160c4e6d [fix]完成命令过滤列表 2020-05-11 20:11:21 +08:00
OrangeM21
d925c07d9e [fix]完成命令过滤 2020-05-11 19:22:08 +08:00
ibuler
6de50f1e00 [Update] 去掉i18n的过度包装 2020-05-11 15:58:13 +08:00
ibuler
bb5585bd0c [Bugfix] 修复relation card的bug 2020-05-11 15:37:03 +08:00
ibuler
60f174fe0e [Update] 修改时间日期i18n 2020-05-11 14:20:15 +08:00
ibuler
1dafaf12aa Merge branch 'master' of github.com:jumpserver/lina 2020-05-11 12:06:50 +08:00
OrangeM21
86c1d7a7a0 [fix]修改i18n,更新语言环境至localstorage 2020-05-11 12:06:23 +08:00
ibuler
ebc92b4f9c [Update] 修改i18n 2020-05-11 11:51:36 +08:00
ibuler
2bc56d89d8 Merge branch 'master' of github.com:jumpserver/lina 2020-05-11 10:39:52 +08:00
jym503558564
549a9b681c [Update] 删除ActiveCard，使用QuickActions 2020-05-11 10:37:27 +08:00
ibuler
db71e44167 Merge branch 'master' of github.com:jumpserver/lina 2020-05-09 19:44:52 +08:00
ibuler
824f96e479 [Update] 修改tab page逻辑，避免刷新回到第一个tab 2020-05-09 19:44:39 +08:00
Orange
58e384d1b8
Merge branch 'master' into orange_dev 2020-05-09 19:23:07 +08:00
OrangeM21
fe7c3bb1f9 Revert "[update]完成详情页设置，修改tree结构" 
This reverts commit 1ba5fae9
 2020-05-09 19:01:05 +08:00
OrangeM21
1ba5fae985 [update]完成详情页设置，修改tree结构 2020-05-09 18:59:01 +08:00
OrangeM21
b49340b6d0 [update]完成详情页设置，修改tree结构 2020-05-09 18:05:12 +08:00
ibuler
6c2f50c6d2 [Update] 修改激活禁用 2020-05-09 17:04:32 +08:00
ibuler
c21e761d1a [Update] 修改detail formatter引起的bug 2020-05-09 15:11:59 +08:00
ibuler
a9db2a0b7e [Update] merge it 2020-05-09 14:59:12 +08:00
OrangeM21
cf08cb1db9 [update]修改Tree组件结构 2020-05-09 12:29:52 +08:00
ibuler
603edfc5c1 [Update] 补充user detail中组件 2020-05-09 11:32:01 +08:00
jym503558564
d9495682a8 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-09 11:21:53 +08:00
jym503558564
28a8eac1bd [Update] 资产授权详情添加资产 2020-05-09 11:21:22 +08:00
Eric_Lee
228f478848
ldap settings (#47) 2020-05-09 10:31:04 +08:00
ibuler
5ebda711e6 Merge branch 'master' of github.com:jumpserver/lina 2020-05-08 21:06:12 +08:00
ibuler
d8ec817c51 [Update] 修改封装授权的资产comp 2020-05-08 21:04:45 +08:00
xinwen
09c2f2e349 [Add] DateFormatter 2020-05-08 21:03:40 +08:00
ibuler
f1cf66fd12 [Update] 修改一些翻译 2020-05-08 20:28:15 +08:00
ibuler
e30811a656 [Update] 修改i18n 2020-05-08 20:03:23 +08:00
ibuler
9d0bdd5f69 [Update] 修改i18n风格 2020-05-08 19:54:32 +08:00
jym503558564
fcd319d1ea [Update] 去掉一些console.log 2020-05-08 19:38:34 +08:00
jym503558564
9791b8a68f [Update] 授权详情添加关系时，触发该授权关系的ListTable更新 2020-05-08 19:37:22 +08:00
ibuler
084f2f6f95 [Update] 修改翻译通用的函数 2020-05-08 18:29:26 +08:00
ibuler
846f9476f8 Merge branch 'master' of github.com:jumpserver/lina 2020-05-08 17:31:02 +08:00
ibuler
dbe750de19 [Update] 级别完成用户基本信息详情 2020-05-08 17:30:32 +08:00
jym503558564
90fc31aa99 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-08 16:22:06 +08:00
jym503558564
c71ebdadc2 [Update] 修改详情组件控制RelationCard数据是否显示在下方 2020-05-08 16:21:31 +08:00
OrangeM21
3d0eb5bff5 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-08 15:32:08 +08:00
OrangeM21
a05e62ebcb [update]完成命令过滤器详情页面 2020-05-08 15:31:28 +08:00
jym503558564
7480db45bd [Update] 修改一些数据问题 2020-05-07 20:14:07 +08:00
ibuler
8ee0e46a3a [Update] 修改 detailcard 支持jsx 2020-05-07 18:58:44 +08:00
ibuler
5cd549d5f1 [Update] Merge 2020-05-07 18:15:07 +08:00
jym503558564
29c3894816 [Update] 修改一些翻译，Card使用IBox 2020-05-07 17:32:46 +08:00
ibuler
55db5e926e [Update] 修改quick actions组件 2020-05-07 16:43:41 +08:00
ibuler
7bbcd03928 Merge branch 'master' of github.com:jumpserver/lina 2020-05-07 16:28:36 +08:00
ibuler
fd35ad201f [Update] 修改login log 2020-05-07 16:28:00 +08:00
OrangeM21
c7fd346b19 Merge branch 'master' of https://github.com/jumpserver/lina 2020-05-07 11:28:54 +08:00
OrangeM21
ffbfeb3709 [update]添加CodeMirror插件和xterm插件,完善命令执行页面。 2020-05-07 11:28:19 +08:00
ibuler
9f81d6fcbd Merge branch 'master' of github.com:jumpserver/lina 2020-05-06 21:21:42 +08:00
ibuler
91ce920159 [Update] Data form callback 提供参数values 2020-05-06 21:21:03 +08:00
八千流
87d999e546
Merge pull request #44 from jumpserver/jym 
[Update] 修改授权详情组件
 2020-05-06 21:10:16 +08:00
jym503558564
44db4e6963 [Update] 修改授权详情组件 2020-05-06 21:08:21 +08:00
ibuler
e537681d43 [Update] Data form 添加额外button 2020-05-06 20:09:20 +08:00
ibuler
add0d34338 [Update] 修改button透传 2020-05-06 19:20:09 +08:00
ibuler
50a784bf24 [Update] 修改快捷修改 2020-05-06 18:16:35 +08:00
ibuler
307c6d39c5 [Update] genericform 添加loading 2020-05-06 16:02:02 +08:00
ibuler
99328722e9 [Update] 拆分GenricCreateUpdateForm 2020-05-06 15:22:47 +08:00
ibuler
af0398d9d5 [Update] 优化Ibox 2020-05-06 10:59:03 +08:00
ibuler
64fd05fc26 [Update] 修改actions 2020-04-30 17:41:56 +08:00
ibuler
2c01038b41 [Bugfix] 修复tab 单向数据流冒泡机制 2020-04-30 16:47:38 +08:00
ibuler
099eb7e11a [Update] 添加用户详情 2020-04-30 16:06:23 +08:00
ibuler
2c389a52f1 [Bugfix] 修复左侧不隐藏的bug 2020-04-30 15:21:27 +08:00
ibuler
32a3c370ba [Update] 修改ztree 2020-04-30 15:18:15 +08:00
OrangeM21
c8197fba43 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-29 19:48:00 +08:00
ibuler
073d38bd6d [Update] 修改detail 逻辑 2020-04-29 18:44:34 +08:00
OrangeM21
d154b20de7 [update]抽出下载和导入的Dialog 2020-04-29 14:33:43 +08:00
Orange
cd6751723c
Merge branch 'master' into orange_dev 2020-04-28 16:03:57 +08:00
OrangeM21
f521c103d4 [update]新增AssetSelect组件,有bug,正在修复 2020-04-28 15:09:56 +08:00
ibuler
99f957b48c [Update] 修改list table 2020-04-27 13:46:16 +08:00
ibuler
e25b4cc33f Merge branch 'master' of github.com:jumpserver/lina 2020-04-27 10:55:08 +08:00
ibuler
e6a48aea0f [Update] 级别完成relaction card 2020-04-27 10:53:42 +08:00
八千流
30899d4486
Merge pull request #35 from jumpserver/jym_dev 
[Update] 更新ActiveCard更新提示
 2020-04-26 20:31:47 +08:00
jym503558564
5eb57558de [Update] 更新ActiveCard更新提示 2020-04-26 20:30:37 +08:00
ibuler
25a585cd5a Merge branch 'master' of github.com:jumpserver/lina 2020-04-26 20:23:21 +08:00
ibuler
f4941358ca [Update] 修改select2 2020-04-26 20:22:53 +08:00
OrangeM21
bcfd6d4da3 Merge remote-tracking branch 'origin/master' 2020-04-26 20:17:14 +08:00
ibuler
4041e2279b [Bugfix] 修复select 弱引用问题 2020-04-26 20:11:39 +08:00
OrangeM21
34673f3e7a [hotfix]抽象搜索组件 2020-04-26 20:03:42 +08:00
OrangeM21
f39cd4a65b [hotfix]抽象搜索组件 2020-04-26 19:50:25 +08:00
ibuler
ae6459f92b [Update] 添加help text 2020-04-26 19:35:32 +08:00
ibuler
159e1d85df Merge branch 'master' of github.com:jumpserver/lina 2020-04-26 15:46:30 +08:00
jym503558564
a21fecf24a [Update] 授权详情中tab列表增加删除动作,以前切换tab，控制右上角的删除和修改的显示和隐藏 2020-04-26 14:33:48 +08:00
ibuler
603867d839 [Update] 修改relation card 2020-04-26 14:25:03 +08:00
Eric
4ac43ca708 [Update] 修改 action formatter 2020-04-26 11:00:25 +08:00
ibuler
9a29bc19ce [Update] 修改action formator 2020-04-26 10:45:48 +08:00
ibuler
7b6a8878fb [Update] 修改action formattor 2020-04-26 10:31:28 +08:00
ibuler
4accd55600 Merge remote-tracking branch 'origin/card' 2020-04-26 10:22:04 +08:00
ibuler
606cddbc40 Merge branch 'master' of github.com:jumpserver/lina 2020-04-26 10:16:04 +08:00
ibuler
b55cc3ce9f [Update] stash card 2020-04-26 08:59:17 +08:00
Eric_Lee
d847c1ca7e
Dev eric (#32) 
* fix more action

* add customActionsFormatter
 2020-04-24 17:41:59 +08:00
ibuler
ec3bd29153 [Update] Table换个风格 2020-04-24 10:52:30 +08:00
ibuler
053ac8e12f [Update] 修改分页 2020-04-24 10:07:54 +08:00
ibuler
2ecf33b092 [Bugfix] 修复拼写错误 2020-04-23 21:05:55 +08:00
ibuler
f96f200a13 [Update] 修改check boolean 2020-04-23 21:00:09 +08:00
ibuler
a6b3410ff6 [Update] Remove debug msg 2020-04-23 20:53:34 +08:00
ibuler
6ed5123d21 [Update] remove click 2020-04-23 20:50:09 +08:00
ibuler
2aefcf6ee5 [Update] Merge with master 2020-04-23 20:48:31 +08:00
ibuler
c7be48a62e [Update] 优化actions 2020-04-23 20:46:34 +08:00
ibuler
8442218e04 [Update] 优化select2 2020-04-23 19:12:09 +08:00
Orange
336242dd07
Merge pull request #30 from jumpserver/orange_dev 
[hotfix]修改搜索组件
 2020-04-23 17:19:00 +08:00
OrangeM21
c8d6afc7c2 [hotfix]修改搜索组件 2020-04-23 17:17:32 +08:00
Orange
875213968f
Merge pull request #29 from jumpserver/orange_dev 
[update]修改搜索组件
 2020-04-23 16:43:19 +08:00
OrangeM21
ffa49b6acf [update]修改搜索组件 2020-04-23 16:24:57 +08:00
OrangeM21
1159201b30 [update]修改搜索组件 2020-04-23 16:23:39 +08:00
jym503558564
2244d7fede [Update] 修改一些详情组件 2020-04-23 16:10:26 +08:00
jym503558564
1d21c0f3ea [Update] 资产授权增加资产树 2020-04-23 14:18:34 +08:00
ibuler
30e455f90a Merge branch 'master' of github.com:jumpserver/lina 2020-04-22 17:44:03 +08:00
ibuler
7975c0d098 [Update] 重命名tab page 2020-04-22 17:43:30 +08:00
jym503558564
d010558b3f Merge branch 'master' into jym_dev 2020-04-22 14:51:19 +08:00
jym503558564
f33c8d797b [Update] 增加ActiveCard 2020-04-22 14:49:45 +08:00
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
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
ibuler
668ac84e8a [Update] 修改详情页 2020-04-21 13:29:27 +08:00
ibuler
e02f7485b7 [Update] 修订update 2020-04-21 11:47:33 +08:00
ibuler
d949d87cdd [Update] 添加lodash到全局 2020-04-20 19:55:07 +08:00
ibuler
73bd10d5af [Update] 使用自己生成的theme 2020-04-20 18:55:48 +08:00
ibuler
05be3508f1 Merge branch 'master' of github.com:jumpserver/lina 2020-04-19 10:26:04 +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
OrangeM21
f6efefbc10 [update]抽象Ztree +3 2020-04-15 16:59:18 +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
Bai
3274b14c4c [Update] 修改Dialog组件确认出发的事件名: comfirm -> confirm 2020-04-13 14:48:21 +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
ibuler
4cc825c293 [update] 修改默认值 2020-04-10 19:57:20 +08:00
ibuler
abccf531da Merge branch 'master' of github.com:jumpserver/lina 2020-04-10 19:46:14 +08:00
ibuler
59370c7464 [update] 修改默认值 2020-04-10 19:45:46 +08:00
OrangeM21
74e0c118ab Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-10 19:21:41 +08:00
OrangeM21
b71d170331 [update]使has方法可用 2020-04-10 19:21:33 +08:00
ibuler
736fa07e07 [Update] 修改通用组件，提供默认route 2020-04-10 18:56:24 +08:00
ibuler
2fbff953bd [Update] 提供默认值 2020-04-10 18:52:12 +08:00
ibuler
3255c079ad [Update] 修改select2 2020-04-10 18:31:35 +08:00
Orange
23c4050a8e
[fix]去掉Url 2020-04-10 15:57:18 +08:00
OrangeM21
1c499995df Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-10 15:52:25 +08:00
OrangeM21
5050cbbc07 [fix]去掉Url 2020-04-10 15:52:18 +08:00
ibuler
79e2afed64 Merge branch 'master' of github.com:jumpserver/lina 2020-04-10 15:40:19 +08:00
ibuler
74b0314956 [Update] 基本完成通用的创建和更新view 2020-04-10 15:40:02 +08:00
OrangeM21
5141a701b6 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-10 14:54:10 +08:00
OrangeM21
25886b82bf [update]添加treeNode 2020-04-10 14:53:57 +08:00
jym503558564
5dea00432c [Merge] Merge 2020-04-09 21:15:19 +08:00
jym503558564
dc07cb15db [Update] 修改el-checkbox翻译显示问题 2020-04-09 21:07:10 +08:00
jym503558564
515964818b [Update] 资产授权列表显示expand值 2020-04-09 21:00:07 +08:00
ibuler
ba54fc2021 [Update] 暂存 2020-04-09 20:48:50 +08:00
ibuler
709e52ea38 [Update] merge 2020-04-09 19:39:24 +08:00
ibuler
f16554bd80 [Update] 调整ui 2020-04-09 19:37:02 +08:00
Eric
a1959fd44a Session detail view link 2020-04-09 19:31:06 +08:00
Eric
95a373ae68 command list view 2020-04-09 19:31:06 +08:00
ibuler
1257511cf4 [Update] 统一名称 2020-04-09 10:56:46 +08:00
ibuler
cc3ba249b6 [Update] merge 2020-04-08 20:04:09 +08:00
ibuler
e0e34d8eb2 [Update] 修改expand 2020-04-08 20:00:11 +08:00
Orange
69ca0ff08c
Merge pull request #10 from jumpserver/jym_dev 
[Update] 更新授权的列表组件和创建组件
 2020-04-08 18:43:12 +08:00
OrangeM21
20612fdb26 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-08 17:11:19 +08:00
OrangeM21
03af0a150e [update]完成导出导入设置 2020-04-08 17:09:59 +08:00
jym503558564
2e69d96bd4 Merge branch 'master' into jym_dev 2020-04-08 16:57:45 +08:00
ibuler
27346fb891 [Update] 更新fields group 2020-04-08 16:25:59 +08:00
jym503558564
df0ce46290 [Update] 修改授权列表组件页面 2020-04-08 15:58:32 +08:00
ibuler
ecaf74d8ed Merge branch 'master' of github.com:jumpserver/lina 2020-04-08 14:57:12 +08:00
ibuler
aa583d9741 [Update] 修改geneate form 2020-04-08 14:56:34 +08:00
OrangeM21
f70d59a0fb Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-08 14:29:01 +08:00
OrangeM21
33a7c03fc9 [update] 2020-04-08 14:28:54 +08:00
ibuler
6ca064109b [Update] 优化了auto data table 2020-04-08 13:41:55 +08:00
ibuler
514ccfb4b8 [Update] 修改通用list page 2020-04-08 11:46:04 +08:00
ibuler
56a5b5733e Merge branch 'master' of github.com:jumpserver/lina 2020-04-07 20:56:51 +08:00
ibuler
07fb293cbe [Update] 修改删除 2020-04-07 20:55:13 +08:00
OrangeM21
6ae4fa8b3e Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-07 20:48:10 +08:00
OrangeM21
df420857ad [update]更新HeaderAction 2020-04-07 20:45:51 +08:00
Orange
b4a57ee4c0
Merge pull request #8 from jumpserver/jym_dev 
[Update] 更新一些列表组件
 2020-04-07 20:34:10 +08:00
ibuler
eb8127f38a [Update] 基本生成和创建 2020-04-07 19:16:43 +08:00
ibuler
b6526c6989 [Update] 修改自动创建的表单 2020-04-07 18:38:17 +08:00
jym503558564
ddba4764ef Merge branch 'master' into jym_dev 2020-04-07 16:28:51 +08:00
ibuler
74041fd72e [Update] Pre create auto data form 2020-04-07 15:46:10 +08:00
ibuler
834da1f020 [Update] 修改select2 2020-04-07 15:05:40 +08:00
ibuler
8ce5f57a20 [update] 修改select2 2020-04-07 14:38:12 +08:00
jym503558564
7bd7317f41 [Update] 增加网关列表组件 2020-04-07 12:04:27 +08:00
ibuler
4f57fd3ba1 [Update] 修改翻译 2020-04-07 11:37:45 +08:00
jym503558564
e7af26e2c0 [Update] 修改数据获取长度时，直接点length 2020-04-07 11:12:14 +08:00
ibuler
901b4a33bf [Update] 修改一些布局 2020-04-07 10:45:37 +08:00
ibuler
0383ea2458 Merge branch 'master' of github.com:jumpserver/lina 2020-04-03 21:03:48 +08:00
ibuler
15e4a38e7d [Update] 修改导入导出 2020-04-03 21:02:05 +08:00
OrangeM21
ef8282fe16 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-03 20:57:43 +08:00
OrangeM21
2dee572812 [update]修改表单抽象 2020-04-03 20:51:02 +08:00
ibuler
e7c4f8ef0b [Update] 完成刷新和搜索 2020-04-03 19:41:21 +08:00
ibuler
fc70926e9a [Update] 基本完成批量删除 2020-04-03 18:15:45 +08:00
ibuler
5d9d87512a [Update] 添加默认更新配置 2020-04-03 15:50:05 +08:00
ibuler
8a40a5c0ff [Update] 修改默认动作等 2020-04-03 15:36:52 +08:00
jym503558564
e28e487cb4 Merge branch 'master' into jym_dev 2020-04-03 12:44:22 +08:00
ibuler
8bc3bd6ebb Merge branch 'master' of github.com:jumpserver/lina 2020-04-03 12:33:06 +08:00
ibuler
575b0df120 [Update] 修改模板 2020-04-03 12:12:39 +08:00
OrangeM21
8274b7d8b0 Merge branch 'master' of https://github.com/jumpserver/lina 2020-04-03 11:36:58 +08:00
OrangeM21
37c64f2f59 [update]更新表格数据 2020-04-03 11:36:55 +08:00
jym503558564
904100cadd [Update] 修改列表组件的默认复选框对其属性为selectionAlign 2020-04-03 10:24:18 +08:00
ibuler
b526d541b6 [Update] 修改table 2020-04-03 10:16:29 +08:00
ibuler
46b2616ab3 [Update] action group 有点问题 2020-04-02 19:49:00 +08:00
ibuler
3873e7ceaf [Update] 解决排序问题 2020-04-02 17:39:08 +08:00
ibuler
f6702c701d [Update] Merge 2020-04-02 15:09:08 +08:00
ibuler
77716f3caf [Update] 修改generic list page 2020-04-02 15:05:21 +08:00
ibuler
1693e11dcc [Update] 修改table 渲染formatter 2020-04-02 13:36:25 +08:00
jym503558564
be9cd45ba7 [Update] 修复列表页面复选框点点的问题 2020-04-02 11:29:45 +08:00
ibuler
1ea349b460 [Update] 修改action 2020-04-01 20:52:27 +08:00
ibuler
85a4cc5625 [Update] 暂提 2020-04-01 20:12:49 +08:00
OrangeM21
787c9f359e [update]更新ElFormRender 2020-04-01 16:54:36 +08:00
ibuler
88a2dcf463 [Update] 修改 tables 2020-03-31 20:22:21 +08:00
ibuler
110f9ef9d3 [Update] 修改datatable 2020-03-31 15:49:45 +08:00
ibuler
d3bcbac7cf [Update] Mereg 2020-03-30 19:53:37 +08:00
ibuler
5d0442d7e6 [Update] 添加select 异步分页加载 2020-03-30 19:48:25 +08:00
OrangeM21
d12ed5105c [update]eslint 问题修复 2020-03-30 17:04:39 +08:00
OrangeM21
105645d8d8 [update]完成表单页面 2020-03-30 17:03:51 +08:00
ibuler
1e18e7ebe7 [Update] 修改detail page 2020-03-30 13:07:49 +08:00
ibuler
e80dbe9ee4 [Update] 修改table 2020-03-27 21:02:27 +08:00
OrangeM21
5129dc4849 Merge branch 'master' of https://github.com/jumpserver/lina 2020-03-27 20:34:51 +08:00
OrangeM21
97c310107a [update]table组件重构 2020-03-27 20:33:24 +08:00
ibuler
840d83182b [Update] 修改提示文案 2020-03-27 20:31:15 +08:00
ibuler
f07e02e211 [update] Merge with master 2020-03-27 10:26:24 +08:00
ibuler
72737cb6b4 [Update] 修改tabs组件 2020-03-26 21:02:33 +08:00
OrangeM21
888f64e3ca [update]修改El-table 2020-03-26 19:28:45 +08:00
ibuler
8662a52456 [Update] 完成 action 组件 2020-03-26 18:49:32 +08:00
ibuler
d75e75ac17 [Update] 组件动作组 2020-03-26 17:35:37 +08:00
ibuler
2a877b80b6 [Update] 修改翻译 2020-03-26 13:44:43 +08:00
ibuler
2de1976bc8 [Update] 完善布局 2020-03-26 11:30:19 +08:00
ibuler
a68cb92c41 [Update] 优化一波 2020-03-25 18:46:04 +08:00
ibuler
ae4ce899f3 [Update] 优化布局 2020-03-25 13:57:08 +08:00
ibuler
48d21422d7 [Update] 有货左侧菜单 2020-03-24 11:28:56 +08:00
ibuler
b353706245 [Update] 修改菜单 2020-03-23 19:15:17 +08:00
ibuler
0b122aacfd [Update] 优化组件 2020-03-23 18:19:54 +08:00
花裤衩
5afac23d2f perf[SvgIcon]: change xlink:href to href 2019-10-22 20:29:58 +08:00
Pan
79eeed7d59 feat[SvgIcon]: support import svg from url 2019-05-24 16:57:40 +08:00
花裤衩
a5d4bbda75
[release]4.1.0 (#211) 2019-04-19 20:41:52 +08:00
Pan
b74ab40e2a refine code 2019-02-13 16:00:14 +08:00
Pan
d4f866838a fix[Breadcrumb]: fixed eslint error 2019-01-17 11:40:17 +08:00
Pan
abfb8623c7 pref[Hamburger]: refactor Hamburger component 2019-01-17 11:03:45 +08:00
Pan
5b792c6fe0 feat[Breadcrumb]: add hide Breadcrumb option 2019-01-01 23:21:32 +08:00
Pan
cc94b62282 fix[Breadcurmb]: fixed router-link bug #217 2018-11-09 16:29:41 +08:00
Pan
2dcd0aa08a fix[Breadcurmb]: fixed pathCompile bug #217 2018-11-09 13:28:41 +08:00
Pan
8c0668d0d3 feature: add pathToRegexp to compile path 2018-10-08 17:28:25 +08:00
花裤衩
5d769533ac
add: eslint-plugin-vue (#148) 2018-08-20 15:45:15 +08:00
花裤衩
f01a1ad7b7
refactor[ScrollBar]: use el-scrollbar (#90) 2018-05-07 14:53:03 +08:00
Pan
3c75eb6dde refine code 2018-05-02 18:00:35 +08:00
Pan
5b7aafacc4 fix some bugs 2017-12-14 17:14:35 +08:00
Pan
b97b370f04 perf:format code 2017-11-29 09:55:33 +08:00
Pan
37b6253e14 feat:add tree demo 2017-11-29 09:55:33 +08:00
Pan
86096e4eab refactor:router&&sidemenu 2017-11-29 09:55:33 +08:00
Pan
dcd3e31658 refactor:refine SvgIcon 2017-11-29 09:55:33 +08:00
Pan
4332f02642 refactor:change layout 2017-11-29 09:55:33 +08:00
Pan
b44c7384dc refactor 2017-08-30 17:42:06 +08:00
Pan
c51c7fec5f refine 2017-06-28 23:02:22 +08:00
Pan
40a5977d1f 🍊 2017-06-26 18:03:05 +08:00
Pan
c528bd8ad0 init 2017-06-26 13:38:24 +08:00