From dca14cf9e816450c8b9c3f2709bd2b411eac4859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E4=BB=AA=E5=BC=8F?= <854085467@qq.com> Date: Tue, 13 Apr 2021 15:42:51 +0800 Subject: [PATCH] fix notice theme --- component/pear/module/admin.js | 119 +++++++++++++++++---------------- component/pear/module/theme.js | 1 + component/pear/pear.js | 2 +- 3 files changed, 63 insertions(+), 59 deletions(-) diff --git a/component/pear/module/admin.js b/component/pear/module/admin.js index dbe84ce..fa82897 100644 --- a/component/pear/module/admin.js +++ b/component/pear/module/admin.js @@ -2,7 +2,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm function(exports) { "use strict"; - const $ = layui.jquery, + var $ = layui.jquery, form = layui.form, element = layui.element, yaml = layui.yaml, @@ -13,20 +13,20 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm pearTheme = layui.theme, message = layui.message; - let bodyFrame; - let sideMenu; - let bodyTab; - let config; - let logout = function() {}; - let msgInstance; + var bodyFrame; + var sideMenu; + var bodyTab; + var config; + var logout = function() {}; + var msgInstance; - const body = $('body'); + var body = $('body'); - const pearAdmin = new function() { + var pearAdmin = new function() { // 默认配置 - let configType = 'yml'; - let configPath = 'pear.config.yml'; + var configType = 'yml'; + var configPath = 'pear.config.yml'; this.setConfigPath = function(path) { configPath = path; @@ -57,7 +57,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm if (configType === "yml") { return yaml.load(configPath); } else { - let data; + var data; $.ajax({ url: configPath, type: 'get', @@ -109,7 +109,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm this.bodyRender = function(param) { body.on("click", ".refresh", function() { - const refreshA = $(".refresh a"); + var refreshA = $(".refresh a"); refreshA.removeClass("layui-icon-refresh-1"); refreshA.addClass("layui-anim"); refreshA.addClass("layui-anim-rotate"); @@ -200,12 +200,12 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm if (option.theme.allowCustom === false) { $(".setting").remove(); } - const colorId = localStorage.getItem("theme-color"); - const currentColor = getColorById(colorId); + var colorId = localStorage.getItem("theme-color"); + var currentColor = getColorById(colorId); localStorage.setItem("theme-color", currentColor.id); localStorage.setItem("theme-color-context", currentColor.color); pearTheme.changeTheme(window, option.other.autoHead); - let menu = localStorage.getItem("theme-menu"); + var menu = localStorage.getItem("theme-menu"); if (menu === "null") { menu = option.theme.defaultMenu; } else { @@ -218,7 +218,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm } this.menuSkin = function(theme) { - const pearAdmin = $(".pear-admin"); + var pearAdmin = $(".pear-admin"); pearAdmin.removeClass("light-theme"); pearAdmin.removeClass("dark-theme"); pearAdmin.addClass(theme); @@ -227,19 +227,25 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm this.logout = function(callback) { logout = callback; } - + this.message = function(callback) { - if(callback!=null){ + if (callback != null) { msgInstance.click(callback); - }else{ + } else { msgInstance.click(messageTip); } } - - this.jump = function(id,title,url){ + + this.jump = function(id, title, url) { if (config.tab.muiltTab) { - bodyTab.addTabOnly({id: id,title: title,url: url,icon: null,close: true}, - 300); + bodyTab.addTabOnly({ + id: id, + title: title, + url: url, + icon: null, + close: true + }, + 300); } else { sideMenu.selectItem(id); bodyFrame.changePage(url, title, true); @@ -267,9 +273,9 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm function collaspe() { sideMenu.collaspe(); - const admin = $(".pear-admin"); - const left = $(".layui-icon-spread-left") - const right = $(".layui-icon-shrink-right") + var admin = $(".pear-admin"); + var left = $(".layui-icon-spread-left") + var right = $(".layui-icon-shrink-right") if (admin.is(".pear-mini")) { left.addClass("layui-icon-shrink-right") left.removeClass("layui-icon-spread-left") @@ -323,7 +329,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm body.on("click", ".setting", function() { - let bgColorHtml = + var bgColorHtml = '
  • ' + '' + '
    ' + @@ -339,7 +345,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm '    ' + '
    • '; - const html = + var html = '
    \n' + '
    整体风格
    \n' + '
    \n' + @@ -360,23 +366,20 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm move: false, content: html + buildColorHtml() + buildLinkHtml() + bottomTool(), success: function(layero, index) { - form.render(); - - const color = localStorage.getItem("theme-color"); - const menu = localStorage.getItem("theme-menu"); + + var color = localStorage.getItem("theme-color"); + var menu = localStorage.getItem("theme-menu"); if (color !== "null") { - $(".select-color-item").removeClass("layui-icon") - .removeClass("layui-icon-ok"); - $("*[color-id='" + color + "']").addClass("layui-icon") - .addClass("layui-icon-ok"); + $(".select-color-item").removeClass("layui-icon").removeClass("layui-icon-ok"); + $("*[color-id='" + color + "']").addClass("layui-icon").addClass("layui-icon-ok"); } if (menu !== "null") { $("*[data-select-bgcolor]").removeClass("layui-this"); $("[data-select-bgcolor='" + menu + "']").addClass("layui-this"); } $('#layui-layer-shade' + index).click(function() { - const $layero = $('#layui-layer' + index); + var $layero = $('#layui-layer' + index); $layero.animate({ left: $layero.offset().left + $layero.width() }, 200, function() { @@ -385,7 +388,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm }) $('#closeTheme').click(function() { - const $layero = $('#layui-layer' + index); + var $layero = $('#layui-layer' + index); $layero.animate({ left: $layero.offset().left + $layero.width() }, 200, function() { @@ -401,7 +404,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm } body.on('click', '[data-select-bgcolor]', function() { - const theme = $(this).attr('data-select-bgcolor'); + var theme = $(this).attr('data-select-bgcolor'); $('[data-select-bgcolor]').removeClass("layui-this"); $(this).addClass("layui-this"); localStorage.setItem("theme-menu", theme); @@ -411,8 +414,8 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm 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"); - const colorId = $(".select-color-item.layui-icon-ok").attr("color-id"); - const currentColor = getColorById(colorId); + var colorId = $(".select-color-item.layui-icon-ok").attr("color-id"); + var currentColor = getColorById(colorId); localStorage.setItem("theme-color", currentColor.id); localStorage.setItem("theme-color-context", currentColor.color); pearTheme.changeTheme(window, config.other.autoHead); @@ -425,14 +428,14 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm pearAdmin.bodyRender(param); pearAdmin.themeRender(param); pearAdmin.keepLoad(param); - if(param.header.message!=false){ - pearAdmin.messageRender(param); + if (param.header.message != false) { + pearAdmin.messageRender(param); } } function getColorById(id) { - let color; - let flag = false; + var color; + var flag = false; $.each(config.colors, function(i, value) { if (value.id === id) { color = value; @@ -450,9 +453,9 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm } function buildLinkHtml() { - let links = ""; + var links = ""; $.each(config.links, function(i, value) { - links += '' + + links += '' + ' ' + value.title + '' }) @@ -460,7 +463,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm } function buildColorHtml() { - let colors = ""; + var colors = ""; $.each(config.colors, function(i, value) { colors += ""; @@ -478,7 +481,7 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm function screenFun(num) { num = num || 1; num = num * 1; - const docElm = document.documentElement; + var docElm = document.documentElement; switch (num) { case 1: if (docElm.requestFullscreen) { @@ -507,17 +510,17 @@ layui.define(['message', 'table', 'jquery', 'element', 'yaml', 'form', 'tab', 'm res("返回值"); }); } - - function isFullscreen(){ - return document.fullscreenElement || - document.msFullscreenElement || - document.mozFullScreenElement || - document.webkitFullscreenElement || false; + + function isFullscreen() { + return document.fullscreenElement || + document.msFullscreenElement || + document.mozFullScreenElement || + document.webkitFullscreenElement || false; } - + window.onresize = function() { if (!isFullscreen()) { - $(".fullScreen").eq(0).removeClass("layui-icon-screen-restore"); + $(".fullScreen").eq(0).removeClass("layui-icon-screen-restore"); } } diff --git a/component/pear/module/theme.js b/component/pear/module/theme.js index 0d2747b..59af18c 100644 --- a/component/pear/module/theme.js +++ b/component/pear/module/theme.js @@ -71,6 +71,7 @@ layui.define(["jquery","layer"], function (exports) { style += '.layui-form-danger:focus {border-color:#FF5722 !important}' style += '.pear-admin .user a:hover{color:'+color+'!important}' style += '.pear-admin .user .layui-this a:hover{color:white!important}' + style += '.pear-notice .layui-this{color:'+color+'!important}' var colorPane = $("#pear-admin-color"); if(colorPane.length>0){ colorPane.html(style); diff --git a/component/pear/pear.js b/component/pear/pear.js index af1d827..a60688c 100644 --- a/component/pear/pear.js +++ b/component/pear/pear.js @@ -37,7 +37,7 @@ layui.config({ context: "context", // 上下文组件 http: "http", // ajax请求组件 theme: "theme", // 主题转换 - message: "message" // 通知组件 + message: "message", // 通知组件 }).use(['layer', 'theme'], function () { layui.theme.changeTheme(window, false); }); \ No newline at end of file