hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

引入bootstrap-slider

pull/71/head
PPPSCN 2018-04-11 21:27:23 +08:00
parent 302e92dee8
commit 20a5be0094
7 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/admin/lang/zh-cn.php
View File

@ -171,4 +171,5 @@ return [
'Group tips' => '角色组可以有多个,角色有上下级层级关系,如果子角色有角色组和管理员的权限则可以派生属于自己组别的下级角色组或管理员',
'Rule tips' => '规则通常对应一个控制器的方法,同时左侧的菜单栏数据也从规则中体现,通常建议通过命令行进行生成规则节点',
'Test' => '测试',
'All' => '全部',
];

3
bower.json
View File

@ -32,7 +32,8 @@
"fastadmin-cxselect": "~1.4.0",
"fastadmin-dragsort": "~1.0.0",
"fastadmin-addtabs": "~1.0.0",
"fastadmin-selectpage": "~1.0.0"
"fastadmin-selectpage": "~1.0.0",
"bootstrap-slider": "*"
},
"resolutions": {
"jspdf": "1.1.239 || 1.3.2"

1
public/assets/css/backend.css
View File

@ -10,6 +10,7 @@
@import url("../libs/bootstrap-daterangepicker/daterangepicker.css");
@import url("../libs/nice-validator/dist/jquery.validator.css");
@import url("../libs/fastadmin-selectpage/selectpage.css");
@import url("../libs/bootstrap-slider/slider.css");
body {
background: #f1f4f6;
}

2
public/assets/css/backend.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
public/assets/js/require-backend.js
View File

@ -33,6 +33,7 @@ require.config({
'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export.min',
'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile',
'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN',
'bootstrap-slider': '../libs/bootstrap-slider/bootstrap-slider',
'tableexport': '../libs/tableExport.jquery.plugin/tableExport.min',
'dragsort': '../libs/fastadmin-dragsort/jquery.dragsort',
'sortable': '../libs/Sortable/Sortable.min',

15
public/assets/js/require-backend.min.js vendored
View File

@ -47,6 +47,7 @@ require.config({
'bootstrap-table-export': '../libs/bootstrap-table/dist/extensions/export/bootstrap-table-export.min',
'bootstrap-table-mobile': '../libs/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile',
'bootstrap-table-lang': '../libs/bootstrap-table/dist/locale/bootstrap-table-zh-CN',
'bootstrap-slider': '../libs/bootstrap-slider/bootstrap-slider',
'tableexport': '../libs/tableExport.jquery.plugin/tableExport.min',
'dragsort': '../libs/fastadmin-dragsort/jquery.dragsort',
'sortable': '../libs/Sortable/Sortable.min',
@ -9460,6 +9461,18 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
},
bindevent: function (form) {
},
slider: function (form) {
if ($(".slider", form).size() > 0) {
require(['bootstrap-slider'], function () {
$('.slider').removeClass('hidden').slider().on('slide', function (ev) {
var data = $(this).data();
if (typeof data.unit !== 'undefined') {
$(this).parents('.form-control').siblings('.value').text(ev.value + data.unit);
}
});
});
}
}
},
api: {
@ -9556,6 +9569,8 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef
events.faselect(form);
events.fieldlist(form);
events.slider(form);
},
custom: {}
},

16
public/assets/js/require-form.js
View File

@ -575,6 +575,20 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
},
bindevent: function (form) {
},
slider: function (form) {
if ($(".slider", form).size() > 0) {
require(['bootstrap-slider'], function () {
$('.slider').removeClass('hidden').css('width', function (index, value) {
return $(this).parents('.form-control').width();
}).slider().on('slide', function (ev) {
var data = $(this).data();
if (typeof data.unit !== 'undefined') {
$(this).parents('.form-control').siblings('.value').text(ev.value + data.unit);
}
});
});
}
}
},
api: {
@ -671,6 +685,8 @@ define(['jquery', 'bootstrap', 'upload', 'validator'], function ($, undefined, U
events.faselect(form);
events.fieldlist(form);
events.slider(form);
},
custom: {}
},