Commit Graph

733 Commits

Author SHA1 Message Date
ibuler
ba4a828300 [Update] 基本创建成功 2020-04-08 20:35:59 +08:00
ibuler
e0e34d8eb2 [Update] 修改expand 2020-04-08 20:00:11 +08:00
ibuler
aa583d9741 [Update] 修改geneate form 2020-04-08 14:56:34 +08:00
ibuler
a697c86d37 [Update] 添加cookie package 2020-04-08 12:10:59 +08:00
ibuler
56a5b5733e Merge branch 'master' of github.com:jumpserver/lina 2020-04-07 20:56:51 +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
ibuler
730d2288a2 [Update] 修改成绩 2020-04-07 19:29:49 +08:00
ibuler
eb8127f38a [Update] 基本生成和创建 2020-04-07 19:16:43 +08:00
ibuler
3a7462e562 [Update] 修改generic list page 2020-04-02 15:05:29 +08:00
ibuler
77716f3caf [Update] 修改generic list page 2020-04-02 15:05:21 +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
1e18e7ebe7 [Update] 修改detail page 2020-03-30 13:07:49 +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
3624b061ce [Update] 完善tabs page 2020-03-27 17:22:06 +08:00
ibuler
2f952a626e [Update] 修改detail page 2020-03-27 15:45:36 +08:00
ibuler
f07e02e211 [update] Merge with master 2020-03-27 10:26:24 +08:00
OrangeM21
8b06b6f3be [fix]抽象Tables 2020-03-27 01:30:27 +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
OrangeM21
215ebd3686 Merge branch 'master' of https://github.com/jumpserver/lina 2020-03-26 12:08:00 +08:00
OrangeM21
c878921202 [update]完善Userlist 2020-03-26 12:07:57 +08:00
ibuler
45aae1dd45 [Update] Merge 2020-03-26 11:32:01 +08:00
ibuler
2de1976bc8 [Update] 完善布局 2020-03-26 11:30:19 +08:00
OrangeM21
6ed638a9a1 [Eslint] 2020-03-26 01:15:35 +08:00
Orange
d891b55d0b
Merge pull request #3 from jumpserver/tmp_orange
[add] el-table组件
2020-03-26 01:12:21 +08:00
OrangeM21
4c1ee3bb46 Merge branch 'master' into tmp_orange 2020-03-26 01:10:16 +08:00
ibuler
1a88ee5e49 [Update] 更改paging 2020-03-25 21:06:47 +08:00
ibuler
a68cb92c41 [Update] 优化一波 2020-03-25 18:46:04 +08:00
OrangeM21
80955f9804 [fix] 2020-03-25 17:32:33 +08:00
ibuler
8630e9d890 [Update] 修改组件名称 2020-03-25 14:58:18 +08:00
ibuler
d4d3b3e4af [Update] 修改组件 2020-03-25 14:23:58 +08:00
ibuler
ae4ce899f3 [Update] 优化布局 2020-03-25 13:57:08 +08:00
OrangeM21
88497277a0 [fix]修复拼写错误 2020-03-24 15:31:12 +08:00
OrangeM21
a2c6e419b3 [update]修改表单样式 2020-03-24 15:30:10 +08:00
OrangeM21
9fa15b88b6 [update]修改样式 添加TagView 2020-03-24 12:24:55 +08:00
OrangeM21
843b1c70b6 [fix]修复Eslint bug 2020-03-24 10:43:14 +08:00
ibuler
a04ddd62eb [Update] 修改路由 2020-03-23 19:36:17 +08:00
ibuler
86fc9d595e Merge branch 'master' of github.com:jumpserver/lina 2020-03-23 19:15:36 +08:00
ibuler
b353706245 [Update] 修改菜单 2020-03-23 19:15:17 +08:00
OrangeM21
2d19b63bf6 Merge branch 'orange_dev' 2020-03-23 18:44:52 +08:00
OrangeM21
f37ecb97c7 [update]更新下拉菜单操作 2020-03-23 18:44:13 +08:00
OrangeM21
e1fc717589 [update]数据缓存 2020-03-23 18:22:10 +08:00
ibuler
276e84ffb2 Merge branch 'master' of github.com:jumpserver/lina 2020-03-23 18:20:15 +08:00
ibuler
0b122aacfd [Update] 优化组件 2020-03-23 18:19:54 +08:00
OrangeM21
8bf43295f4 [fix]修复footer bug 2020-03-23 16:18:55 +08:00
OrangeM21
79b659b028 [update]准备组件分拆基础 2020-03-22 23:41:40 +08:00
OrangeM21
129c58d8c7 [UPDATE]修复Navbar样式bug 2020-03-22 16:36:00 +08:00
OrangeM21
6e90f8de23 [UPDATE]更新动画 2020-03-22 16:09:00 +08:00
OrangeM21
e5e44f03db [update]有bug状态 2020-03-22 16:00:33 +08:00
OrangeM21
885776f63c [update]添加font-awsome
[update]修改默认下拉菜单样式
2020-03-22 06:25:24 +08:00
OrangeM21
6f418bdf53 [update]增加判断条件 2020-03-22 05:30:30 +08:00
OrangeM21
e0b2bba927 [update]切换组织后重新刷新页面 2020-03-22 05:27:12 +08:00
OrangeM21
3410a76fb6 [update]添加全局footer 2020-03-22 02:12:57 +08:00
OrangeM21
cb1b4dd292 [update]完善用户管理模块 2020-03-21 04:47:46 +08:00
OrangeM21
d4a941cd80 [update]修改路由, 通配编辑路由 2020-03-21 04:15:32 +08:00
OrangeM21
88b3cb6c31 [fix]修复Eslint Error 2020-03-21 01:31:48 +08:00
OrangeM21
ffc9381e39 Merge branch 'master' of https://github.com/orangemio/lina 2020-03-21 01:31:05 +08:00
OrangeM21
6326169ed0 [update]抽出TableList页面 2020-03-21 01:30:52 +08:00
ibuler
695e23b423 [Update] 修改logo 2020-03-20 18:56:34 +08:00
OrangeM21
e1741fa1f6 [update]添加菜单翻译 2020-03-20 17:31:31 +08:00
OrangeM21
577c9c80c8 [update]进行模型基础抽离 2020-03-20 16:08:03 +08:00
OrangeM21
a104143d64 [update]添加翻译 2020-03-20 12:38:40 +08:00
花裤衩
61d305b8dd merge master 2020-01-09 20:58:40 +08:00
花裤衩
bc94111867 perf[Menu]: remove unused menu-wrapper 2020-01-09 20:38:04 +08:00
花裤衩
9cf3082659 fix[Logout]: click blank area of ​​dropDown able to logout 2020-01-09 20:37:26 +08:00
Pan
dc41791863 Merge branch 'master' into permission-control 2019-05-27 17:02:36 +08:00
Pan
7aef039149 perf: use $route.path to the router-view key 2019-05-27 17:01:11 +08:00
Pan
49645aef79 Merge branch 'master' into permission-control 2019-05-08 18:12:14 +08:00
Pan
9793fff12d perf[Style]: refine fixed-header style when open el-dialog 2019-05-08 18:11:50 +08:00
Pan
27d06dd662 Merge branch 'master' into permission-control 2019-05-05 15:55:56 +08:00
Pan
896962a5c5 perf: optimize page scrolling when setting fixedHeader 2019-05-05 15:55:25 +08:00
Pan
434a04ee3f Merge branch 'master' into permission-control 2019-04-23 09:53:37 +08:00
PLAsusu
b2fe1a22e1 fix: fixed error action name (#339) 2019-04-23 09:50:47 +08:00
Pan
882ba9d148 Revert "remove permission control"
This reverts commit b6147d33f3.
2019-04-21 16:03:05 +08:00
Pan
b6147d33f3 remove permission control 2019-04-19 21:27:47 +08:00
花裤衩
a5d4bbda75
[release]4.1.0 (#211) 2019-04-19 20:41:52 +08:00