From 936eb4705d0121c0a586bc1f9717306b64d7e8c0 Mon Sep 17 00:00:00 2001 From: jiewenhuang Date: Wed, 13 Dec 2023 23:45:26 +0800 Subject: [PATCH] =?UTF-8?q?update:=E9=87=8D=E6=9E=84=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=A0=8F=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 214 ++++++++++++-------- templates/assets/js/common.js | 4 +- templates/assets/js/min/common.min.js | 4 +- templates/modules/ads/ads_aside.html | 7 +- templates/modules/common/aside.html | 40 +++- templates/modules/themeSettingVariable.html | 2 +- templates/modules/widgets/asideWidget.html | 51 +++-- 7 files changed, 209 insertions(+), 113 deletions(-) diff --git a/settings.yaml b/settings.yaml index cedf0f2..da89819 100644 --- a/settings.yaml +++ b/settings.yaml @@ -652,12 +652,6 @@ spec: label: 图片地址 value: "" validation: "required" - - - - - - - $formkit: radio name: banner_direction id: banner_direction @@ -1531,14 +1525,16 @@ spec: name: template_aside id: template_aside label: "侧边栏模块" - value: "enable_lifetime" + value: "none" options: + - value: "none" + label: 无 - value: "enable_blogger" label: 博主信息 - value: "enable_notice" label: 网站公告 - - value: "enable_qrcode" - label: 二维码 + - value: "enable_picture" + label: 图片 - value: "enable_music_player" label: 音乐播放器 - value: "enable_newest_post" @@ -1551,63 +1547,128 @@ spec: label: 标签云 - value: "enable_ads_aside" label: 侧边栏广告 - - $formkit: code -# if: "$get(template_aside).value === 'enable_notice'" - name: site_notice - label: 网站公告 - value: "这是你的公告" - help: "网站公告信息，将展示在页面右侧，尽量简洁明了，不填不展示该模块（需要先在 “侧边栏” 中开启公告模块）,支持html代码" - language: html - - $formkit: attachment -# if: "$get(template_aside).value === 'enable_qrcode'" - name: qrcode_url - label: 二维码图片 - value: "" - - $formkit: text -# if: "$get(enable_qrcode).value === true" - name: qrcode_title - label: 二维码标题 - value: "我的二维码" - - $formkit: textarea -# if: "$get(template_aside).value === 'enable_qrcode'" - name: qrcode_description - label: 二维码描述 - value: "" - - $formkit: text -# if: "$get(template_aside).value === 'enable_music_player'" - name: music_id - label: 歌单ID - help: "为音乐播放器配置歌单ID，大家在网页歌单页直接复制地址栏id参数后面那串数字即可，不填或填错将不会展示播放器（注意：仅支持网易云歌单ID，且不支持私密歌单）" - value: "" - - $formkit: number -# if: "$get(template_aside).value === 'show_newreply'" - name: show_newreply_num - label: 展示最新评论 - value: 3 - help: "在侧边栏展示最新评论的数量" - - $formkit: select -# if: "$get(template_aside).value === 'enable_tag_cloud'" - name: tag_cloud_type - id: tag_cloud_type - label: 标签云类型 - value: "3d" - help: "设置标签云的展示形式，默认为 “3D标签云”，标签太多或卡顿时建议限制展示的标签数量使用列表形式" - options: - - value: 3d - label: 3D标签云 - - value: list - label: 标签列表 - - $formkit: select -# if: "$get(template_aside).value === 'enable_tag_cloud'" - name: tag_cloud_width - id: tag_cloud_width - label: 标签宽度 - value: "static" - options: - - value: static - label: 固定宽度 - - value: responsive - label: 自适应宽度 + - $formkit: group + if: $value.template_aside === 'enable_notice' + name: aside_notice + label: 网站公告 + value: [ ] + children: + - $formkit: text + name: notice_title + label: 公告标题 + value: "网站公告" + help: "公告标题，留空则不显示" + - $formkit: code + name: site_notice + label: 网站公告内容 + value: "这是你的公告" + help: "支持html代码" + language: html + - $formkit: group + if: $value.template_aside === 'enable_picture' + name: aside_picture + label: 图片 + value: [ ] + children: + - $formkit: attachment + name: qrcode_url + label: 图片链接 + value: "" + - $formkit: text + name: qrcode_title + label: 图片标题 + value: "我的二维码" + - $formkit: textarea + name: qrcode_description + label: 图片描述 + value: "" + - $formkit: group + if: $value.template_aside === 'enable_music_player' + name: aside_music_player + label: 音乐播放器 + value: [ ] + children: + - $formkit: text + name: music_id + label: 歌单ID + help: "为音乐播放器配置歌单ID，大家在网页歌单页直接复制地址栏id参数后面那串数字即可，不填或填错将不会展示播放器（注意：仅支持网易云歌单ID，且不支持私密歌单）" + value: "" + - $formkit: group + if: $value.template_aside === 'show_newreply' + name: aside_newreply + label: 最新评论 + value: [ ] + children: + - $formkit: number + name: show_newreply_num + label: 展示最新评论 + value: 3 + help: "在侧边栏展示最新评论的数量" + - $formkit: group + if: $value.template_aside === 'enable_tag_cloud' + name: aside_tag_cloud + label: 标签云 + value: [ ] + children: + - $formkit: select + name: tag_cloud_type + id: tag_cloud_type + label: 标签云类型 + value: "3d" + help: "设置标签云的展示形式，默认为 “3D标签云”，标签太多或卡顿时建议限制展示的标签数量使用列表形式" + options: + - value: 3d + label: 3D标签云 + - value: list + label: 标签列表 + - $formkit: select + name: tag_cloud_width + id: tag_cloud_width + label: 标签宽度 + value: "static" + options: + - value: static + label: 固定宽度 + - value: responsive + label: 自适应宽度 + - $formkit: group + if: $value.template_aside === 'enable_ads_aside' + name: aside_ads + label: 侧边栏广告 + value: [ ] + children: + - $formkit: radio + name: aside_ads_type + id: aside_ads_type + label: 广告数据 + value: "" + help: "广告类型，支持图片和自定义代码" + options: + - value: img + label: 图片 + - value: code + label: 自定义代码 + - $formkit: attachment + if: $value.aside_ads_type === 'img' + name: aside_ads_img + label: 侧边栏广告图片 + value: "" + help: "侧边栏广告图片链接" + - $formkit: text + if: $value.aside_ads_type === 'img' + name: aside_ads_url + label: 广告链接 + value: "" + help: "广告跳转链接" + - $formkit: code + if: $value.aside_ads_type === 'code' + name: aside_ads_code + label: 自定义代码 + value: "" + help: "支持html代码" + language: html + + # - group: post label: 文章页 @@ -2280,26 +2341,7 @@ spec: - group: ads label: 广告 formSchema: - - $formkit: radio - name: enable_aside_ads - label: 是否启用侧边栏广告 - value: false - help: "启用后需要再到侧边栏添加组件" - options: - - value: true - label: 是 - - value: false - label: 否 - - $formkit: attachment - name: aside_ads_img - label: 侧边栏广告图片 - value: "" - help: "侧边栏广告图片链接" - - $formkit: text - name: aside_ads_url - label: 广告链接 - value: "" - help: "广告跳转链接" + - $formkit: radio name: enable_post_ads_top label: 是否启用文章顶部广告 diff --git a/templates/assets/js/common.js b/templates/assets/js/common.js index 14c413a..b664903 100644 --- a/templates/assets/js/common.js +++ b/templates/assets/js/common.js @@ -172,7 +172,8 @@ const commonContext = { } // 代码复制 if (ThemeConfig.enable_code_copy) { - const text = $item.find("code[class*='language-']").text(); + const text = $item.find("code[class='language-none'], code[class*='language-']").text(); + console.log('text:'+text); const span = $( "" ); @@ -527,6 +528,7 @@ const commonContext = { }, /* 初始化3D标签云 */ init3dTag() { + ThemeConfig.tag_cloud_type = document.getElementById('tags-3d') ? '3d' : 'list' ThemeConfig.enable_tag_cloud=document.querySelector('.joe_aside__item.tags-cloud') !== null // console.log(ThemeConfig.enable_tag_cloud) if ( diff --git a/templates/assets/js/min/common.min.js b/templates/assets/js/min/common.min.js index 71e515f..4c75765 100644 --- a/templates/assets/js/min/common.min.js +++ b/templates/assets/js/min/common.min.js @@ -1,4 +1,4 @@ -window.encryption=e=>window.btoa(unescape(encodeURIComponent(e))),window.decrypt=e=>decodeURIComponent(escape(window.atob(e)));const commonContext={initMode(){if("scrollRestoration"in history&&(history.scrollRestoration="manual"),"user"===ThemeConfig.theme_mode){const t=$("html"),a=$(".mode-light"),n=$(".mode-dark");let o=localStorage.getItem("data-mode");a[`${"light"===o?"remove":"add"}Class`]("active"),n[`${"light"===o?"add":"remove"}Class`]("active"),$(".joe_action_item.mode").on("click",function(e){e.stopPropagation();try{o=localStorage.getItem("data-mode");let e="";o?(e="light"===o?"dark":"light",a[`${"light"===o?"add":"remove"}Class`]("active"),n[`${"light"===o?"remove":"add"}Class`]("active")):(e="dark",a.removeClass("active"),n.addClass("active")),t.attr("data-mode",e),localStorage.setItem("data-mode",e),commonContext.initCommentTheme()}catch(e){console.log(e)}})}},loadingBar:{show(){ThemeConfig.enable_loading_bar&&(NProgress.configure({easing:"ease",speed:500,showSpinner:!1}),NProgress.start())},hide(){ThemeConfig.enable_loading_bar&&NProgress.done(!0)}},initNavbar(){var e=$(".joe_header__above-nav a"),o=$(".panel-side-menu .link");let t=0;const{href:a,pathname:n}=location;e.each((e,o)=>{o=o.getAttribute("href");(n.includes(o)||a.includes(o))&&(t=e)});e=e.eq(t);e.addClass("current"),e.parents(".joe_dropdown").length&&e.parents(".joe_dropdown").find(".joe_dropdown__link a").addClass("current"),o.eq(t).addClass("current")},initFooter(){ThemeConfig.enable_footer&&"fixed"===ThemeConfig.footer_position&&$("#Joe").css("margin-bottom",$(".joe_footer").height()+30)},initCommentTheme(){var o=document.getElementsByTagName("halo-comment"),t=document.querySelector("html").getAttribute("data-mode");for(let e=0;e').addClass("c_expander"),o.find(".code-expander").on("click",function(e){e.stopPropagation();var e=$(this),o=e.parent("pre").siblings(".toolbar").find(".autofold-tip");o&&o.remove(),e.parent("pre").toggleClass("close")})),ThemeConfig.enable_code_copy){const a=o.find("code[class*='language-']").text();var t=$('');new ClipboardJS(t[0],{text:()=>a}).on("success",()=>Qmsg.success("复制成功！")),o.addClass("c_copy").append(t)}})},foldCode(){$(".page-post").length&&ThemeConfig.enable_code_expander&&ThemeConfig.enable_fold_long_code&&"false"!==PageAttrs.metas_enable_fold_long_code&&$(".page-post pre[class*='language-']").each(function(e,o){o=$(o);o.height()>ThemeConfig.long_code_height&&(o.siblings(".toolbar").find(".toolbar-item span").eq(0).append('<已自动折叠>'),o.addClass("close"))})},initBaidu(){ThemeConfig.check_baidu_collect&&$("#joe_baidu_record").length&&Utils.request({url:ThemeConfig.BASE_URL+"/halo-api/bd/iscollect",method:"GET",returnRaw:!0,data:{url:ThemeConfig.blog_url+window.location.pathname}}).then(e=>{if(e.data&&e.data.collected)$("#joe_baidu_record").css("color","#67c23a").html("已收录");else if(ThemeConfig.baidu_token){$("#joe_baidu_record").html('未收录，推送中...');let e=setTimeout(function(){Utils.request({url:ThemeConfig.BASE_URL+"/halo-api/bd/push",method:"POST",returnRaw:!0,data:{site:ThemeConfig.blog_url,token:ThemeConfig.baidu_token,urls:window.location.href}}).then(e=>{0===e.data.success?$("#joe_baidu_record").html('推送失败，请检查！'):$("#joe_baidu_record").html('推送成功！')}).catch(e=>{console.log(e)}),clearTimeout(e),e=null},1e3)}else{e="https://ziyuan.baidu.com/linksubmit/url?sitename="+encodeURI(window.location.href);$("#joe_baidu_record").html(`未收录，提交收录`)}}).catch(e=>{console.log(e)})},initMusic(){ThemeConfig.enable_global_music_player&&Utils.request({url:`${ThemeConfig.music_api}?server=${ThemeConfig.music_source}&type=${ThemeConfig.music_player_type}&id=`+ThemeConfig.music_list_id,type:"GET",returnRaw:!0}).then(e=>{new APlayer({container:document.getElementById("global-aplayer"),fixed:!0,lrcType:0,theme:ThemeConfig.music_player_theme,autoplay:ThemeConfig.music_auto_play,volume:ThemeConfig.music_player_volume,loop:ThemeConfig.music_loop_play,audio:e})}).catch(e=>{console.log(e)})},initPDF(){var e=$("joe-pdf");e.length&&e.each((e,o)=>{var t=$(o);options={src:t.attr("src")||"",width:t.attr("width")||"100%",height:t.attr("height")||"500px"};let a="";a=options.src?` +window.encryption=e=>window.btoa(unescape(encodeURIComponent(e))),window.decrypt=e=>decodeURIComponent(escape(window.atob(e)));const commonContext={initMode(){if("scrollRestoration"in history&&(history.scrollRestoration="manual"),"user"===ThemeConfig.theme_mode){const t=$("html"),a=$(".mode-light"),n=$(".mode-dark");let o=localStorage.getItem("data-mode");a[`${"light"===o?"remove":"add"}Class`]("active"),n[`${"light"===o?"add":"remove"}Class`]("active"),$(".joe_action_item.mode").on("click",function(e){e.stopPropagation();try{o=localStorage.getItem("data-mode");let e="";o?(e="light"===o?"dark":"light",a[`${"light"===o?"add":"remove"}Class`]("active"),n[`${"light"===o?"remove":"add"}Class`]("active")):(e="dark",a.removeClass("active"),n.addClass("active")),t.attr("data-mode",e),localStorage.setItem("data-mode",e),commonContext.initCommentTheme()}catch(e){console.log(e)}})}},loadingBar:{show(){ThemeConfig.enable_loading_bar&&(NProgress.configure({easing:"ease",speed:500,showSpinner:!1}),NProgress.start())},hide(){ThemeConfig.enable_loading_bar&&NProgress.done(!0)}},initNavbar(){var e=$(".joe_header__above-nav a"),o=$(".panel-side-menu .link");let t=0;const{href:a,pathname:n}=location;e.each((e,o)=>{o=o.getAttribute("href");(n.includes(o)||a.includes(o))&&(t=e)});e=e.eq(t);e.addClass("current"),e.parents(".joe_dropdown").length&&e.parents(".joe_dropdown").find(".joe_dropdown__link a").addClass("current"),o.eq(t).addClass("current")},initFooter(){ThemeConfig.enable_footer&&"fixed"===ThemeConfig.footer_position&&$("#Joe").css("margin-bottom",$(".joe_footer").height()+30)},initCommentTheme(){var o=document.getElementsByTagName("halo-comment"),t=document.querySelector("html").getAttribute("data-mode");for(let e=0;e').addClass("c_expander"),o.find(".code-expander").on("click",function(e){e.stopPropagation();var e=$(this),o=e.parent("pre").siblings(".toolbar").find(".autofold-tip");o&&o.remove(),e.parent("pre").toggleClass("close")})),ThemeConfig.enable_code_copy){const a=o.find("code[class='language-none'], code[class*='language-']").text();console.log("text:"+a);var t=$('');new ClipboardJS(t[0],{text:()=>a}).on("success",()=>Qmsg.success("复制成功！")),o.addClass("c_copy").append(t)}})},foldCode(){$(".page-post").length&&ThemeConfig.enable_code_expander&&ThemeConfig.enable_fold_long_code&&"false"!==PageAttrs.metas_enable_fold_long_code&&$(".page-post pre[class*='language-']").each(function(e,o){o=$(o);o.height()>ThemeConfig.long_code_height&&(o.siblings(".toolbar").find(".toolbar-item span").eq(0).append('<已自动折叠>'),o.addClass("close"))})},initBaidu(){ThemeConfig.check_baidu_collect&&$("#joe_baidu_record").length&&Utils.request({url:ThemeConfig.BASE_URL+"/halo-api/bd/iscollect",method:"GET",returnRaw:!0,data:{url:ThemeConfig.blog_url+window.location.pathname}}).then(e=>{if(e.data&&e.data.collected)$("#joe_baidu_record").css("color","#67c23a").html("已收录");else if(ThemeConfig.baidu_token){$("#joe_baidu_record").html('未收录，推送中...');let e=setTimeout(function(){Utils.request({url:ThemeConfig.BASE_URL+"/halo-api/bd/push",method:"POST",returnRaw:!0,data:{site:ThemeConfig.blog_url,token:ThemeConfig.baidu_token,urls:window.location.href}}).then(e=>{0===e.data.success?$("#joe_baidu_record").html('推送失败，请检查！'):$("#joe_baidu_record").html('推送成功！')}).catch(e=>{console.log(e)}),clearTimeout(e),e=null},1e3)}else{e="https://ziyuan.baidu.com/linksubmit/url?sitename="+encodeURI(window.location.href);$("#joe_baidu_record").html(`未收录，提交收录`)}}).catch(e=>{console.log(e)})},initMusic(){ThemeConfig.enable_global_music_player&&Utils.request({url:`${ThemeConfig.music_api}?server=${ThemeConfig.music_source}&type=${ThemeConfig.music_player_type}&id=`+ThemeConfig.music_list_id,type:"GET",returnRaw:!0}).then(e=>{new APlayer({container:document.getElementById("global-aplayer"),fixed:!0,lrcType:0,theme:ThemeConfig.music_player_theme,autoplay:ThemeConfig.music_auto_play,volume:ThemeConfig.music_player_volume,loop:ThemeConfig.music_loop_play,audio:e})}).catch(e=>{console.log(e)})},initPDF(){var e=$("joe-pdf");e.length&&e.each((e,o)=>{var t=$(o);options={src:t.attr("src")||"",width:t.attr("width")||"100%",height:t.attr("height")||"500px"};let a="";a=options.src?`
`:"

pdf地址未填写！

",$(o).replaceWith(a)})},back2Top(){if(ThemeConfig.enable_back2top){const o=$(".joe_action_item.back2top");var e=()=>{var e=document.documentElement.scrollTop||document.body.scrollTop;o[(300{t+=` @@ -14,4 +14,4 @@ window.encryption=e=>window.btoa(unescape(encodeURIComponent(e))),window.decrypt
${e.percent}
- `}),$(".joe_aside__item.timelife .joe_aside__item-contain").html(t)}},initWeather(){!Joe.isMobile&&ThemeConfig.enable_weather&&ThemeConfig.weather_key&&$("#he-plugin-simple").length&&(window.WIDGET={CONFIG:{modules:"120",background:"5",tmpColor:"FFFFFF",tmpSize:"13",cityColor:"FFFFFF",citySize:"13",aqiColor:"FFFFFF",aqiSize:"13",weatherIconSize:"13",alertIconSize:"13",padding:"5px 5px 4px 5px",shadow:"0",language:"auto",borderRadius:"4",fixed:"true",vertical:"top",horizontal:"left",key:ThemeConfig.weather_key}},$.getScript("https://widget.qweather.net/simple/static/js/he-simple-common.js?v=2.0"))},initGallery(){var e=$(".page-post .joe_detail__article img:not([class]), .page-journals .joe_journal_block img:not([class]), .page-sheet img:not([class])");e.length&&e.each(function(){var e=$(this);e.wrap($(``))})},initExternalLink(){let e;"default"!==ThemeConfig.link_behavior?(e=$(".joe_main_container a[href]")).length&&e.each(function(){var e,o=$(this);o.attr("href").includes("javascript:;")||(e="",e="new"!==ThemeConfig.link_behavior||o.attr("href").startsWith("#")?"":"_blank",o.attr({target:e,rel:"noopener noreferrer nofollow"}))}):(e=$(".page-post .joe_detail__article a[href], .joe_journal_body a[href], .page-sheet .joe_detail__article a[href]")).length&&e.each(function(){var e=$(this),o=e.attr("href");o.includes("javascript:;")||(o=o.startsWith("#")?"":"_blank",e.attr({target:o,rel:"noopener noreferrer nofollow"}))})},init3dTag(){ThemeConfig.enable_tag_cloud=null!==document.querySelector(".joe_aside__item.tags-cloud"),!Joe.isMobile&&ThemeConfig.enable_tag_cloud&&"3d"===ThemeConfig.tag_cloud_type&&$(".tags-cloud-list").length&&$.getScript(ThemeConfig.BASE_RES_URL+"/assets/lib/3dtag/3dtag.min.js",e=>{const a=[],n=["#F8D800","#0396FF","#EA5455","#7367F0","#32CCBC","#F6416C","#28C76F","#9F44D3","#F55555","#736EFE","#E96D71","#DE4313","#D939CD","#4C83FF","#F072B6","#C346C2","#5961F9","#FD6585","#465EFB","#FFC600","#FA742B","#5151E5","#BB4E75","#FF52E5","#49C628","#00EAFF","#F067B4","#F067B4","#ff9a9e","#00f2fe","#4facfe","#f093fb","#6fa3ef","#bc99c4","#46c47c","#f9bb3c","#e8583d","#f68e5f"];$(".tags-cloud-list a").each((e,o)=>{var t;a.push({label:$(o).attr("data-label"),url:$(o).attr("data-url"),target:"_blank",fontColor:n[o=0,t=n.length-1,o=Math.ceil(o),t=Math.floor(t),Math.floor(Math.random()*(t-o+1))+o],fontSize:16})}),$("#tags-3d").svg3DTagCloud({entries:a,width:250,height:250,radius:"65%",radiusMin:75,bgDraw:!1,fov:800,speed:.5,fontWeight:500}),$(".tags-cloud-list").remove(),$("#tags-3d .empty").remove()})},initDropMenu(){$(".joe_dropdown").each(function(e,o){var t=$(this).find(".joe_dropdown__menu"),a=$(o).attr("trigger")||"click",o=$(o).attr("placement")||$(this).height()||0;t.css("top",o),"hover"===a?$(this).hover(()=>$(this).addClass("active"),()=>$(this).removeClass("active")):($(this).on("click",function(e){e.stopPropagation(),$(this).toggleClass("active"),$(document).one("click",()=>$(this).removeClass("active")),e.stopPropagation()}),t.on("click",e=>e.stopPropagation()))})},drawerMobile(){$(".joe_header__above-slideicon").on("click",function(e){e.stopPropagation(),$(".joe_header__searchout").removeClass("active");var e=$("html"),o=$(".joe_header__mask"),t=$(".joe_header__slideout");t.hasClass("active")?(e.removeClass("disable-scroll"),o.removeClass("active slideout"),t.removeClass("active")):(window.sessionStorage.setItem("lastScroll",e.scrollTop()),e.addClass("disable-scroll"),o.addClass("active slideout"),t.addClass("active"))})},maskClose(){$(".joe_header__mask").on("click",function(e){e.stopPropagation();var e=$("html"),o=(e.removeClass("disable-scroll"),$(".joe_header__mask").removeClass("active slideout"),$(".joe_header__searchout").removeClass("active"),$(".joe_header__slideout").removeClass("active"),$(".joe_header__toc").removeClass("active"),$(".joe_header__above").removeClass("solid"),window.sessionStorage.getItem("lastScroll"));o&&e.scrollTop(o),window.sessionStorage.removeItem("lastScroll")}).on("touchmove",e=>e.preventDefault)},sideMenuMobile(){$(".joe_header__slideout-menu .current").parents(".panel-body").show().siblings(".panel").addClass("in"),$(".joe_header__slideout-menu .panel").on("click",function(e){e.stopPropagation();var e=$(this),o=e.parent().parent();o.find(".panel").not(e).removeClass("in"),o.find(".panel-body").not(e.siblings(".panel-body")).stop().hide("fast"),e.toggleClass("in").siblings(".panel-body").stop().toggle("fast")})},initHeadScroll(){if(!Joe.isMobile&&!ThemeConfig.enable_fixed_header){let e=0,o=0;const n=$(".joe_header__above"),i=$(".joe_aside_post, .joe_aside .joe_aside__item:last-child"),l=n.height();var t,a;i&&(t=l+15,a=l-60+15);document.addEventListener("scroll",Utils.throttle(()=>{window.tocPhase||(e=window.scrollY,ol?(n.addClass("active"),i&&i.css("top",a)):o>e&&(n.removeClass("active"),i)&&i.css("top",t),o=e)},100))}},cancelSpaceScroll(){document.body.onkeydown=function(e){var o=(e=e||window.event).target||e.srcElement;32!==(e.keyCode||e.charCode)||["text","input","textarea","halo-comment"].includes(o.tagName.toLowerCase())||(window.event?e.returnValue=!1:e.preventDefault())}},scrollToHash(e,o=0){var t;(e=e||window.decodeURIComponent(location.hash))&&(t=$(".joe_header").height(),e=$(e))&&0{var e=(+new Date-r.getTime())/864e5,o=Math.floor(e),t=24*(e-o),a=Math.floor(t),n=60*(t-a),i=Math.floor(n),l=60*(n-i),s=Math.floor(l),e=String(o).padStart(2,0),t=String(a).padStart(2,0),n=String(i).padStart(2,0),l=String(s).padStart(2,0);c.html(e),d.html(t),m.html(n),h.html(l)};e(),setInterval(e,1e3)}else Qmsg.error("“自定义博客起始时间” 格式错误，请检查！")},showLoadTime(){var e;!Joe.isMobile&&ThemeConfig.show_loaded_time&&(e=performance.now())&&console.log("%c页面加载耗时："+Math.round(e)+" ms","padding: 6px 8px;color:#fff;background:linear-gradient(270deg, #4edb21, #f15206);border-radius: 3px;")},debug(){ThemeConfig.enable_debug&&new window.VConsole},clean(){$("#compatiable-checker").remove(),$("#theme-config-getter").remove(),$("#metas-getter").remove(),$("#theme-config-getter").remove(),commonContext.loadingBar.hide()}};!function(){const o=["loadingBar","init3dTag","foldCode","loadMouseEffect","loadBackdropEffect","setFavicon","initUV","showLoadTime","debug","clean"];document.addEventListener("DOMContentLoaded",function(){commonContext.loadingBar.show(),Object.keys(commonContext).forEach(e=>!o.includes(e)&&commonContext[e]())}),window.addEventListener("load",function(){1===o.length?commonContext[o[0]]():o.forEach(e=>"loadingBar"!==e&&commonContext[e]&&commonContext[e]())})}(),window.commonContext=commonContext; \ No newline at end of file + `}),$(".joe_aside__item.timelife .joe_aside__item-contain").html(t)}},initWeather(){!Joe.isMobile&&ThemeConfig.enable_weather&&ThemeConfig.weather_key&&$("#he-plugin-simple").length&&(window.WIDGET={CONFIG:{modules:"120",background:"5",tmpColor:"FFFFFF",tmpSize:"13",cityColor:"FFFFFF",citySize:"13",aqiColor:"FFFFFF",aqiSize:"13",weatherIconSize:"13",alertIconSize:"13",padding:"5px 5px 4px 5px",shadow:"0",language:"auto",borderRadius:"4",fixed:"true",vertical:"top",horizontal:"left",key:ThemeConfig.weather_key}},$.getScript("https://widget.qweather.net/simple/static/js/he-simple-common.js?v=2.0"))},initGallery(){var e=$(".page-post .joe_detail__article img:not([class]), .page-journals .joe_journal_block img:not([class]), .page-sheet img:not([class])");e.length&&e.each(function(){var e=$(this);e.wrap($(``))})},initExternalLink(){let e;"default"!==ThemeConfig.link_behavior?(e=$(".joe_main_container a[href]")).length&&e.each(function(){var e,o=$(this);o.attr("href").includes("javascript:;")||(e="",e="new"!==ThemeConfig.link_behavior||o.attr("href").startsWith("#")?"":"_blank",o.attr({target:e,rel:"noopener noreferrer nofollow"}))}):(e=$(".page-post .joe_detail__article a[href], .joe_journal_body a[href], .page-sheet .joe_detail__article a[href]")).length&&e.each(function(){var e=$(this),o=e.attr("href");o.includes("javascript:;")||(o=o.startsWith("#")?"":"_blank",e.attr({target:o,rel:"noopener noreferrer nofollow"}))})},init3dTag(){ThemeConfig.tag_cloud_type=document.getElementById("tags-3d")?"3d":"list",ThemeConfig.enable_tag_cloud=null!==document.querySelector(".joe_aside__item.tags-cloud"),!Joe.isMobile&&ThemeConfig.enable_tag_cloud&&"3d"===ThemeConfig.tag_cloud_type&&$(".tags-cloud-list").length&&$.getScript(ThemeConfig.BASE_RES_URL+"/assets/lib/3dtag/3dtag.min.js",e=>{const a=[],n=["#F8D800","#0396FF","#EA5455","#7367F0","#32CCBC","#F6416C","#28C76F","#9F44D3","#F55555","#736EFE","#E96D71","#DE4313","#D939CD","#4C83FF","#F072B6","#C346C2","#5961F9","#FD6585","#465EFB","#FFC600","#FA742B","#5151E5","#BB4E75","#FF52E5","#49C628","#00EAFF","#F067B4","#F067B4","#ff9a9e","#00f2fe","#4facfe","#f093fb","#6fa3ef","#bc99c4","#46c47c","#f9bb3c","#e8583d","#f68e5f"];$(".tags-cloud-list a").each((e,o)=>{var t;a.push({label:$(o).attr("data-label"),url:$(o).attr("data-url"),target:"_blank",fontColor:n[o=0,t=n.length-1,o=Math.ceil(o),t=Math.floor(t),Math.floor(Math.random()*(t-o+1))+o],fontSize:16})}),$("#tags-3d").svg3DTagCloud({entries:a,width:250,height:250,radius:"65%",radiusMin:75,bgDraw:!1,fov:800,speed:.5,fontWeight:500}),$(".tags-cloud-list").remove(),$("#tags-3d .empty").remove()})},initDropMenu(){$(".joe_dropdown").each(function(e,o){var t=$(this).find(".joe_dropdown__menu"),a=$(o).attr("trigger")||"click",o=$(o).attr("placement")||$(this).height()||0;t.css("top",o),"hover"===a?$(this).hover(()=>$(this).addClass("active"),()=>$(this).removeClass("active")):($(this).on("click",function(e){e.stopPropagation(),$(this).toggleClass("active"),$(document).one("click",()=>$(this).removeClass("active")),e.stopPropagation()}),t.on("click",e=>e.stopPropagation()))})},drawerMobile(){$(".joe_header__above-slideicon").on("click",function(e){e.stopPropagation(),$(".joe_header__searchout").removeClass("active");var e=$("html"),o=$(".joe_header__mask"),t=$(".joe_header__slideout");t.hasClass("active")?(e.removeClass("disable-scroll"),o.removeClass("active slideout"),t.removeClass("active")):(window.sessionStorage.setItem("lastScroll",e.scrollTop()),e.addClass("disable-scroll"),o.addClass("active slideout"),t.addClass("active"))})},maskClose(){$(".joe_header__mask").on("click",function(e){e.stopPropagation();var e=$("html"),o=(e.removeClass("disable-scroll"),$(".joe_header__mask").removeClass("active slideout"),$(".joe_header__searchout").removeClass("active"),$(".joe_header__slideout").removeClass("active"),$(".joe_header__toc").removeClass("active"),$(".joe_header__above").removeClass("solid"),window.sessionStorage.getItem("lastScroll"));o&&e.scrollTop(o),window.sessionStorage.removeItem("lastScroll")}).on("touchmove",e=>e.preventDefault)},sideMenuMobile(){$(".joe_header__slideout-menu .current").parents(".panel-body").show().siblings(".panel").addClass("in"),$(".joe_header__slideout-menu .panel").on("click",function(e){e.stopPropagation();var e=$(this),o=e.parent().parent();o.find(".panel").not(e).removeClass("in"),o.find(".panel-body").not(e.siblings(".panel-body")).stop().hide("fast"),e.toggleClass("in").siblings(".panel-body").stop().toggle("fast")})},initHeadScroll(){if(!Joe.isMobile&&!ThemeConfig.enable_fixed_header){let e=0,o=0;const n=$(".joe_header__above"),i=$(".joe_aside_post, .joe_aside .joe_aside__item:last-child"),l=n.height();var t,a;i&&(t=l+15,a=l-60+15);document.addEventListener("scroll",Utils.throttle(()=>{window.tocPhase||(e=window.scrollY,ol?(n.addClass("active"),i&&i.css("top",a)):o>e&&(n.removeClass("active"),i)&&i.css("top",t),o=e)},100))}},cancelSpaceScroll(){document.body.onkeydown=function(e){var o=(e=e||window.event).target||e.srcElement;32!==(e.keyCode||e.charCode)||["text","input","textarea","halo-comment"].includes(o.tagName.toLowerCase())||(window.event?e.returnValue=!1:e.preventDefault())}},scrollToHash(e,o=0){var t;(e=e||window.decodeURIComponent(location.hash))&&(t=$(".joe_header").height(),e=$(e))&&0{var e=(+new Date-r.getTime())/864e5,o=Math.floor(e),t=24*(e-o),a=Math.floor(t),n=60*(t-a),i=Math.floor(n),l=60*(n-i),s=Math.floor(l),e=String(o).padStart(2,0),t=String(a).padStart(2,0),n=String(i).padStart(2,0),l=String(s).padStart(2,0);c.html(e),d.html(t),m.html(n),h.html(l)};e(),setInterval(e,1e3)}else Qmsg.error("“自定义博客起始时间” 格式错误，请检查！")},showLoadTime(){var e;!Joe.isMobile&&ThemeConfig.show_loaded_time&&(e=performance.now())&&console.log("%c页面加载耗时："+Math.round(e)+" ms","padding: 6px 8px;color:#fff;background:linear-gradient(270deg, #4edb21, #f15206);border-radius: 3px;")},debug(){ThemeConfig.enable_debug&&new window.VConsole},clean(){$("#compatiable-checker").remove(),$("#theme-config-getter").remove(),$("#metas-getter").remove(),$("#theme-config-getter").remove(),commonContext.loadingBar.hide()}};!function(){const o=["loadingBar","init3dTag","foldCode","loadMouseEffect","loadBackdropEffect","setFavicon","initUV","showLoadTime","debug","clean"];document.addEventListener("DOMContentLoaded",function(){commonContext.loadingBar.show(),Object.keys(commonContext).forEach(e=>!o.includes(e)&&commonContext[e]())}),window.addEventListener("load",function(){1===o.length?commonContext[o[0]]():o.forEach(e=>"loadingBar"!==e&&commonContext[e]&&commonContext[e]())})}(),window.commonContext=commonContext; \ No newline at end of file diff --git a/templates/modules/ads/ads_aside.html b/templates/modules/ads/ads_aside.html index b90a6dd..67b8f61 100644 --- a/templates/modules/ads/ads_aside.html +++ b/templates/modules/ads/ads_aside.html @@ -1,6 +1,6 @@ - + + + + \ No newline at end of file diff --git a/templates/modules/common/aside.html b/templates/modules/common/aside.html index 093d5dd..9c21c00 100644 --- a/templates/modules/common/aside.html +++ b/templates/modules/common/aside.html @@ -4,7 +4,45 @@