hcjike/halo-theme-dream2.0-plus
hcjike/halo-theme-dream2.0-plus
1
1
Fork 0
mirror of https://ghfast.top/https://github.com/zsjy/halo-theme-dream2.0-plus.git synced 2025-03-15 13:09:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55 from zsjy/dev

Browse Source 
Dev
This commit is contained in:
宏尘 2025-03-08 20:00:59 +08:00 committed by GitHub
commit 11862b7a0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 49 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/css/style.less
View File

@ -4165,10 +4165,6 @@ button.swiper-pagination-bullet {
}
}
.container:not(.two-column) .column-right {
display: none !important;
}
.is-hidden-not-desktop {
display: none !important;
}
@ -4954,6 +4950,12 @@ button.swiper-pagination-bullet {
}
}
/* 文本绘图 */
text-diagram[data-type="mermaid"] {
display: flex ;
justify-content: center;
}
/* 友链界面 */
.links:not(.widget) {
margin-bottom: 20px;

15
src/js/common.js
View File

@ -2,17 +2,6 @@ window.encrypt = (str) => window.btoa(unescape(encodeURIComponent(str)))
window.decrypt = (str) => decodeURIComponent(escape(window.atob(str)))
const commonContext = {
/* 初始化widget */
initWidget() {
const $columnRight = $('.columns .column-right')
const $columnRightShadow = $('.columns .column-right-shadow')
// 实现将右边widget拷贝的左边
if ($columnRight.length && $columnRightShadow.length && !$columnRightShadow[0].children.length) {
for (const child of $columnRight[0].children) {
$columnRightShadow[0].append(child.cloneNode(true))
}
}
},
/* 初始化目录和公告模块 */
initTocAndNotice() {
const {pathname} = location
@ -72,10 +61,10 @@ const commonContext = {
const applyNight = (isNightValue) => {
if (isNightValue) {
// 配色方案
$('html').addClass('color-scheme-dark').removeClass('color-scheme-light').addClass('night')
$('html').addClass('color-scheme-dark').removeClass('color-scheme-light').addClass('night').attr('night', true)
} else {
// 配色方案
$('html').addClass('color-scheme-light').removeClass('color-scheme-dark').removeClass('night')
$('html').addClass('color-scheme-light').removeClass('color-scheme-dark').removeClass('night').removeAttr('night')
}
localStorage.setItem('night', isNightValue)
isNight = isNightValue

12
src/js/pjax.js
View File

@ -129,10 +129,11 @@ $(document).on('pjax:success', async function (event, data, status, xhr, options
$head.find('link[rel="canonical"]').remove()
$head.append($currentTarget.filter('meta'))
$head.append($currentTarget.filter('link[rel="canonical"]'))
$currentTarget.filter('link').filter(function() {
$currentTarget.filter('link').filter(function () {
const isDataPjax = $(this).is('[data-pjax]')
const href = $(this).attr('href')
const isStaticPath = href && (href.startsWith('/plugins/PluginHighlightJS/') || href.startsWith('/plugins/plugin-katex/'))
const isStaticPath = href && (href.startsWith('/plugins/PluginHighlightJS/') ||
href.startsWith('/plugins/plugin-katex/'))
return isDataPjax || isStaticPath
}).each(function () {
let href = $(this).attr('href')
@ -146,10 +147,11 @@ $(document).on('pjax:success', async function (event, data, status, xhr, options
}
}
})
let $scripts = $currentTarget.filter('script').filter(function() {
let $scripts = $currentTarget.filter('script').filter(function () {
const isDataPjax = $(this).is('[data-pjax]')
const src = $(this).attr('src')
const isStaticPath = src && (src.startsWith('/plugins/PluginHighlightJS/'))
const isStaticPath = src && (src.startsWith('/plugins/PluginHighlightJS/') ||
src.startsWith('/plugins/text-diagram/'))
return isDataPjax || isStaticPath
})
if ($scripts.length > 0) {
@ -185,6 +187,8 @@ $(document).on('pjax:success', async function (event, data, status, xhr, options
window.postPjax && window.postPjax(serialNumber)
/* 初始化Katex */
window.initKatex && window.initKatex()
/* 初始化Mermaid */
window.initMermaid && window.initMermaid()
/* 刷新人生倒计时 */
commonContext.initTimeCount()
/* 初始化任务列表，禁止点击 */

32
src/js/post.js
View File

@ -42,18 +42,18 @@ const postContext = {
}
// 生成行号
let codes = $(this).text().split('\n') || []
let nums = codes.length-1
let nums = codes.length
let lineDigit = String(nums).length
if (lineDigit === 1) lineDigit = 2
let lis = ''
for (var i = 0; i < nums; i++) {
lis += `<li ${(lines && /^\s*\|\+\s+/.test(codes[i]))? 'class="code-select"' : ''}>${String(i + 1).padStart(lineDigit, 0)}</li>`
if (i === nums - 1 && codes[i].trim() === '') {
continue
}
if (codes[nums].trim() !== '') {
lis += `<li ${(lines && /^\s*\|\+\s+/.test(codes[i]))? 'class="code-select"' : ''}>${String(nums + 1).padStart(lineDigit, 0)}</li>`
lis += `<li ${(lines && /^\s*\|\+\s+/.test(codes[i])) ? 'class="code-select"' : ''}>${String(i + 1).padStart(lineDigit, 0)}</li>`
}
if (lines) {
$(this).text($(this).text().replace(/(^\s*)\|\+\s/gm,'$1'))
$(this).text($(this).text().replace(/(^\s*)\|\+\s/gm, '$1'))
}
// 代码块的id，用于代码块复制和折叠
let id = `codeBlock${index}-${new Date().getTime()}`
@ -92,7 +92,7 @@ const postContext = {
/* 代码块高亮 */
initHighlighting() {
// 初始化代码块高亮工具
if(typeof hljs !== 'undefined' && hljs !== null) {
if (typeof hljs !== 'undefined' && hljs !== null) {
document.querySelectorAll('code[data-highlighted="yes"]').forEach(element => {
element.removeAttribute('data-highlighted')
})
@ -206,11 +206,23 @@ window.initKatex = function () {
console.log('katex is not defined')
return
}
$mainContent.find('[math-inline]').each(function (index, domEle) {
katex.render(domEle.innerText, domEle, { displayMode: false })
$mainContent.find('[math-inline], .math-inline, .katex--inline').each(function (index, domEle) {
katex.render(domEle.innerText, domEle, {displayMode: false})
})
$mainContent.find('[math-display]').each(function (index, domEle) {
katex.render(domEle.innerText, domEle, { displayMode: true })
$mainContent.find('[math-display], .math-display, .katex--display').each(function (index, domEle) {
katex.render(domEle.innerText, domEle, {displayMode: true})
})
}
// 初始化Mermaid
window.initMermaid = function () {
if (typeof mermaid === 'undefined' || mermaid === null) {
return
}
const postBody = document.body
mermaid.initialize({startOnLoad: true})
mermaid.run({
querySelector: 'text-diagram[data-type=mermaid]',
})
}

21
src/js/utils.js
View File

@ -202,27 +202,6 @@ const Utils = {
})
})
},
// /* 百度自动推送 */
// baiduPush() {
// let bp = document.createElement('script')
// let curProtocol = window.location.protocol.split(':')[0]
// if (curProtocol === 'https') {
// bp.src = 'https://zz.bdstatic.com/linksubmit/push.js'
// } else {
// bp.src = 'http://push.zhanzhang.baidu.com/push.js'
// }
// $(`script[src="${bp.src}"]`).remove()
// let s = document.getElementsByTagName('script')[0]
// s.parentNode.insertBefore(bp, s)
// },
// toutiaoPush() {
// let el = document.createElement('script')
// el.src = 'https://lf1-cdn-tos.bytegoofy.com/goofy/ttzz/push.js?0fbcfbb1ed642c21419d5be02d56ade7d6ee5372ca221d12ba35df110760b2a830632485602430134f60bc55ca391050b680e2741bf7233a8f1da9902314a3fa'
// el.id = 'ttzz'
// $(`script[src="${el.src}"]`).remove()
// let s = document.getElementsByTagName('script')[0]
// s.parentNode.insertBefore(el, s)
// },
/* sleep */
sleep(ms = 250) {
return new Promise((resolve) => setTimeout(resolve, ms))

2
templates/assets/css/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
templates/assets/js/common.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
templates/assets/js/pjax.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
templates/assets/js/post.min.js vendored
View File

@ -1 +1 @@
(()=>{let i=!1;const a={initCodeBlock(){var e=$("*:not(figure) > pre > code");0!==e.length&&e.each(function(e){var i=$(this).parent();let t=$(this).attr("class"),n="",a=!1,o=!1;if(null!=t){var l=t.match(/[|<](.*)$/),r=t.match(/:select/);if(l||r){let e=0;r&&(e=r.index,l?l[1].endsWith(r[0])&&(l[1]=l[1].substring(0,l[1].length-r[0].length)):n=t.substring(9,r.index),a=!0),l&&(e=l.index<e?l.index:e,"<"===l[0][0]&&(o=!0),n=l[1]),$(this).attr("class",t.substring(0,e)),n=n||t.substring(9,e)}else n=t.substring(9)}let s=$(this).text().split("\n")||[],d=s.length-1,c=String(d).length,h=(1===c&&(c=2),"");for(var g=0;g<d;g++)h+=`<li ${a&&/^\s*\|\+\s+/.test(s[g])?'class="code-select"':""}>${String(g+1).padStart(c,0)}</li>`;""!==s[d].trim()&&(h+=`<li ${a&&/^\s*\|\+\s+/.test(s[g])?'class="code-select"':""}>${String(1+d).padStart(c,0)}</li>`),a&&$(this).text($(this).text().replace(/(^\s*)\|\+\s/gm,"$1"));let p=`codeBlock${e}-`+(new Date).getTime(),u="";o&&(u=" close",$(this).parent().hide());r=`<div><i class="ri-arrow-down-s-line${u}" data-code='#${p}'></i><i class="ri-file-copy-2-line btn-clipboard" title="复制代码" data-clipboard-target='#${p}'></i></div>`;$(this).attr("id",p),i.prepend(`<ul>${h}</ul>`),d>DreamConfig.code_fold_line?i.wrap('<figure class="fold hljs"></figure>').append('<div class="expand-done"><i class="ri-arrow-up-double-line"></i></div>'):i.wrap('<figure class="hljs"></figure>'),i.parent().prepend(`<figcaption>${n}${r}</figcaption>`)})},initLiterature(){$(".literature-content>p:not([class]),.literature-content>mew-hide>p:not([class])").each(function(){0===$(this).children(":not(code,a,strong,em,ins,b,s,br,span.pwd)").length&&$(this).addClass("note")})},initLike(){Utils.initLikeButton(".admire .agree.like","posts")},initHighlighting(){"undefined"!=typeof hljs&&null!==hljs&&(document.querySelectorAll('code[data-highlighted="yes"]').forEach(e=>{e.removeAttribute("data-highlighted")}),hljs.highlightAll())},initShare(){if(window.DShare){let e=$(".cover-image").css("background-image");e=e&&e.substring(5,e.length-2),DShare.create(".dshare",{image:e,imageSelector:".main-content"})}},initClipboard(){window.clipboard||(window.clipboard=new ClipboardJS(".btn-clipboard"),clipboard.on("error",function(e){e.clearSelection(),Qmsg.error("您的浏览器不支持复制")}),clipboard.on("success",function(){Qmsg.success("复制成功")}))},foldImage(){var e;DreamConfig.img_fold_height&&((e=$(".article .gallery-item>[data-fancybox]>img")).parent().addClass("fold"),e.each(function(){const e=$(this).parent();this.complete?this.scrollHeight>=DreamConfig.img_fold_height?e.append('<div class="expand-done"><i class="ri-arrow-up-double-line"></i></div>'):e.removeClass("fold"):this.onload=function(){this.scrollHeight>=DreamConfig.img_fold_height?e.append('<div class="expand-done"><i class="ri-arrow-up-double-line"></i></div>'):e.removeClass("fold")}}))},initEvent(){var e;i||((e=$("body")).on("click","figure>figcaption .ri-arrow-down-s-line",function(){var e=$(this);e.is(".close")?($(e.attr("data-code")).parent().slideDown(200),e.removeClass("close")):($(e.attr("data-code")).parent().slideUp(200),e.addClass("close"))}),e.on("click","figure > pre > .expand-done",function(){Utils.foldBlock($(this).parent().parent())}),e.on("click",".gallery-item .expand-done",function(e){e.stopPropagation(),Utils.foldBlock($(this).parent())}),Utils.initLikeEvent(".admire .agree.like","posts",e=>e.find("span").find("span")),window.onCommentSuccessEvent=(e,i)=>{var t=encrypt("mew-hide-"+i),n=(n=localStorage.getItem(t))?JSON.parse(decrypt(n)):[],e=String(e.postId);n.includes(e)||(n.push(e),$(`.main-content[data-target='${i}'][data-id='${e}'] mew-hide[hide]`).each(function(){$(this).before(decrypt(this.getAttribute("hide"))),$(this).remove(),commonContext.initGallery(),a.initCodeBlock(),a.initLiterature(),a.initHighlighting(),"true"===this.getAttribute("toc")&&commonContext.initTocAndNotice()}),localStorage.setItem(t,encrypt(JSON.stringify(n))))},i=!0)}};window.initKatex=function(){var e=$(".main-content");"undefined"!=typeof katex&&null!==katex&&0!==e.length?(e.find("[math-inline]").each(function(e,i){katex.render(i.innerText,i,{displayMode:!1})}),e.find("[math-display]").each(function(e,i){katex.render(i.innerText,i,{displayMode:!0})})):console.log("katex is not defined")},window.postPjax=function(i){0!==$(".main-content").length&&Object.keys(a).forEach(e=>window.pjaxSerialNumber===i&&a[e]())};{const t=["initEvent","initCodeBlock","initLiterature","initLike","foldImage"];Object.keys(a).forEach(e=>!window.pjaxSerialNumber&&t.includes(e)&&a[e]()),document.addEventListener("DOMContentLoaded",function(){Object.keys(a).forEach(e=>!window.pjaxSerialNumber&&!t.includes(e)&&a[e]())})}})();
(()=>{let i=!1;const a={initCodeBlock(){var e=$("*:not(figure) > pre > code");0!==e.length&&e.each(function(e){var i=$(this).parent();let t=$(this).attr("class"),n="",a=!1,o=!1;if(null!=t){var r=t.match(/[|<](.*)$/),l=t.match(/:select/);if(r||l){let e=0;l&&(e=l.index,r?r[1].endsWith(l[0])&&(r[1]=r[1].substring(0,r[1].length-l[0].length)):n=t.substring(9,l.index),a=!0),r&&(e=r.index<e?r.index:e,"<"===r[0][0]&&(o=!0),n=r[1]),$(this).attr("class",t.substring(0,e)),n=n||t.substring(9,e)}else n=t.substring(9)}let d=$(this).text().split("\n")||[],s=d.length,c=String(s).length,h=(1===c&&(c=2),"");for(var g=0;g<s;g++)g===s-1&&""===d[g].trim()||(h+=`<li ${a&&/^\s*\|\+\s+/.test(d[g])?'class="code-select"':""}>${String(g+1).padStart(c,0)}</li>`);a&&$(this).text($(this).text().replace(/(^\s*)\|\+\s/gm,"$1"));let p=`codeBlock${e}-`+(new Date).getTime(),u="";o&&(u=" close",$(this).parent().hide());l=`<div><i class="ri-arrow-down-s-line${u}" data-code='#${p}'></i><i class="ri-file-copy-2-line btn-clipboard" title="复制代码" data-clipboard-target='#${p}'></i></div>`;$(this).attr("id",p),i.prepend(`<ul>${h}</ul>`),s>DreamConfig.code_fold_line?i.wrap('<figure class="fold hljs"></figure>').append('<div class="expand-done"><i class="ri-arrow-up-double-line"></i></div>'):i.wrap('<figure class="hljs"></figure>'),i.parent().prepend(`<figcaption>${n}${l}</figcaption>`)})},initLiterature(){$(".literature-content>p:not([class]),.literature-content>mew-hide>p:not([class])").each(function(){0===$(this).children(":not(code,a,strong,em,ins,b,s,br,span.pwd)").length&&$(this).addClass("note")})},initLike(){Utils.initLikeButton(".admire .agree.like","posts")},initHighlighting(){"undefined"!=typeof hljs&&null!==hljs&&(document.querySelectorAll('code[data-highlighted="yes"]').forEach(e=>{e.removeAttribute("data-highlighted")}),hljs.highlightAll())},initShare(){if(window.DShare){let e=$(".cover-image").css("background-image");e=e&&e.substring(5,e.length-2),DShare.create(".dshare",{image:e,imageSelector:".main-content"})}},initClipboard(){window.clipboard||(window.clipboard=new ClipboardJS(".btn-clipboard"),clipboard.on("error",function(e){e.clearSelection(),Qmsg.error("您的浏览器不支持复制")}),clipboard.on("success",function(){Qmsg.success("复制成功")}))},foldImage(){var e;DreamConfig.img_fold_height&&((e=$(".article .gallery-item>[data-fancybox]>img")).parent().addClass("fold"),e.each(function(){const e=$(this).parent();this.complete?this.scrollHeight>=DreamConfig.img_fold_height?e.append('<div class="expand-done"><i class="ri-arrow-up-double-line"></i></div>'):e.removeClass("fold"):this.onload=function(){this.scrollHeight>=DreamConfig.img_fold_height?e.append('<div class="expand-done"><i class="ri-arrow-up-double-line"></i></div>'):e.removeClass("fold")}}))},initEvent(){var e;i||((e=$("body")).on("click","figure>figcaption .ri-arrow-down-s-line",function(){var e=$(this);e.is(".close")?($(e.attr("data-code")).parent().slideDown(200),e.removeClass("close")):($(e.attr("data-code")).parent().slideUp(200),e.addClass("close"))}),e.on("click","figure > pre > .expand-done",function(){Utils.foldBlock($(this).parent().parent())}),e.on("click",".gallery-item .expand-done",function(e){e.stopPropagation(),Utils.foldBlock($(this).parent())}),Utils.initLikeEvent(".admire .agree.like","posts",e=>e.find("span").find("span")),window.onCommentSuccessEvent=(e,i)=>{var t=encrypt("mew-hide-"+i),n=(n=localStorage.getItem(t))?JSON.parse(decrypt(n)):[],e=String(e.postId);n.includes(e)||(n.push(e),$(`.main-content[data-target='${i}'][data-id='${e}'] mew-hide[hide]`).each(function(){$(this).before(decrypt(this.getAttribute("hide"))),$(this).remove(),commonContext.initGallery(),a.initCodeBlock(),a.initLiterature(),a.initHighlighting(),"true"===this.getAttribute("toc")&&commonContext.initTocAndNotice()}),localStorage.setItem(t,encrypt(JSON.stringify(n))))},i=!0)}};window.initKatex=function(){var e=$(".main-content");"undefined"!=typeof katex&&null!==katex&&0!==e.length?(e.find("[math-inline], .math-inline, .katex--inline").each(function(e,i){katex.render(i.innerText,i,{displayMode:!1})}),e.find("[math-display], .math-display, .katex--display").each(function(e,i){katex.render(i.innerText,i,{displayMode:!0})})):console.log("katex is not defined")},window.initMermaid=function(){"undefined"!=typeof mermaid&&null!==mermaid&&(document.body,mermaid.initialize({startOnLoad:!0}),mermaid.run({querySelector:"text-diagram[data-type=mermaid]"}))},window.postPjax=function(i){0!==$(".main-content").length&&Object.keys(a).forEach(e=>window.pjaxSerialNumber===i&&a[e]())};{const t=["initEvent","initCodeBlock","initLiterature","initLike","foldImage"];Object.keys(a).forEach(e=>!window.pjaxSerialNumber&&t.includes(e)&&a[e]()),document.addEventListener("DOMContentLoaded",function(){Object.keys(a).forEach(e=>!window.pjaxSerialNumber&&!t.includes(e)&&a[e]())})}})();

2
templates/common/config.html
View File

@ -154,9 +154,11 @@
if (isNight.toString() === 'true') {
localStorage.setItem('night', 'true');
document.documentElement.classList.add('night');
document.documentElement.setAttribute('night', 'true');
document.documentElement.classList.add('color-scheme-dark');
} else {
document.documentElement.classList.add('color-scheme-light');
document.documentElement.removeAttribute('night');
}
})();
</script>

2
templates/common/widget.html
View File

@ -7,6 +7,4 @@
<th:block th:replace="~{${'/widget/' + sidebar.type} :: widget ( sidebar = ${sidebar})}" />
</th:block>
</th:block>
<div th:if="${position == 'left'}" class="column-right-shadow is-hidden-desktop">
</div>
</aside>

2
theme.yaml
View File

@ -30,7 +30,7 @@ spec:
settingName: theme-dream2-plus-setting
configMapName: theme-dream2-plus-configMap
# 版本号
version: 1.3.9
version: 1.4.0.beta3
# 最低支持的 Halo 版本
require: ">=2.20.0"
# 许可