2116 Commits

Author	SHA1	Message	Date
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