From 71959aa588e09b83bf22ba37a824440eeba11423 Mon Sep 17 00:00:00 2001 From: augushong Date: Sat, 2 Jul 2022 17:24:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9A=AE=E8=82=A4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=BC=93=E5=AD=98=EF=BC=9B=E5=AE=8C=E5=96=84gtk?= =?UTF-8?q?=EF=BC=9B=E9=80=82=E9=85=8Dlayui2.7=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/js/system/menu.js | 8 ++++---- public/static/common/css/theme/_gtk.scss | 6 ++++++ public/static/common/css/theme/index.css | 5 +++++ .../plugs/lay-module/autocomplete/autocomplete.js | 6 +++--- .../static/plugs/lay-module/layuimini/miniTheme.js | 14 +++++++------- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/public/static/admin/js/system/menu.js b/public/static/admin/js/system/menu.js index 6163c9b..94ceb2a 100644 --- a/public/static/admin/js/system/menu.js +++ b/public/static/admin/js/system/menu.js @@ -150,8 +150,8 @@ define(["jquery", "easy-admin", "treetable", "iconPickerFa", "autocomplete"], fu autocomplete.render({ elem: $('#href')[0], url: ea.url('system.menu/getMenuTips'), - template_val: '{{d.node}}', - template_txt: '{{d.node}} {{d.title}}', + template_val: '{{-d.node}}', + template_txt: '{{-d.node}} {{-d.title}}', onselect: function (resp) { } }); @@ -181,8 +181,8 @@ define(["jquery", "easy-admin", "treetable", "iconPickerFa", "autocomplete"], fu autocomplete.render({ elem: $('#href')[0], url: ea.url('system.menu/getMenuTips'), - template_val: '{{d.node}}', - template_txt: '{{d.node}} {{d.title}}', + template_val: '{{-d.node}}', + template_txt: '{{-d.node}} {{-d.title}}', onselect: function (resp) { } }); diff --git a/public/static/common/css/theme/_gtk.scss b/public/static/common/css/theme/_gtk.scss index 0bf04c6..7c00d82 100644 --- a/public/static/common/css/theme/_gtk.scss +++ b/public/static/common/css/theme/_gtk.scss @@ -632,4 +632,10 @@ .layui-layer-iframe { border-radius: 20px; +} + +.layuimini-tab .layui-tab-control>li { + background-color: #e1dedb; + border-style : solid; + border-color : #cdc7c2; } \ No newline at end of file diff --git a/public/static/common/css/theme/index.css b/public/static/common/css/theme/index.css index 41408e6..e0430e1 100644 --- a/public/static/common/css/theme/index.css +++ b/public/static/common/css/theme/index.css @@ -1133,4 +1133,9 @@ } .elem-style-gtk .layui-layer-iframe { border-radius: 20px; +} +.elem-style-gtk .layuimini-tab .layui-tab-control > li { + background-color: #e1dedb; + border-style: solid; + border-color: #cdc7c2; } \ No newline at end of file diff --git a/public/static/plugs/lay-module/autocomplete/autocomplete.js b/public/static/plugs/lay-module/autocomplete/autocomplete.js index 46e3cdf..0a4310c 100644 --- a/public/static/plugs/lay-module/autocomplete/autocomplete.js +++ b/public/static/plugs/lay-module/autocomplete/autocomplete.js @@ -11,9 +11,9 @@ layui.define(['jquery', 'laytpl', 'layer'], function (e) { system = { config: { template: ['
', '
', '
', '
'].join(''), - layout: ['
{{d.text}}
'].join(''), - template_txt: '{{d.text}}', - template_val: '{{d.value}}', + layout: ['
{{-d.text}}
'].join(''), + template_txt: '{{-d.text}}', + template_val: '{{-d.value}}', cache: false }, data: {} diff --git a/public/static/plugs/lay-module/layuimini/miniTheme.js b/public/static/plugs/lay-module/layuimini/miniTheme.js index 0d60463..5736326 100644 --- a/public/static/plugs/lay-module/layuimini/miniTheme.js +++ b/public/static/plugs/lay-module/layuimini/miniTheme.js @@ -294,13 +294,13 @@ define(["jquery"], function ($) { options.bgColorDefault = options.bgColorDefault || 0; options.elemStyleDefault = options.elemStyleDefault || 'index'; options.listen = options.listen || false; - var bgcolorId = sessionStorage.getItem('layuiminiBgcolorId'); + var bgcolorId = localStorage.getItem('layuiminiBgcolorId'); if (bgcolorId === null || bgcolorId === undefined || bgcolorId === '') { bgcolorId = options.bgColorDefault; } miniTheme.buildThemeCss(bgcolorId); - var elemStyleName = sessionStorage.getItem('layuiminiElemStyleName'); + var elemStyleName = localStorage.getItem('layuiminiElemStyleName'); if (!elemStyleName) elemStyleName = options.elemStyleDefault; miniTheme.buildBodyElemStyle(elemStyleName); @@ -316,7 +316,7 @@ define(["jquery"], function ($) { elemStyleDefault = elemStyleDefault || 'index'; - var elemStyleName = sessionStorage.getItem('layuiminiElemStyleName'); + var elemStyleName = localStorage.getItem('layuiminiElemStyleName'); if (!elemStyleName) elemStyleName = elemStyleDefault; miniTheme.buildBodyElemStyle(elemStyleName); @@ -436,7 +436,7 @@ define(["jquery"], function ($) { * @returns {string} */ buildBgColorHtml: function (options) { - var bgcolorId = parseInt(sessionStorage.getItem('layuiminiBgcolorId')); + var bgcolorId = parseInt(localStorage.getItem('layuiminiBgcolorId')); if (isNaN(bgcolorId)) bgcolorId = options.bgColorDefault; var bgColorConfig = miniTheme.config(); var html = ''; @@ -489,7 +489,7 @@ define(["jquery"], function ($) { $('body').addClass('elem-style-' + className) }, buildElemStyleHtml(options) { - var elemStyleName = sessionStorage.getItem('layuiminiElemStyleName'); + var elemStyleName = localStorage.getItem('layuiminiElemStyleName'); if (!elemStyleName) elemStyleName = options.elemStyleDefault; var listElemStyle = miniTheme.configElemStyle() var html = ''; @@ -560,7 +560,7 @@ define(["jquery"], function ($) { var bgcolorId = $(this).attr('data-select-bgcolor'); $(this).attr('class', 'layui-this').siblings().removeClass('layui-this'); - sessionStorage.setItem('layuiminiBgcolorId', bgcolorId); + localStorage.setItem('layuiminiBgcolorId', bgcolorId); miniTheme.render({ listen: false, }); @@ -570,7 +570,7 @@ define(["jquery"], function ($) { $(this).attr('class', 'layui-this').siblings().removeClass('layui-this'); - sessionStorage.setItem('layuiminiElemStyleName', elemStyleName); + localStorage.setItem('layuiminiElemStyleName', elemStyleName); miniTheme.render({ listen: false, });