mirror of https://gitee.com/karson/fastadmin.git
采用slimScroll美化滚动条
parent
779f5d63ef
commit
aac15b1565
|
|
@ -1,4 +1,4 @@
|
||||||
define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefined, Toastr, Layer, Lang) {
|
define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang', 'slimscroll'], function ($, undefined, Toastr, Layer, Lang, slimScroll) {
|
||||||
var Fast = {
|
var Fast = {
|
||||||
config: {
|
config: {
|
||||||
//toastr默认配置
|
//toastr默认配置
|
||||||
|
|
@ -6,7 +6,7 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
|
||||||
"closeButton": true,
|
"closeButton": true,
|
||||||
"debug": false,
|
"debug": false,
|
||||||
"newestOnTop": false,
|
"newestOnTop": false,
|
||||||
"progressBar": false,
|
"progressBar": true,
|
||||||
"positionClass": "toast-top-center",
|
"positionClass": "toast-top-center",
|
||||||
"preventDuplicates": false,
|
"preventDuplicates": false,
|
||||||
"onclick": null,
|
"onclick": null,
|
||||||
|
|
@ -114,7 +114,7 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
|
||||||
},
|
},
|
||||||
//打开一个弹出窗口
|
//打开一个弹出窗口
|
||||||
open: function (url, title, options) {
|
open: function (url, title, options) {
|
||||||
title = title ? title : "";
|
title = options.title ? options.title : (title ? title : "");
|
||||||
url = Fast.api.fixurl(url);
|
url = Fast.api.fixurl(url);
|
||||||
url = url + (url.indexOf("?") > -1 ? "&" : "?") + "dialog=1";
|
url = url + (url.indexOf("?") > -1 ? "&" : "?") + "dialog=1";
|
||||||
var area = [$(window).width() > 800 ? '800px' : '95%', $(window).height() > 600 ? '600px' : '95%'];
|
var area = [$(window).width() > 800 ? '800px' : '95%', $(window).height() > 600 ? '600px' : '95%'];
|
||||||
|
|
@ -315,6 +315,17 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang'], function ($, undefine
|
||||||
});
|
});
|
||||||
|
|
||||||
//公共代码
|
//公共代码
|
||||||
|
$(function ($) {
|
||||||
|
if (self === top) {
|
||||||
|
$('div[role="main"]').slimScroll({height: $(window).height() + 'px'});
|
||||||
|
} else {
|
||||||
|
var ScrollHeight = $('iframe', parent.document).height();
|
||||||
|
if (!ScrollHeight || ScrollHeight === 100) {
|
||||||
|
ScrollHeight = $('.content-wrapper', parent.document).height();
|
||||||
|
}
|
||||||
|
$('div[role="main"]').slimScroll({height: ScrollHeight + 'px'});
|
||||||
|
}
|
||||||
|
});
|
||||||
//配置Toastr的参数
|
//配置Toastr的参数
|
||||||
Toastr.options = Fast.config.toastr;
|
Toastr.options = Fast.config.toastr;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue