version to 3.1.6.release

develop
就眠仪式 2020-11-09 06:27:38 +08:00
parent eb60ab57d8
commit 7175aea4c9
3 changed files with 25 additions and 13 deletions

View File

@ -13,18 +13,37 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
var sideMenu;
var bodyTab;
var config;
var pearAdmin = new function() {
var configPath = '';
this.setConfigPath = function(path){
configPath = path;
}
this.render = function(initConfig) {
if (initConfig != undefined) {
applyConfig(initConfig);
} else {
readConfig().then(function(param) {
pearAdmin.readConfig().then(function(param) {
applyConfig(param);
});
}
}
this.readConfig = function() {
var defer = $.Deferred();
var configUrl = (configPath == '' ? "pear.config.json" : configPath) + "?fresh=" + Math.random();
$.getJSON(configUrl, function(result) {
defer.resolve(result)
});
return defer.promise();
}
this.logoRender = function(param) {
$(".layui-logo .logo").attr("src", param.logo.image);
$(".layui-logo .title").html(param.logo.title);
@ -40,7 +59,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
defaultMenu: 0,
accordion: param.menu.accordion,
url: param.menu.data,
data: param.menu.data,//async为false时传入菜单数组
data: param.menu.data, //async为false时传入菜单数组
parseData: false,
change: function() {
compatible();
@ -206,7 +225,7 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
style += '.layui-nav .layui-nav-child dd.layui-this a, .layui-nav-child dd.layui-this{background-color:' + color +
'!important}';
style += ".pear-nav-control.pc .layui-this *{color:" + color + "!important}";
style += '.pear-social-entrance {background-color:' + color + '!important}';
@ -339,14 +358,6 @@ layui.define(['table', 'jquery', 'element', 'form', 'tab', 'menu', 'frame'],
pearAdmin.colorSet(color.color);
});
function readConfig() {
var defer = $.Deferred();
$.getJSON("pear.config.json?fresh=" + Math.random(), function(result) {
defer.resolve(result)
});
return defer.promise();
}
function applyConfig(param) {
config = param;
pearAdmin.logoRender(param);

View File

@ -7,7 +7,8 @@
"data": "admin/data/menu.json",
"accordion": true,
"control": false,
"select": "10"
"select": "10",
"async": true
},
"tab": {
"muiltTab": true,

View File

@ -74,7 +74,7 @@
<script>
layui.use(['admin'], function() {
var admin = layui.admin;
admin.setConfigPath("config/pear.config.json");
admin.render();
})
</script>