From 3220136b01fe1e51b0ba065c3371b52e7ca7ac3f Mon Sep 17 00:00:00 2001 From: j m <1406993111@qq.com> Date: Tue, 11 Mar 2025 20:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=81=B0=E8=89=B2=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=AE=BE=E5=AE=9A=E6=97=B6=E9=97=B4=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E6=AF=8F=E5=B9=B4=E5=9B=BA=E5=AE=9A=E6=97=B6=E9=97=B4=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 21 +++++++++---------- src/js/common.js | 35 +++++++++++++++++++++++++------ templates/assets/js/common.min.js | 2 +- templates/common/config.html | 14 +++++++++++-- theme.yaml | 2 +- 5 files changed, 53 insertions(+), 21 deletions(-) diff --git a/settings.yaml b/settings.yaml index e1452dc..5cdbe23 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1351,19 +1351,18 @@ spec: label: 自定义 - value: false label: 关闭 - - $formkit: datetime-local - name: gray_mode_start_time - id: gray_mode_start_time + - $formkit: repeater + name: gray_mode_time_list if: $get(enable_gray_mode).value == 'custom' + label: 灰色模式时间段 validation: required - help: 请选择开始时间，包含开始时间。 - label: 灰色模式 - 开始时间 - - $formkit: datetime-local - name: gray_mode_end_time - if: $get(enable_gray_mode).value == 'custom' - validation: required - help: 请选择结束时间，结束时间须大于开始时间，不包含结束时间。 - label: 灰色模式 - 结束时间 + help: '请输入时间段，格式: 01/01|01/07 或 1/1|1/7，表示每年的1月1日00时00分00秒至1月7日23时59分59秒，持续7天。' + children: + - $formkit: text + name: time_span + label: 灰色模式时间段 + value: "" + placeholder: '请输入时间段，必须包含“|”分割开始和结束时间' - $formkit: group name: busuanzi_group label: busuanzi 访客统计 diff --git a/src/js/common.js b/src/js/common.js index c76d577..81d4871 100644 --- a/src/js/common.js +++ b/src/js/common.js @@ -590,12 +590,35 @@ const commonContext = { initGrayMode() { if (DreamConfig.gray_mode === true) { $('html').addClass('gray-mode') - } else if (DreamConfig.gray_mode === 'custom') { - var now = Date.now() - var startTime = new Date(DreamConfig.gray_mode_start_time).getTime() - var endTime = new Date(DreamConfig.gray_mode_end_time).getTime() - if (now >= startTime && now <= endTime) { - $('html').addClass('gray-mode') + } else if (DreamConfig.gray_mode === 'custom' && DreamConfig.gray_mode_time_list) { + const now = new Date() + const month = now.getMonth() + 1 + const day = now.getDate() + const isDateInRange = (currentMonth, currentDay, startDate, endDate) => { + const [startMonth, startDay] = startDate.split('/').map(part => part.trim()).map(Number) + const [endMonth, endDay] = endDate.split('/').map(part => part.trim()).map(Number) + if (!startMonth || !startDay || !endMonth || !endDay) { + return false + } + const start = new Date(now.getFullYear(), startMonth - 1, startDay) + const end = new Date(now.getFullYear(), endMonth - 1, endDay) + const current = new Date(now.getFullYear(), currentMonth - 1, currentDay) + return current >= start && current <= end + } + + for (const timeRange of DreamConfig.gray_mode_time_list) { + try { + const [startDate, endDate] = timeRange.split('|').map(part => part.trim()) + if (!startDate || !endDate) { + continue + } + if (isDateInRange(month, day, startDate, endDate)) { + $('html').addClass('gray-mode') + break + } + } catch (e) { + console.log(e) + } } } }, diff --git a/templates/assets/js/common.min.js b/templates/assets/js/common.min.js index 5633fdd..034093d 100644 --- a/templates/assets/js/common.min.js +++ b/templates/assets/js/common.min.js @@ -11,4 +11,4 @@
${e.percent}
- `}),$(".aside-timelife").html(a)}},initSecurityLink(){DreamConfig.enable_security_link&&DreamConfig.security_link_url&&0!==DreamConfig.security_link_url.length&&$(document).on("click","a[target=_blank]",e=>{e.preventDefault();var t,e=$(e.currentTarget).attr("href"),a=window.location.hostname;window.open("_blank").location=(a=a,t=(t=e).toLowerCase().trim(),a=a.toLowerCase().trim(),t.startsWith("//")?t=window.location.protocol+t:t.startsWith("/")&&(t=window.location.origin+t),(t=t.startsWith("http://")||t.startsWith("https://")?t.replace(/\/$/,""):t).includes(a)?e:DreamConfig.security_link_url+"?target="+encodeURIComponent(e))})},initGrayMode(){var e,t,a;(!0===DreamConfig.gray_mode||"custom"===DreamConfig.gray_mode&&(e=Date.now(),t=new Date(DreamConfig.gray_mode_start_time).getTime(),a=new Date(DreamConfig.gray_mode_end_time).getTime(),t<=e)&&e<=a)&&$("html").addClass("gray-mode")},initEffects(){Utils.isMobile()||(DreamConfig.cursor_move&&Utils.cachedScript(`${DreamConfig.theme_base}/js/cursor/move/${DreamConfig.cursor_move}.min.js?mew=`+DreamConfig.theme_version),DreamConfig.cursor_click&&Utils.cachedScript(`${DreamConfig.theme_base}/js/cursor/click/${DreamConfig.cursor_click}.min.js?mew=`+DreamConfig.theme_version),DreamConfig.enable_live2d&&Utils.cachedScript(DreamConfig.theme_base+"/js/autoload.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_lantern_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/lantern.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_sakura_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/sakura.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_snowflake_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/snowflake.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_universe_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/universe.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_circle_magic_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/circleMagic.min.js?mew="+DreamConfig.theme_version))},showThemeVersion(){DreamConfig.enable_console_version_info&&window.logger(`%c页面加载耗时：${Math.round(performance.now())}ms | Theme By Dream2 Plus `+DreamConfig.theme_version,"color:#fff; background: linear-gradient(270deg, #986fee, #8695e6, #68b7dd, #18d7d3); padding: 8px 15px; border-radius: 0 15px 0 15px")}};window.commonContext=t;let o=-1;{const a=["initCarousel","sparkInput","websiteTime"],n=["initEffects","showThemeVersion","iniTaskItemDisabled"];Object.keys(t).forEach(e=>!a.includes(e)&&!n.includes(e)&&t[e]()),document.addEventListener("DOMContentLoaded",function(){$("html").addClass("loaded"),a.forEach(e=>t[e]&&t[e]())}),window.addEventListener("load",function(){n.forEach(e=>t[e]&&t[e]()),$("html").addClass("ready")})}})(); \ No newline at end of file + `}),$(".aside-timelife").html(a)}},initSecurityLink(){DreamConfig.enable_security_link&&DreamConfig.security_link_url&&0!==DreamConfig.security_link_url.length&&$(document).on("click","a[target=_blank]",e=>{e.preventDefault();var t,e=$(e.currentTarget).attr("href"),a=window.location.hostname;window.open("_blank").location=(a=a,t=(t=e).toLowerCase().trim(),a=a.toLowerCase().trim(),t.startsWith("//")?t=window.location.protocol+t:t.startsWith("/")&&(t=window.location.origin+t),(t=t.startsWith("http://")||t.startsWith("https://")?t.replace(/\/$/,""):t).includes(a)?e:DreamConfig.security_link_url+"?target="+encodeURIComponent(e))})},initGrayMode(){if(!0===DreamConfig.gray_mode)$("html").addClass("gray-mode");else if("custom"===DreamConfig.gray_mode&&DreamConfig.gray_mode_time_list){const s=new Date,a=s.getMonth()+1,n=s.getDate();for(const i of DreamConfig.gray_mode_time_list)try{var[e,t]=i.split("|").map(e=>e.trim());if(!e||!t)continue;if(((e,t,a,n)=>{var[a,i]=a.split("/").map(e=>e.trim()).map(Number),[n,o]=n.split("/").map(e=>e.trim()).map(Number);return!!(a&&i&&n&&o)&&(a=new Date(s.getFullYear(),a-1,i),i=new Date(s.getFullYear(),n-1,o),a<=(n=new Date(s.getFullYear(),e-1,t)))&&n<=i})(a,n,e,t)){$("html").addClass("gray-mode");break}}catch(e){console.log(e)}}},initEffects(){Utils.isMobile()||(DreamConfig.cursor_move&&Utils.cachedScript(`${DreamConfig.theme_base}/js/cursor/move/${DreamConfig.cursor_move}.min.js?mew=`+DreamConfig.theme_version),DreamConfig.cursor_click&&Utils.cachedScript(`${DreamConfig.theme_base}/js/cursor/click/${DreamConfig.cursor_click}.min.js?mew=`+DreamConfig.theme_version),DreamConfig.enable_live2d&&Utils.cachedScript(DreamConfig.theme_base+"/js/autoload.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_lantern_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/lantern.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_sakura_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/sakura.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_snowflake_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/snowflake.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_universe_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/universe.min.js?mew="+DreamConfig.theme_version),DreamConfig.effects_circle_magic_mode&&Utils.cachedScript(DreamConfig.theme_base+"/js/effects/circleMagic.min.js?mew="+DreamConfig.theme_version))},showThemeVersion(){DreamConfig.enable_console_version_info&&window.logger(`%c页面加载耗时：${Math.round(performance.now())}ms | Theme By Dream2 Plus `+DreamConfig.theme_version,"color:#fff; background: linear-gradient(270deg, #986fee, #8695e6, #68b7dd, #18d7d3); padding: 8px 15px; border-radius: 0 15px 0 15px")}};window.commonContext=t;let o=-1;{const a=["initCarousel","sparkInput","websiteTime"],n=["initEffects","showThemeVersion","iniTaskItemDisabled"];Object.keys(t).forEach(e=>!a.includes(e)&&!n.includes(e)&&t[e]()),document.addEventListener("DOMContentLoaded",function(){$("html").addClass("loaded"),a.forEach(e=>t[e]&&t[e]())}),window.addEventListener("load",function(){n.forEach(e=>t[e]&&t[e]()),$("html").addClass("ready")})}})(); \ No newline at end of file diff --git a/templates/common/config.html b/templates/common/config.html index 09aee6a..535fb53 100644 --- a/templates/common/config.html +++ b/templates/common/config.html @@ -73,8 +73,18 @@ DreamConfig["site_title"] = [[${site.title}]]; /** 灰色模式 */ DreamConfig["gray_mode"] = [[${theme.config.enhance.gray_mode_group.enable_gray_mode}]]; - DreamConfig["gray_mode_start_time"] = [[${theme.config.enhance.gray_mode_group.gray_mode_start_time}]]; - DreamConfig["gray_mode_end_time"] = [[${theme.config.enhance.gray_mode_group.gray_mode_end_time}]]; + /** 配置自定义灰色模式时段 */ + let gray_mode_time_list = [] + let custom_gray_mode_time_list = [[${theme.config.enhance.gray_mode_group.gray_mode_time_list}]]; + if(custom_gray_mode_time_list) { + for (let time of custom_gray_mode_time_list) { + let type = time.realNode.time_span; + if (gray_mode_time_list.indexOf(type) === -1) { + gray_mode_time_list.push(type); + } + } + } + DreamConfig["gray_mode_time_list"] = gray_mode_time_list; DreamConfig["pjax_state"] = [[${theme.config.enhance.enable_pjax}]]; /** 配置分享方式 */ let post_share = [] diff --git a/theme.yaml b/theme.yaml index 444b03e..76f4f44 100644 --- a/theme.yaml +++ b/theme.yaml @@ -30,7 +30,7 @@ spec: settingName: theme-dream2-plus-setting configMapName: theme-dream2-plus-configMap # 版本号 - version: 1.4.0 + version: 1.4.1.beta1 # 最低支持的 Halo 版本 require: ">=2.20.0" # 许可