Commit Graph

34 Commits

Author SHA1 Message Date
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
OrangeM21
995553c79e [update]添加根据时间搜索条 2020-05-29 18:02:28 +08:00
OrangeM21
00fc974a8b [fix]修复AssetSelect组件初始化获取状态问题 2020-05-28 15:57:05 +08:00
ibuler
f6d8a1479f [Update] 整理i18n 2020-05-22 11:34:28 +08:00
ibuler
f07e68113d [Update] 更新store settings 2020-05-18 15:52:08 +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
OrangeM21
1159201b30 [update]修改搜索组件 2020-04-23 16:23:39 +08:00
ibuler
49829cb7b6 [Update] 修改base formatter 2020-04-10 21:03:33 +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
jym503558564
ddba4764ef Merge branch 'master' into jym_dev 2020-04-07 16:28:51 +08:00
jym503558564
7bd7317f41 [Update] 增加网关列表组件 2020-04-07 12:04:27 +08:00
jym503558564
e7af26e2c0 [Update] 修改数据获取长度时,直接点length 2020-04-07 11:12:14 +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
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
575b0df120 [Update] 修改模板 2020-04-03 12:12:39 +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
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