diff --git a/Pear Admin v 2.0/component/layui/lay/extends/pearAdmin.js b/Pear Admin v 2.0/component/layui/lay/extends/pearAdmin.js
index ae58bc1..696645d 100644
--- a/Pear Admin v 2.0/component/layui/lay/extends/pearAdmin.js
+++ b/Pear Admin v 2.0/component/layui/lay/extends/pearAdmin.js
@@ -1,302 +1,276 @@
-layui.define(['table', 'jquery', 'element', 'form', 'pearAuth','pearTab', 'pearMenu', 'pearNotice','pearFrame'], function(exports) {
- "use strict";
+layui.define(['table', 'jquery', 'element', 'form', 'pearAuth', 'pearTab', 'pearMenu', 'pearNotice', 'pearFrame'],
+ function(exports) {
+ "use strict";
- var $ = layui.jquery,
- form = layui.form,
- element = layui.element,
- pearTab = layui.pearTab,
- pearMenu = layui.pearMenu,
- pearNotice = layui.pearNotice,
- pearFrame = layui.pearFrame,
- pearAuth = layui.pearAuth;
+ var $ = layui.jquery,
+ form = layui.form,
+ element = layui.element,
+ pearTab = layui.pearTab,
+ pearMenu = layui.pearMenu,
+ pearNotice = layui.pearNotice,
+ pearFrame = layui.pearFrame,
+ pearAuth = layui.pearAuth;
- var bodyFrame;
- var sideMenu;
- var bodyTab;
+ var bodyFrame;
+ var sideMenu;
+ var bodyTab;
- var pearAdmin = new function() {
+ var pearAdmin = new function() {
- this.render = function(option) {
+ this.render = function(option) {
- this.menuRender(option);
+ this.menuRender(option);
- this.bodyRender(option);
+ this.bodyRender(option);
- this.keepLoad(option);
+ this.keepLoad(option);
- this.themeRender(option);
-
- this.noticeRender(option);
-
- this.permissionRender(option);
+ this.themeRender(option);
- }
+ this.noticeRender(option);
- this.permissionRender = function(option){
-
- if(option.auth!=false){
- pearAuth.loadPermission(option.auth);
- }
- }
+ this.permissionRender(option);
+ }
- this.menuRender = function(option) {
+ this.permissionRender = function(option) {
- /** 侧 边 菜 单 组 件 初 始 化 */
- sideMenu = pearMenu.render({
- elem: 'sideMenu', //依赖容器
- async: true, //数据形式
- theme: option.theme,
- height: '100%',
- control: option.control ? 'control' : false, // control
- defaultMenu: 1,
- defaultOpen: 0, //默认打开菜单
- accordion: true,
- url: option.data, //数据地址
- parseData: false, //请求后是否进行数据解析 函数
- change: option.change
- })
-
-
- }
-
- this.noticeRender = function(option){
-
- var option = {
- elem: 'headerNotice',
- url: option.notice,
- height: '250px',
- click: function(id, title, context, form) {
- layer.open({
- type: 1 ,
- title: '消息', //标题
- area: ['390px', '330px'], //宽高
- shade: 0.4, //遮罩透明度
- content: "
发件人 : "+form+"
内容 : "+context+"
",//支持获取DOM元素
- btn: ['确认'], //按钮组
- scrollbar: false ,//屏蔽浏览器滚动条
- yes: function(index){//layer.msg('yes'); //点击确定回调
- layer.close(index);
- showToast();
- }
- });
+ if (option.auth != false) {
+ pearAuth.loadPermission(option.auth);
}
}
-
- pearNotice.render(option);
- }
-
- this.bodyRender = function(option) {
+ this.menuRender = function(option) {
- if (option.muiltTab) {
-
- bodyTab = pearTab.render({
- elem: 'content',
- roll: true,
- tool: true,
- width: '100%',
+ /** 侧 边 菜 单 组 件 初 始 化 */
+ sideMenu = pearMenu.render({
+ elem: 'sideMenu', //依赖容器
+ async: true, //数据形式
+ theme: option.theme,
height: '100%',
- index: 0,
- tabMax: 20,
- data: [{
- id: '11',
+ control: option.control ? 'control' : false, // control
+ defaultMenu: 1,
+ defaultOpen: 0, //默认打开菜单
+ accordion: true,
+ url: option.data, //数据地址
+ parseData: false, //请求后是否进行数据解析 函数
+ change: option.change
+ })
+
+
+ }
+
+ this.noticeRender = function(option) {
+
+ var option = {
+ elem: 'headerNotice',
+ url: option.notice,
+ height: '250px',
+ click: function(id, title, context, form) {
+ layer.open({
+ type: 1,
+ title: '消息', //标题
+ area: ['390px', '330px'], //宽高
+ shade: 0.4, //遮罩透明度
+ content: "发件人 : " +
+ form + "
内容 : " + context + "
", //支持获取DOM元素
+ btn: ['确认'], //按钮组
+ scrollbar: false, //屏蔽浏览器滚动条
+ yes: function(index) { //layer.msg('yes'); //点击确定回调
+ layer.close(index);
+ showToast();
+ }
+ });
+ }
+ }
+
+ pearNotice.render(option);
+ }
+
+
+ this.bodyRender = function(option) {
+
+ if (option.muiltTab) {
+
+ bodyTab = pearTab.render({
+ elem: 'content',
+ roll: true,
+ tool: true,
+ width: '100%',
+ height: '100%',
+ index: 0,
+ tabMax: 20,
+ data: [{
+ id: '11',
+ url: option.index,
+ title: '首页',
+ close: false
+ }] //初始化数据
+ });
+
+ // 选 项 卡 切 换 API 文 档
+ bodyTab.click(function(id) {
+
+ // 选 项 卡 定 位
+ bodyTab.positionTab();
+
+ sideMenu.selectItem(id);
+ })
+
+
+ $("body").on("click", ".refresh", function() {
+
+ bodyTab.refresh(500);
+ })
+
+ sideMenu.click(function(dom, data) {
+
+
+
+ bodyTab.addTabOnly({
+ id: data.menuId,
+ title: data.menuTitle,
+ url: data.menuUrl,
+ icon: data.menuIcon,
+ close: true
+ }, 300);
+
+ compatible();
+ })
+
+ } else {
+
+ // 选 项 卡 初 始 API 文 档
+ bodyFrame = pearFrame.render({
+ elem: 'content',
+ title: '工作空间 / 首页',
url: option.index,
- title: '首页',
- close: false
- }] //初始化数据
- });
+ width: '100%',
+ height: '100%'
+ });
- // 选 项 卡 切 换 API 文 档
- bodyTab.click(function(id) {
+ $("body").on("click", ".refresh", function() {
+ bodyFrame.refresh(500);
+ })
- // 选 项 卡 定 位
- bodyTab.positionTab();
+ sideMenu.click(function(dom, data) {
- sideMenu.selectItem(id);
- })
+ compatible();
+ bodyFrame.changePage(data.menuUrl, data.menuPath, true);
-
- $("body").on("click", ".refresh", function() {
-
- bodyTab.refresh(500);
- })
-
- sideMenu.click(function(dom, data) {
-
-
-
- bodyTab.addTabOnly({
- id: data.menuId,
- title: data.menuTitle,
- url: data.menuUrl,
- icon: data.menuIcon,
- close: true
- }, 300);
-
- compatible();
- })
-
- } else {
-
- // 选 项 卡 初 始 API 文 档
- bodyFrame = pearFrame.render({
- elem: 'content',
- title: '工作空间 / 首页',
- url: option.index,
- width: '100%',
- height: '100%'
- });
-
- $("body").on("click", ".refresh", function() {
- bodyFrame.refresh(500);
- })
-
- sideMenu.click(function(dom, data) {
-
- compatible();
- bodyFrame.changePage(data.menuUrl, data.menuPath, true);
-
- })
- }
-
- }
-
- this.keepLoad = function(option) {
- // 关 闭 加 载 层
- compatible();
-
- setTimeout(function() {
-
- $(".loader-main").fadeOut(option.done);
-
- // 设 置 关 闭 时 间
- }, option.keepLoad)
- }
-
-
-
- this.colorSet = function(color) {
-
- var style = '';
-
- // 自 定 义 菜 单 配 色
- style +=
- '.light-theme .pear-nav-tree .layui-this a:hover,.light-theme .pear-nav-tree .layui-this,.light-theme .pear-nav-tree .layui-this a,.pear-nav-tree .layui-this a,.pear-nav-tree .layui-this{background-color: ' +
- color + '!important;}';
-
- // 自定义 Logo 标题演示
- style +=
- '.pear-admin .layui-logo .title{color:' +
- color + '!important;}';
-
- // 自 定 义 标 签 配 色
- style += '.pear-frame-title .dot,.pear-tab .layui-this .pear-tab-active{background-color: ' + color +
- '!important;}';
-
- // 自 定 义 快 捷 菜 单
- style += '.bottom-nav li a:hover{background-color:' +
- color + '!important;}';
-
- // 自 定 义 顶 部 配 色
- style += '.pear-admin .layui-header .layui-nav .layui-nav-bar{background-color: ' + color + '!important;}'
-
- // 自 定 义 加 载 配 色
- style += '.ball-loader>span,.signal-loader>span {background-color: ' + color + '!important;}';
-
- // 自 定 义 顶 部 配 色
- style += '.layui-header .layui-nav-child .layui-this a{background-color:' + color +
- '!important;color:white!important;}';
-
- // 自 定 义 加 载 配 色
- style += '#preloader{background-color:' + color + '!important;}';
-
- // 自 定 义 滚 动 条 样 式
-
- localStorage.setItem("theme-color", color);
-
- if ($("iframe").contents().find("#customTheme").length > 0) {
-
- $("iframe").contents().find("#customTheme").remove();
+ })
+ }
}
+ this.keepLoad = function(option) {
+ // 关 闭 加 载 层
+ compatible();
- var theme = "';
+ $(".loader-main").fadeOut(option.done);
+
+ // 设 置 关 闭 时 间
+ }, option.keepLoad)
+ }
- $("iframe").contents().find("head").append(theme);
- $("#pearone-bg-color").html(style);
- }
+ this.colorSet = function(color) {
+
+ var style = '';
+
+ // 自 定 义 菜 单 配 色
+ style +=
+ '.light-theme .pear-nav-tree .layui-this a:hover,.light-theme .pear-nav-tree .layui-this,.light-theme .pear-nav-tree .layui-this a,.pear-nav-tree .layui-this a,.pear-nav-tree .layui-this{background-color: ' +
+ color + '!important;}';
+
+ // 自定义 Logo 标题演示
+ style +=
+ '.pear-admin .layui-logo .title{color:' +
+ color + '!important;}';
+
+ // 自 定 义 标 签 配 色
+ style += '.pear-frame-title .dot,.pear-tab .layui-this .pear-tab-active{background-color: ' + color +
+ '!important;}';
+
+ // 自 定 义 快 捷 菜 单
+ style += '.bottom-nav li a:hover{background-color:' +
+ color + '!important;}';
+
+ // 自 定 义 顶 部 配 色
+ style += '.pear-admin .layui-header .layui-nav .layui-nav-bar{background-color: ' + color + '!important;}'
+
+ // 自 定 义 加 载 配 色
+ style += '.ball-loader>span,.signal-loader>span {background-color: ' + color + '!important;}';
+
+ // 自 定 义 顶 部 配 色
+ style += '.layui-header .layui-nav-child .layui-this a{background-color:' + color +
+ '!important;color:white!important;}';
+
+ // 自 定 义 加 载 配 色
+ style += '#preloader{background-color:' + color + '!important;}';
- this.themeRender = function(option) {
-
- var color = localStorage.getItem("theme-color");
-
- var menu = localStorage.getItem("theme-menu");
-
- this.colorSet(color);
-
- this.menuSkin(menu);
- }
+ // 自 定 义 样 式 选 择 边 框 配 色
+ style +=
+ '.pearone-color .color-content li.layui-this:after, .pearone-color .color-content li:hover:after {border: ' +
+ color + ' 2px solid!important;}';
- this.menuSkin = function(theme) {
- $(".pear-admin").removeClass("light-theme");
- $(".pear-admin").removeClass("dark-theme");
- $(".pear-admin").addClass(theme);
- }
- };
- $("body").on("click", ".pearson", function() {
- pearTab.addTabOnlyByElem("content", {
- id: 111,
- title: "个人信息",
- url: "view/system/person.html",
- close: true
+ // 自 定 义 滚 动 条 样 式
+
+ localStorage.setItem("theme-color", color);
+
+ if ($("iframe").contents().find("#customTheme").length > 0) {
+
+ $("iframe").contents().find("#customTheme").remove();
+
+ }
+
+
+ var theme = "';
+
+
+ $("iframe").contents().find("head").append(theme);
+
+ $("#pearone-bg-color").html(style);
+ }
+
+
+ this.themeRender = function(option) {
+
+ var color = localStorage.getItem("theme-color");
+
+ var menu = localStorage.getItem("theme-menu");
+
+ this.colorSet(color);
+
+ this.menuSkin(menu);
+ }
+
+
+ this.menuSkin = function(theme) {
+ $(".pear-admin").removeClass("light-theme");
+ $(".pear-admin").removeClass("dark-theme");
+ $(".pear-admin").addClass(theme);
+ }
+ };
+
+ $("body").on("click", ".pearson", function() {
+ pearTab.addTabOnlyByElem("content", {
+ id: 111,
+ title: "个人信息",
+ url: "view/system/person.html",
+ close: true
+ })
})
- })
- $("body").on("click", ".collaspe,.pear-cover", function() {
- sideMenu.collaspe();
- if ($(".pear-admin").is(".pear-mini")) {
- $(".layui-icon-spread-left").addClass("layui-icon-shrink-right")
- $(".layui-icon-spread-left").removeClass("layui-icon-spread-left")
- $(".pear-admin").removeClass("pear-mini");
- } else {
- $(".layui-icon-shrink-right").addClass("layui-icon-spread-left")
- $(".layui-icon-shrink-right").removeClass("layui-icon-shrink-right")
- $(".pear-admin").addClass("pear-mini");
- }
- })
-
-
- /**
- * 全屏/退出全屏
- */
- $("body").on("click", ".fullScreen", function() {
- if ($(this).hasClass("layui-icon-screen-restore")) {
-
- screenFun(2).then(function() {
- $(".fullScreen").eq(0).removeClass("layui-icon-screen-restore");
- });
-
- } else {
-
- screenFun(1).then(function() {
- $(".fullScreen").eq(0).addClass("layui-icon-screen-restore");
- });
-
- }
-
- });
-
-
- function compatible() {
- if ($(window).width() <= 768) {
+ $("body").on("click", ".collaspe,.pear-cover", function() {
sideMenu.collaspe();
if ($(".pear-admin").is(".pear-mini")) {
$(".layui-icon-spread-left").addClass("layui-icon-shrink-right")
@@ -307,154 +281,233 @@ layui.define(['table', 'jquery', 'element', 'form', 'pearAuth','pearTab', 'pearM
$(".layui-icon-shrink-right").removeClass("layui-icon-shrink-right")
$(".pear-admin").addClass("pear-mini");
}
- }
- }
-
- /**
- * 全屏和退出全屏的方法
- * @param num 1代表全屏 2代表退出全屏
- * @returns {Promise}
- */
- function screenFun(num) {
- num = num || 1;
- num = num * 1;
- var docElm = document.documentElement;
-
- switch (num) {
- case 1:
- if (docElm.requestFullscreen) {
- docElm.requestFullscreen();
- } else if (docElm.mozRequestFullScreen) {
- docElm.mozRequestFullScreen();
- } else if (docElm.webkitRequestFullScreen) {
- docElm.webkitRequestFullScreen();
- } else if (docElm.msRequestFullscreen) {
- docElm.msRequestFullscreen();
- }
- break;
- case 2:
- if (document.exitFullscreen) {
- document.exitFullscreen();
- } else if (document.mozCancelFullScreen) {
- document.mozCancelFullScreen();
- } else if (document.webkitCancelFullScreen) {
- document.webkitCancelFullScreen();
- } else if (document.msExitFullscreen) {
- document.msExitFullscreen();
- }
- break;
- }
-
- return new Promise(function(res, rej) {
- res("返回值");
- });
- }
+ })
- //监听背景色选择
- $('body').on('click', '[data-select-bgcolor]', function() {
- var theme = $(this).attr('data-select-bgcolor');
+ /**
+ * 全屏/退出全屏
+ */
+ $("body").on("click", ".fullScreen", function() {
+ if ($(this).hasClass("layui-icon-screen-restore")) {
- $('[data-select-bgcolor]').removeClass("layui-this");
+ screenFun(2).then(function() {
+ $(".fullScreen").eq(0).removeClass("layui-icon-screen-restore");
+ });
- $(this).addClass("layui-this");
+ } else {
- localStorage.setItem("theme-menu", theme);
+ screenFun(1).then(function() {
+ $(".fullScreen").eq(0).addClass("layui-icon-screen-restore");
+ });
- pearAdmin.menuSkin(theme);
- });
-
- $('body').on('click', '.select-color-item', function() {
-
- $(".select-color-item").removeClass("layui-icon")
- .removeClass("layui-icon-ok");
-
- $(this).addClass("layui-icon").addClass("layui-icon-ok");
-
- var color = $(".select-color-item.layui-icon-ok").css("background-color");
-
-
- pearAdmin.colorSet(color);
- });
-
-
- $("body").on("click", ".setting", function() {
-
- var bgColorHtml =
- '' +
- '' +
- '
' +
- '
' +
- '' +
- '';
-
-
- bgColorHtml +=
- '' +
- '' +
- '
' +
- '
' +
- '' +
- '';
-
- var html =
- '\n' +
- '
整体风格
\n' +
- '
\n' +
- '
';
-
-
- html +=
- ""
-
- html += '';
-
-
- openRight(html);
-
- })
-
- function openRight(html) {
- layer.open({
- type: 1,
- offset: 'r',
- area: ['340px', '100%'],
- title: false,
- shade: 0.1,
- closeBtn: 0,
- shadeClose: false,
- anim: -1,
- skin: 'layer-anim-right',
- move: false,
- content: html,
- success: function(layero, index) {
- $('#layui-layer-shade' + index).click(function() {
- var $layero = $('#layui-layer' + index);
- $layero.animate({
- left: $layero.offset().left + $layero.width()
- }, 200, function() {
- layer.close(index);
- });
- })
}
- });
- }
-
- exports('pearAdmin', pearAdmin);
-})
+ });
+
+
+ function compatible() {
+ if ($(window).width() <= 768) {
+ sideMenu.collaspe();
+ if ($(".pear-admin").is(".pear-mini")) {
+ $(".layui-icon-spread-left").addClass("layui-icon-shrink-right")
+ $(".layui-icon-spread-left").removeClass("layui-icon-spread-left")
+ $(".pear-admin").removeClass("pear-mini");
+ } else {
+ $(".layui-icon-shrink-right").addClass("layui-icon-spread-left")
+ $(".layui-icon-shrink-right").removeClass("layui-icon-shrink-right")
+ $(".pear-admin").addClass("pear-mini");
+ }
+ }
+ }
+
+ /**
+ * 全屏和退出全屏的方法
+ * @param num 1代表全屏 2代表退出全屏
+ * @returns {Promise}
+ */
+ function screenFun(num) {
+ num = num || 1;
+ num = num * 1;
+ var docElm = document.documentElement;
+
+ switch (num) {
+ case 1:
+ if (docElm.requestFullscreen) {
+ docElm.requestFullscreen();
+ } else if (docElm.mozRequestFullScreen) {
+ docElm.mozRequestFullScreen();
+ } else if (docElm.webkitRequestFullScreen) {
+ docElm.webkitRequestFullScreen();
+ } else if (docElm.msRequestFullscreen) {
+ docElm.msRequestFullscreen();
+ }
+ break;
+ case 2:
+ if (document.exitFullscreen) {
+ document.exitFullscreen();
+ } else if (document.mozCancelFullScreen) {
+ document.mozCancelFullScreen();
+ } else if (document.webkitCancelFullScreen) {
+ document.webkitCancelFullScreen();
+ } else if (document.msExitFullscreen) {
+ document.msExitFullscreen();
+ }
+ break;
+ }
+
+ return new Promise(function(res, rej) {
+ res("返回值");
+ });
+ }
+
+
+ //监听背景色选择
+ $('body').on('click', '[data-select-bgcolor]', function() {
+ var theme = $(this).attr('data-select-bgcolor');
+
+ $('[data-select-bgcolor]').removeClass("layui-this");
+
+ $(this).addClass("layui-this");
+
+ localStorage.setItem("theme-menu", theme);
+
+ pearAdmin.menuSkin(theme);
+ });
+
+ $('body').on('click', '.select-color-item', function() {
+
+ $(".select-color-item").removeClass("layui-icon")
+ .removeClass("layui-icon-ok");
+
+ $(this).addClass("layui-icon").addClass("layui-icon-ok");
+
+ var color = $(".select-color-item.layui-icon-ok").css("background-color");
+
+
+ pearAdmin.colorSet(color);
+ });
+
+
+ $("body").on("click", ".setting", function() {
+
+ // 获取
+ var themeMenu = localStorage.getItem("theme-menu");
+
+ var themeColor = localStorage.getItem("theme-color");
+
+ var bgColorHtml = "";
+
+ if (themeMenu == "light-theme") {
+
+ bgColorHtml +=
+ '' +
+ '' +
+ '
' +
+ '
' +
+ '' +
+ '';
+
+ bgColorHtml +=
+ '' +
+ '' +
+ '
' +
+ '
' +
+ '' +
+ '';
+
+ } else {
+
+ bgColorHtml +=
+ '' +
+ '' +
+ '
' +
+ '
' +
+ '' +
+ '';
+
+ bgColorHtml +=
+ '' +
+ '' +
+ '
' +
+ '
' +
+ '' +
+ '';
+
+ }
+
+ var html =
+ '\n' +
+ '
整体风格
\n' +
+ '
\n' +
+ '
';
+
+
+ html +=
+ ""
+
+ html += '';
+
+
+ openRight(html);
+
+ })
+
+ function openRight(html) {
+ layer.open({
+ type: 1,
+ offset: 'r',
+ area: ['340px', '100%'],
+ title: false,
+ shade: 0.1,
+ closeBtn: 0,
+ shadeClose: false,
+ anim: -1,
+ skin: 'layer-anim-right',
+ move: false,
+ content: html,
+ success: function(layero, index) {
+
+ var color = localStorage.getItem("theme-color");
+
+ if (color!="null") {
+
+ $(".select-color-item").removeClass("layui-icon")
+ .removeClass("layui-icon-ok");
+
+ $(".select-color-item").each(function() {
+ if ($(this).css("background-color") === color) {
+ $(this).addClass("layui-icon").addClass("layui-icon-ok");
+ }
+ });
+ }
+
+ $('#layui-layer-shade' + index).click(function() {
+ var $layero = $('#layui-layer' + index);
+ $layero.animate({
+ left: $layero.offset().left + $layero.width()
+ }, 200, function() {
+ layer.close(index);
+ });
+ })
+ }
+ });
+ }
+
+
+ exports('pearAdmin', pearAdmin);
+ })
diff --git a/Pear Admin v 2.0/view/console/console2.html b/Pear Admin v 2.0/view/console/console2.html
index ba28053..bef0e83 100644
--- a/Pear Admin v 2.0/view/console/console2.html
+++ b/Pear Admin v 2.0/view/console/console2.html
@@ -116,7 +116,7 @@