Skip to content

Commit f476d72

Browse files
author
HeLinJiang
committed
Merge pull request #2 from helinjiang/v1.1.0
V1.1.0 优化login模块
2 parents 8c576a1 + af84285 commit f476d72

70 files changed

Lines changed: 927 additions & 1228 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎clientsrc/modules/common/global.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
require('/modules/widget/forminput/main');
21
require('/modules/widget/tipalert/main');
32
require('/modules/widget/select2option/main');
43
require('/modules/widget/select2/main');
54
require('/modules/widget/date/main');
65

6+
require('/modules/widget/hecheckbox/main');
77
require('/modules/widget/heformitem/main');
88
require('/modules/widget/heform/main');
99

‎clientsrc/modules/common/validator.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@
44
* 如果放在中js中，则统一配置好控制，此时的form组件就定义为轻量级的
55
* 如果放在标签内，则更灵活，而且还可以在无JS的情况下利用html5原生的校验能力
66
* 也可以两者同时使用。
7+
*
8+
username: {
9+
required: {
10+
rule: true,
11+
message: '用户名不能为空！'
12+
},
13+
minlength: {
14+
rule: 2,
15+
message: '最小长度为2'
16+
},
17+
maxlength: {
18+
rule: 6,
19+
message: '最大长度为6'
20+
}
21+
}
722
*/
823

924
/**

‎clientsrc/modules/common_htmls/css_global.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- BEGIN GLOBAL MANDATORY STYLES -->
2+
<link rel="stylesheet" href="http://fonts.useso.com/css?family=Open+Sans:400,300,600,700&subset=all" />
3+
<link rel="stylesheet" href="/static/plugins/font-awesome/css/font-awesome.min.css" /><!--ignore-->
4+
<link rel="stylesheet" href="/static/plugins/simple-line-icons/simple-line-icons.min.css" /><!--ignore-->
5+
<link rel="stylesheet" href="/static/plugins/bootstrap/css/bootstrap.min.css" /><!--ignore-->
6+
<link rel="stylesheet" href="/static/plugins/uniform/css/uniform.default.min.css" /><!--ignore-->
7+
<!-- END GLOBAL MANDATORY STYLES -->

‎clientsrc/modules/common_htmls/css_plugins.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!-- BEGIN PAGE LEVEL STYLES -->
2+
<link rel="stylesheet" href="/static/plugins/bootstrap-modal/css/bootstrap-modal-bs3patch.css"/><!--ignore-->
3+
<link rel="stylesheet" href="/static/plugins/bootstrap-modal/css/bootstrap-modal.css"/><!--ignore-->
4+
<link rel="stylesheet" href="/static/plugins/select2/select2.css"/><!--ignore-->
5+
<link rel="stylesheet" href="/static/plugins/datatables/plugins/bootstrap/dataTables.bootstrap.css"/><!--ignore-->
6+
<link rel="stylesheet" href="/static/plugins/bootstrap-toastr/toastr.min.css"/><!--ignore-->
7+
<link rel="stylesheet" href="/static/plugins/bootstrap-datepicker/css/datepicker.css"/><!--ignore-->
8+
<!-- END PAGE LEVEL SCRIPTS -->

‎clientsrc/modules/common_htmls/css_theme.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!-- BEGIN THEME STYLES -->
2+
<link rel="stylesheet" href="/static/css/style-conquer.css" /><!--ignore-->
3+
<link rel="stylesheet" href="/static/css/style.css" /><!--ignore-->
4+
<link rel="stylesheet" href="/static/css/style-responsive.css" /><!--ignore-->
5+
<link rel="stylesheet" href="/static/css/plugins.css" /><!--ignore-->
6+
<link rel="stylesheet" href="/static/css/themes/default.css" /><!--ignore-->
7+
<!-- END THEME STYLES -->

‎clientsrc/modules/common_htmls/js_global.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!-- BEGIN CORE PLUGINS -->
2+
<script src="/static/plugins/jquery-1.11.0.min.js"></script><!--ignore-->
3+
<script src="/static/plugins/jquery-migrate-1.2.1.min.js"></script><!--ignore-->
4+
5+
<!-- IMPORTANT! Load jquery-ui-1.10.3.custom.min.js before bootstrap.min.js to fix bootstrap tooltip conflict with jquery ui tooltip -->
6+
<!-- <script src="/static/plugins/jquery-ui/jquery-ui-1.10.3.custom.min.js"></script> -->
7+
8+
<script src="/static/plugins/bootstrap/js/bootstrap.min.js"></script><!--ignore-->
9+
<script src="/static/plugins/bootstrap-hover-dropdown/bootstrap-hover-dropdown.min.js"></script><!--ignore-->
10+
<script src="/static/plugins/jquery-slimscroll/jquery.slimscroll.min.js"></script><!--ignore-->
11+
<script src="/static/plugins/jquery.blockui.min.js"></script><!--ignore-->
12+
<script src="/static/plugins/uniform/jquery.uniform.min.js"></script><!--ignore-->
13+
<!-- END CORE PLUGINS -->

‎clientsrc/modules/common_htmls/js_plugins.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!-- BEGIN PAGE LEVEL PLUGINS -->
2+
<script src="/static/plugins/bootstrap-modal/js/bootstrap-modalmanager.js"></script><!--ignore-->
3+
<script src="/static/plugins/bootstrap-modal/js/bootstrap-modal.js"></script><!--ignore-->
4+
<script src="/static/plugins/jquery-validation/js/jquery.validate.min.js"></script><!--ignore-->
5+
<script src="/static/plugins/select2/select2.min.js"></script><!--ignore-->
6+
<script src="/static/plugins/jquery.form.min.js"></script><!--ignore-->
7+
<script src="/static/plugins/datatables/media/js/jquery.dataTables.min.js"></script><!--ignore-->
8+
<script src="/static/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js"></script><!--ignore-->
9+
<script src="/static/plugins/datatables/plugins/bootstrap/dataTables.bootstrap.js"></script><!--ignore-->
10+
<script src="/static/plugins/bootstrap-toastr/toastr.min.js"></script><!--ignore-->
11+
<script src="/static/plugins/bootstrap-datepicker/js/bootstrap-datepicker.js"></script><!--ignore-->
12+
<!-- END PAGE LEVEL PLUGINS -->

‎clientsrc/modules/common_htmls/meta.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<meta charset="utf-8" />
2+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
3+
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
4+
<meta content="" name="description" />
5+
<meta content="" name="author" />
6+
<meta name="MobileOptimized" content="320">

‎clientsrc/modules/login_index/container/main.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="content">
2+
<slot></slot>
3+
</div>

‎clientsrc/modules/login_index/container/main.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
var Vue = require('lib/vue');
2+
3+
module.exports = Vue.extend({
4+
template: __inline('main.html'),
5+
ready: function() {
6+
7+
}
8+
});

0 commit comments

Comments
 (0)