github
/
halo-theme-hao
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'liuzhihang:main' into main

This commit is contained in:
Nonoas 2024-01-06 11:19:16 +08:00 committed by GitHub
parent b719d710cb 9f31d49c14
commit 12a3e8b57c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 190 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "halo-theme-hao", "name": "halo-theme-hao",
"version": "1.4.5", "version": "1.4.6",
"dependencies": { "dependencies": {
} }
} }

18
settings.yaml
View File

@ -1489,24 +1489,6 @@ spec:
value: true value: true
- label: 禁用 - label: 禁用
value: false value: false
- $formkit: radio
name: qq_edit
help: 启用分享到QQ
value: true
options:
- label: 启用
value: true
- label: 禁用
value: false
- $formkit: radio
name: wechat_edit
help: 启用分享到微信朋友圈
value: true
options:
- label: 启用
value: true
- label: 禁用
value: false
- $formkit: group - $formkit: group
name: copyrights name: copyrights
label: 版权声明 label: 版权声明

19
templates/about.html
View File

@ -42,7 +42,8 @@
</div> </div>
<div class="author-title" th:text="${singlePage.spec.title}"></div> <div class="author-title" th:text="${singlePage.spec.title}"></div>
<th:block th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block> <th:block
th:replace="~{modules/about-widgets :: about-widgets(${theme.config.about.widgetList})}"></th:block>
<div class="author-content"> <div class="author-content">
<div class="create-site-post author-content-item single" th:utext="${theme.config.about.xjlc}"> <div class="create-site-post author-content-item single" th:utext="${theme.config.about.xjlc}">
@ -56,9 +57,10 @@
</div> </div>
<th:block th:if="${theme.config.about.tenyear.tenyear_enable}"> <th:block th:if="${theme.config.about.tenyear.tenyear_enable}">
<link rel="stylesheet" th:href="${assets_link + '/css/tenyear.css' + theme_version}" media="all" onload="this.media='all'"> <link rel="stylesheet" th:href="${assets_link + '/css/tenyear.css' + theme_version}" media="all"
onload="this.media='all'">
<script> (() => { <script> (() => {
const t = document.querySelector(".progress"), const t = document.querySelector(".progress"),
n = document.querySelector(".past-time"), n = document.querySelector(".past-time"),
o = document.querySelector(".percentage-label"), o = document.querySelector(".percentage-label"),
r = document.querySelector(".start-time"), r = document.querySelector(".start-time"),
@ -66,11 +68,12 @@
a = new Date("[(${theme.config.about.tenyear.start_time})]").getTime(), a = new Date("[(${theme.config.about.tenyear.start_time})]").getTime(),
i = new Date("[(${theme.config.about.tenyear.end_time})]").getTime(), i = new Date("[(${theme.config.about.tenyear.end_time})]").getTime(),
c = ((new Date).getTime() - a) / (i - a) * 100, c = ((new Date).getTime() - a) / (i - a) * 100,
u = c <= 100 ? c + "%" : "100%"; u = c <= 100 ? c + "%" : "100%",
n.style.setProperty("--past-time-percentage", c + "%"), t.style.setProperty("--progress-percentage", u), o.textContent = c.toFixed(0) + "%", o.style.left = `calc(${c}% - 33px)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => { m = c <= 100 ? c.toFixed(0) + "%" : "已达标 ";
o.style.visibility = "visible" n.style.setProperty("--past-time-percentage", c + "%"), t.style.setProperty("--progress-percentage", u), o.textContent = m, o.style.left = `calc(${c}% - 3rem)`, r.textContent = "" + new Date(a).toLocaleDateString(), s.textContent = "" + new Date(i).toLocaleDateString(), setTimeout(() => {
}, 2500); o.style.visibility = "visible"
})() }, 2500);
})()
</script> </script>
</th:block> </th:block>

4
templates/assets/js/comment/artalk.js
View File

@ -2,7 +2,7 @@
if (!document.getElementById('post-comment')) return if (!document.getElementById('post-comment')) return
const initArtalk = () => { const initArtalk = () => {
window.artalkItem = new Artalk(Object.assign({ window.artalkItem = Artalk.init(Object.assign({
el: '#artalk-wrap', el: '#artalk-wrap',
server: GLOBAL_CONFIG.source.artalk.artalkUrl, server: GLOBAL_CONFIG.source.artalk.artalkUrl,
site: GLOBAL_CONFIG.source.artalk.siteName, site: GLOBAL_CONFIG.source.artalk.siteName,
@ -12,7 +12,7 @@
}, null)) }, null))
if (GLOBAL_CONFIG.lightbox === 'null') return if (GLOBAL_CONFIG.lightbox === 'null') return
window.artalkItem.use(ctx => { Artalk.use(ctx => {
ctx.on('list-loaded', () => { ctx.on('list-loaded', () => {
ctx.getCommentList().forEach(comment => { ctx.getCommentList().forEach(comment => {
const $content = comment.getRender().$content const $content = comment.getRender().$content

2
templates/assets/js/halo.js
View File

@ -380,7 +380,7 @@ let halo = {
if (values.length === 0) { if (values.length === 0) {
powerStar.href = GLOBAL_CONFIG.source.power.powerLink powerStar.href = GLOBAL_CONFIG.source.power.powerLink
powerStar.innerHTML = ` powerStar.innerHTML = `
<div id="power-star-image" style="background-image: url('https://redirect.cnkj.site:8099/b/2023/6583b34d95d08.webp?type=blog')"> <div id="power-star-image" style="background-image: url('/themes/theme-hao/assets/images/afadian/afadian.webp')">
</div> </div>
<div class="power-star-body"> <div class="power-star-body">
<div id="power-star-title">还没有人赞助～</div> <div id="power-star-title">还没有人赞助～</div>

2
templates/assets/libs/artalk/Artalk.css
View File

File diff suppressed because one or more lines are too long

3
templates/assets/libs/artalk/Artalk.js
View File

File diff suppressed because one or more lines are too long

48
templates/assets/zhheo/rightmenu.js
View File

@ -262,54 +262,6 @@ rm.sharePage = function () {
rm.hideRightMenu(); rm.hideRightMenu();
} }
function isMobileDevice() {
return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
}
rm.shareToQQ = function () {
var url = /*[[${post.status.permalink}]]*/ window.location.href;
var title = $('#post-info .post-title')[0].innerText;
if (isMobileDevice()) {
// 使用手机分享方式
window.location.href = "mqqapi://share/to_fri?src_type=web&version=1&file_type=news&url=" + encodeURIComponent(url) + "&title=" + encodeURIComponent(title) + "&callback_type=scheme&generalpastboard=1";
} else {
// 使用Web分享方式
window.open("https://connect.qq.com/widget/shareqq/index.html?url=" + encodeURIComponent(url) + "&title=" + encodeURIComponent(title));
}
btf.snackbarShow('分享链接地址成功', false, 2000);
rm.hideRightMenu();
}
rm.shareToWechat = function () {
// 手机分享逻辑
if (isMobileDevice) {
wx.config({
// 配置微信的appID、timestamp、nonceStr、signature等参数
// ...
debug: false,
jsApiList: ['onMenuShareTimeline'] // 需要使用的微信接口
});
wx.ready(function () {
wx.onMenuShareTimeline({
title: $('#post-info .post-title')[0].innerText,
link: window.location.href,
imgUrl: $('#coverdiv img')[0].src,
success: function () {
btf.snackbarShow('分享链接地址成功', false, 2000);
rm.hideRightMenu();
},
cancel: function () {
btf.snackbarShow('分享链接地址失败', false, 2000);
rm.hideRightMenu();
}
});
});
}
}
// 复制当前选中文本 // 复制当前选中文本
var selectTextNow = ''; var selectTextNow = '';
document.onmouseup = document.ondbclick = selceText; document.onmouseup = document.ondbclick = selceText;

2
templates/modules/head.html
View File

@ -163,8 +163,6 @@
<!-- 复制 https://githubfast.com/zenorocha/clipboard.js --> <!-- 复制 https://githubfast.com/zenorocha/clipboard.js -->
<script th:src="${assets_link + '/libs/clipboard/clipboard.min.js'}"></script> <script th:src="${assets_link + '/libs/clipboard/clipboard.min.js'}"></script>
<script th:if="${theme.config.post.share_right.wechat_edit}" src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<!-- 关于统计--> <!-- 关于统计-->
<script th:if="${#strings.contains(theme.config.about.widgetList,'statistics-map')}" th:src="${assets_link + '/libs/countup/countup.js'}"></script> <script th:if="${#strings.contains(theme.config.about.widgetList,'statistics-map')}" th:src="${assets_link + '/libs/countup/countup.js'}"></script>

35
templates/modules/post-list.html
View File

@ -1,5 +1,5 @@
<th:block <th:block
th:with='postItems=${posts.items}, th:with='postItems=${posts.items},
postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,"?") ? theme.config.layout.postRandomImg+"&" : theme.config.layout.postRandomImg+"?"}'> postRandomImg=${#strings.contains(theme.config.layout.postRandomImg,"?") ? theme.config.layout.postRandomImg+"&" : theme.config.layout.postRandomImg+"?"}'>
<!-- card，需要添加在没有图片时使用随机图片 --> <!-- card，需要添加在没有图片时使用随机图片 -->
@ -41,14 +41,6 @@
<div class="content" th:text="${post.status.excerpt}"></div> <div class="content" th:text="${post.status.excerpt}"></div>
</div> </div>
<div class="dateshow">
<i class="haofont hao-icon-calendar-alt dateshowicon"></i>
<span class="banner-button-text" th:text="发表于 + '&nbsp;' + ${#dates.format(post.spec.publishTime,'yyyy-MM-dd')}"></span>
&nbsp;&nbsp;
<i class="haofont hao-icon-history dateshowicon"></i>
<span class="banner-button-text" th:text="更新于 + '&nbsp;' + ${#dates.format(post.status.lastModifyTime,'yyyy-MM-dd')}"></span>
</div>
<div class="article-meta-wrap"> <div class="article-meta-wrap">
<!-- tag --> <!-- tag -->
<th:block th:if="${not #lists.isEmpty(post.tags)}"> <th:block th:if="${not #lists.isEmpty(post.tags)}">
@ -85,6 +77,7 @@
</time> </time>
</span> </span>
</div> </div>
</div> </div>
<!-- 文章卡片擦亮效果 --> <!-- 文章卡片擦亮效果 -->
@ -101,33 +94,11 @@
transition: transform 0.5s linear; transition: transform 0.5s linear;
z-index: 1; z-index: 1;
} }
#recent-posts > .recent-post-item:not(a):hover::before { #recent-posts > .recent-post-item:not(a):hover::before {
transform: translateX(100%) skewX(-60deg); transform: translateX(100%) skewX(-60deg);
} }
</style> </style>
<style>
.dateshow {
position: absolute;
bottom: 55px;
transition: 0.3s;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
width: 100%;
left: 0;
padding: 0 32px;
white-space: nowrap;
}
i.haofont.hao-icon-calendar-alt.dateshowicon {
font-size: 20px;
margin-top: 6px;
}
i.haofont.hao-icon-history.dateshowicon {
font-size: 20px;
margin-top: 6px;
}
</style>
</div> </div>
<!-- 分页 --> <!-- 分页 -->

10
templates/modules/post/copyright/copyright-default.html
View File

@ -61,16 +61,6 @@
<div class="share-button" id="post-share-url" onclick="rm.copyPageUrl()" title="复制链接"><i <div class="share-button" id="post-share-url" onclick="rm.copyPageUrl()" title="复制链接"><i
class="haofont hao-icon-link"></i></div> class="haofont hao-icon-link"></i></div>
</div> </div>
<div class="share-link weibo" th:if="${theme.config.post.share_right.qq_edit}">
<div class="share-button" id="post-share-url-qq" onclick="rm.shareToQQ()" title="分享到QQ">
<i class="haofont hao-icon-qq" style="font-size:19px"></i>
</div>
</div>
<div class="share-link weibo" th:if="${theme.config.post.share_right.wechat_edit}">
<div class="share-button" id="post-share-url-wechat" onclick="rm.shareToWechat()" title="分享到微信朋友圈">
<i class="haofont hao-icon-weixin" style="font-size:22px"></i>
</div>
</div>
</div> </div>
<div class="post-tools-right"> <div class="post-tools-right">
<div class="tag_share"> <div class="tag_share">

10
templates/modules/post/copyright/copyright-one.html
View File

@ -67,16 +67,6 @@
<div class="share-button" id="post-share-url" onclick="rm.copyPageUrl()" title="复制链接"><i <div class="share-button" id="post-share-url" onclick="rm.copyPageUrl()" title="复制链接"><i
class="haofont hao-icon-link"></i></div> class="haofont hao-icon-link"></i></div>
</div> </div>
<div class="share-link weibo" th:if="${theme.config.post.share_right.qq_edit}">
<div class="share-button" id="post-share-url-qq" onclick="rm.shareToQQ()" title="分享到QQ">
<i class="haofont hao-icon-qq" style="font-size:19px"></i>
</div>
</div>
<div class="share-link weibo" th:if="${theme.config.post.share_right.wechat_edit}">
<div class="share-button" id="post-share-url-wechat" onclick="rm.shareToWechat()" title="分享到微信朋友圈">
<i class="haofont hao-icon-weixin" style="font-size:22px"></i>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

2
templates/modules/sidebar.html
View File

@ -61,7 +61,7 @@
</th:block> </th:block>
<span class="sidebar-menu-item-title">标签</span> <span class="sidebar-menu-item-title">标签</span>
<div class="card-widget card-tags card-archives card-webinfo card-allinfo" <div class="card-widget card-tags card-archives card-webinfo card-allinfo"
th:with="tags = ${tagFinder.listAll()}"> th:with="tags = ${tagFinder.listAll()}, tagQuantity = ${#conversions.convert(theme.config.sidebar.tagQuantity, 'java.lang.Integer')}">
<div class="item-headline"></div> <div class="item-headline"></div>
<div class="card-tag-cloud"> <div class="card-tag-cloud">
<a class="tag-item" style="font-size:1em" th:each="tag,iterStat : ${tags}" <a class="tag-item" style="font-size:1em" th:each="tag,iterStat : ${tags}"

74
templates/modules/widgets/about-widgets/about-reward.html
View File

@ -1,8 +1,8 @@
<div class="author-content" th:if="${theme.config.aboutReward.aboutRewardEnable}"> <div class="author-content" th:if="${theme.config.aboutReward.aboutRewardEnable}">
<div class="author-content-item single reward" id="about-reward"> <div class="author-content-item single reward" id="about-reward">
<div class="author-content-item-tips">致谢</div> <div class="author-content-item-tips">致谢</div>
<span class="author-content-item-title" >[[${theme.config.aboutReward.title}]]</span> <span class="author-content-item-title">[[${theme.config.aboutReward.title}]]</span>
<div class="author-content-item-description" > <div class="author-content-item-description">
[[${theme.config.aboutReward.content}]] [[${theme.config.aboutReward.content}]]
</div> </div>
@ -14,39 +14,44 @@
<div id="TA">[[${theme.config.aboutReward.reward.name}]]</div> <div id="TA">[[${theme.config.aboutReward.reward.name}]]</div>
</div> </div>
</div> </div>
<div id="tube-con"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg"> <div id="tube-con">
<path d="M1 77H234.226L307.006 24H790" stroke="#e5e9ef" stroke-width="20"></path> <svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 140H233.035L329.72 71H1028" stroke="#e5e9ef" stroke-width="20"></path> <path d="M1 77H234.226L307.006 24H790" stroke="#e5e9ef" stroke-width="20"></path>
<path d="M1 255H234.226L307.006 307H790" stroke="#e5e9ef" stroke-width="20"></path> <path d="M0 140H233.035L329.72 71H1028" stroke="#e5e9ef" stroke-width="20"></path>
<path d="M0 305H233.035L329.72 375H1028" stroke="#e5e9ef" stroke-width="20"></path> <path d="M1 255H234.226L307.006 307H790" stroke="#e5e9ef" stroke-width="20"></path>
<rect y="186" width="236" height="24" fill="#e5e9ef"></rect> <path d="M0 305H233.035L329.72 375H1028" stroke="#e5e9ef" stroke-width="20"></path>
<ellipse cx="790" cy="25.5" rx="25" ry="25.5" fill="#e5e9ef"></ellipse> <rect y="186" width="236" height="24" fill="#e5e9ef"></rect>
<circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle> <ellipse cx="790" cy="25.5" rx="25" ry="25.5" fill="#e5e9ef"></ellipse>
<ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#e5e9ef"></ellipse>
<circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
</svg>
<div id="mask"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 77H234.226L307.006 24H790" stroke="#f25d8e" stroke-width="20"></path>
<path d="M0 140H233.035L329.72 71H1028" stroke="#f25d8e" stroke-width="20"></path>
<path d="M1 255H234.226L307.006 307H790" stroke="#f25d8e" stroke-width="20"></path>
<path d="M0 305H233.035L329.72 375H1028" stroke="#f25d8e" stroke-width="20"></path>
<rect y="186" width="236" height="24" fill="#f25d8e"></rect>
<ellipse cx="790" cy="25.5" rx="25" ry="25.5" fill="#f25d8e"></ellipse>
<circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle> <circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle>
<ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#f25d8e"></ellipse> <ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#e5e9ef"></ellipse>
<circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle> <circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
</svg></div> </svg>
<div id="orange-mask"><svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg"> <div id="mask">
<path d="M1 77H234.226L307.006 24H790" stroke="#ffd52b" stroke-width="20"></path> <svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 140H233.035L329.72 71H1028" stroke="#ffd52b" stroke-width="20"></path> <path d="M1 77H234.226L307.006 24H790" stroke="#f25d8e" stroke-width="20"></path>
<path d="M1 255H234.226L307.006 307H790" stroke="#ffd52b" stroke-width="20"></path> <path d="M0 140H233.035L329.72 71H1028" stroke="#f25d8e" stroke-width="20"></path>
<path d="M0 305H233.035L329.72 375H1028" stroke="#ffd52b" stroke-width="20"></path> <path d="M1 255H234.226L307.006 307H790" stroke="#f25d8e" stroke-width="20"></path>
<rect y="186" width="236" height="24" fill="#ffd52b"></rect> <path d="M0 305H233.035L329.72 375H1028" stroke="#f25d8e" stroke-width="20"></path>
<ellipse cx="790" cy="25.5" rx="25" ry="25.5" fill="#ffd52b"></ellipse> <rect y="186" width="236" height="24" fill="#f25d8e"></rect>
<circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle> <ellipse cx="790" cy="25.5" rx="25" ry="25.5" fill="#f25d8e"></ellipse>
<ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#ffd52b"></ellipse> <circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle>
<circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle> <ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#f25d8e"></ellipse>
</svg></div> <circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
</svg>
</div>
<div id="orange-mask">
<svg viewBox="0 0 1028 385" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 77H234.226L307.006 24H790" stroke="#ffd52b" stroke-width="20"></path>
<path d="M0 140H233.035L329.72 71H1028" stroke="#ffd52b" stroke-width="20"></path>
<path d="M1 255H234.226L307.006 307H790" stroke="#ffd52b" stroke-width="20"></path>
<path d="M0 305H233.035L329.72 375H1028" stroke="#ffd52b" stroke-width="20"></path>
<rect y="186" width="236" height="24" fill="#ffd52b"></rect>
<ellipse cx="790" cy="25.5" rx="25" ry="25.5" fill="#ffd52b"></ellipse>
<circle r="14" transform="matrix(1 0 0 -1 790 25)" fill="white"></circle>
<ellipse cx="790" cy="307.5" rx="25" ry="25.5" fill="#ffd52b"></ellipse>
<circle r="14" transform="matrix(1 0 0 -1 790 308)" fill="white"></circle>
</svg>
</div>
<p id="people">共<b>[[${theme.config.aboutReward.reward_list.size()}]]</b>人</p> <p id="people">共<b>[[${theme.config.aboutReward.reward_list.size()}]]</b>人</p>
</div> </div>
</div> </div>
@ -57,7 +62,8 @@
<div class="reward-list-item-name">[[${authorReward.name}]]</div> <div class="reward-list-item-name">[[${authorReward.name}]]</div>
<div class="reward-list-bottom-group"> <div class="reward-list-bottom-group">
<div th:if="${authorReward.sign == 'N'}" class="reward-list-item-money">¥ <div th:if="${authorReward.sign == 'N'}" class="reward-list-item-money">¥
[[${authorReward.amount}]]</div> [[${authorReward.amount}]]
</div>
<div th:if="${authorReward.sign == 'Y'}" class="reward-list-item-money" <div th:if="${authorReward.sign == 'Y'}" class="reward-list-item-money"
style="background: var(--heo-vip);">¥ [[${authorReward.amount}]] style="background: var(--heo-vip);">¥ [[${authorReward.amount}]]
</div> </div>

167
templates/modules/widgets/about-widgets/statistics-map.html
View File

@ -1,16 +1,20 @@
<!-- 数据统计&作者相关信息 --> <!-- 数据统计&作者相关信息 -->
<div class="author-content" > <div class="author-content">
<div class="about-statistic author-content-item" <div class="about-statistic author-content-item"
style="background: url(https://bu.dusays.com/2023/03/12/640dc8c72f623.webp);"> style="background: url(https://bu.dusays.com/2023/03/12/640dc8c72f623.webp);">
<div class="card-content"> <div class="card-content">
<div class="author-content-item-tips">数据</div> <div class="author-content-item-tips">数据</div>
<span class="author-content-item-title">访问统计</span> <span class="author-content-item-title">访问统计</span>
<div id="statistic"></div> <div id="statistic"></div>
<div class="post-tips">统计信息来自 <a href="https://invite.51.la/1NzKqTeb?target=V6" rel="noopener nofollow" <div class="post-tips">统计信息来自 <a href="https://invite.51.la/1NzKqTeb?target=V6"
rel="noopener nofollow"
target="_blank">51la网站统计</a></div> target="_blank">51la网站统计</a></div>
<div class="banner-button-group"><a class="banner-button" onclick="pjax.loadUrl('/archives')" <div class="banner-button-group">
data-pjax-state=""><i class="haofont hao-icon-circle-arrow-up-right-1"></i><span <a class="banner-button" onclick="pjax.loadUrl('/archives')" data-pjax-state="">
class="banner-button-text">文章隧道</span></a></div> <i class="haofont hao-icon-circle-arrow-up-right-1"></i>
<span class="banner-button-text">文章隧道</span>
</a>
</div>
</div> </div>
</div> </div>
@ -18,25 +22,32 @@
<div class="author-content-item-group column mapAndInfo"> <div class="author-content-item-group column mapAndInfo">
<div class="author-content-item map single"> <div class="author-content-item map single">
<span class="map-title">我现在住在 <span class="map-title">我现在住在
<b>[[${theme.config.about.map.StrengthenTitle}]]</b></span> <b>[[${theme.config.about.map.StrengthenTitle}]]</b>
</span>
</div> </div>
<div class="author-content-item selfInfo single" <div class="author-content-item selfInfo single"
th:if="${not #lists.isEmpty(theme.config.about.map.authorInfo)}" th:if="${not #lists.isEmpty(theme.config.about.map.authorInfo)}"
th:with="texts = ${theme.config.about.map.authorInfo}"> th:with="texts = ${theme.config.about.map.authorInfo}">
<div th:if="${theme.config.about.map.authorInfo.size()}>'0'"><span class="selfInfo-title" <div th:if="${theme.config.about.map.authorInfo.size()}>'0'">
th:text="${texts[0].authorInfoTitle}">生于</span><span class="selfInfo-content" <span class="selfInfo-title"
id="selfInfo-content-year" th:style="'color:' + ${texts[0].authorInfoColor}" th:text="${texts[0].authorInfoTitle}">生于</span><span
th:text="${texts[0].authorInfoContent}">2000</span> class="selfInfo-content"
id="selfInfo-content-year" th:style="'color:' + ${texts[0].authorInfoColor}"
th:text="${texts[0].authorInfoContent}">2000</span>
</div> </div>
<div th:if="${theme.config.about.map.authorInfo.size()}>'1'"><span class="selfInfo-title" <div th:if="${theme.config.about.map.authorInfo.size()}>'1'">
th:text="${texts[1].authorInfoTitle}">太原理工大学</span><span class="selfInfo-content" <span class="selfInfo-title"
th:style="'color:' + ${texts[1].authorInfoColor}" th:text="${texts[1].authorInfoTitle}">太原理工大学</span><span
th:text="${texts[1].authorInfoContent}">计算机科学</span> class="selfInfo-content"
th:style="'color:' + ${texts[1].authorInfoColor}"
th:text="${texts[1].authorInfoContent}">计算机科学</span>
</div> </div>
<div th:if="${theme.config.about.map.authorInfo.size()}>'2'"><span class="selfInfo-title" <div th:if="${theme.config.about.map.authorInfo.size()}>'2'">
th:text="${texts[2].authorInfoTitle}">现在职业</span><span class="selfInfo-content" <span class="selfInfo-title"
th:style="'color:' + ${texts[2].authorInfoColor}" th:text="${texts[2].authorInfoTitle}">现在职业</span><span
th:text="${texts[2].authorInfoContent}">BI工程师</span> class="selfInfo-content"
th:style="'color:' + ${texts[2].authorInfoColor}"
th:text="${texts[2].authorInfoContent}">BI工程师</span>
</div> </div>
</div> </div>
</div> </div>
@ -57,6 +68,7 @@
background: url([[${theme.config.about.map.backgroundDark}]]) no-repeat center; background: url([[${theme.config.about.map.backgroundDark}]]) no-repeat center;
background-size: 100%; background-size: 100%;
} }
.author-content-item.map:hover { .author-content-item.map:hover {
background-size: 120%; background-size: 120%;
transition: 4s ease-in-out; transition: 4s ease-in-out;
@ -75,10 +87,12 @@
-webkit-backdrop-filter: blur(20px); -webkit-backdrop-filter: blur(20px);
transition: 1s ease-in-out; transition: 1s ease-in-out;
font-size: 20px; font-size: 20px;
border-radius: 0 0 1rem 1rem;
} }
.author-content-item.map:hover .map-title { .author-content-item.map:hover .map-title {
bottom: -100%; bottom: -100%;
border-radius: 0 0 1rem 1rem;
} }
.author-content-item.map .map-title b { .author-content-item.map .map-title b {
@ -100,70 +114,73 @@
// 链接替换即可，不需要后面的参数 // 链接替换即可，不需要后面的参数
function initAboutPage() { function initAboutPage() {
fetch("https://v6-widget.51.la/v6/[[${theme.config.about.LingQueMonitorID}]]/quote.js") fetch("https://v6-widget.51.la/v6/[[${theme.config.about.LingQueMonitorID}]]/quote.js")
.then(res => res.text()) .then(res => res.text())
.then(data => { .then(data => {
let title = ["最近活跃", "今日人数", "今日访问", "昨日人数", "昨日访问", "本月访问", "总访问量"]; let title = ["最近活跃", "今日人数", "今日访问", "昨日人数", "昨日访问", "本月访问", "总访问量"];
// let num = data.match(/(?<=<\/span><span>).*?(?=<\/span><\/p>)/g) // let num = data.match(/(?<=<\/span><span>).*?(?=<\/span><\/p>)/g)
let num = data.match(/(<\/span><span>).*?(\/span><\/p>)/g); let num = data.match(/(<\/span><span>).*?(\/span><\/p>)/g);
num = num.map(el => { num = num.map(el => {
let val = el.replace(/(<\/span><span>)/g, ""); let val = el.replace(/(<\/span><span>)/g, "");
let str = val.replace(/(<\/span><\/p>)/g, ""); let str = val.replace(/(<\/span><\/p>)/g, "");
return str; return str;
});
let statisticEl = document.getElementById("statistic");
// 自定义不显示哪个或者显示哪个，如下为不显示 最近活跃访客 和 总访问量
let statistic = [];
for (let i = 0; i < num.length; i++) {
if (!statisticEl) return;
if (i == 0) continue;
statisticEl.innerHTML +=
"<div><span>" + title[i] + "</span><span id=" + title[i] + ">" + num[i] + "</span></div>";
queueMicrotask(() => {
statistic.push(
new CountUp(title[i], 0, num[i], 0, 2, {
useEasing: true,
useGrouping: true,
separator: ",",
decimal: ".",
prefix: "",
suffix: "",
})
);
}); });
}
let statisticElement = document.querySelector(".about-statistic.author-content-item"); let statisticEl = document.getElementById("statistic");
function statisticUP() {
if (!statisticElement) return;
const callback = (entries, observer) => { // 自定义不显示哪个或者显示哪个，如下为不显示 最近活跃访客 和 总访问量
entries.forEach(entry => { let statistic = [];
if (entry.isIntersecting) { for (let i = 0; i < num.length; i++) {
for (let i = 0; i < num.length; i++) { if (!statisticEl) return;
if (i == 0) continue; if (i == 0) continue;
queueMicrotask(() => { statisticEl.innerHTML +=
statistic[i - 1].start(); "<div><span>" + title[i] + "</span><span id=" + title[i] + ">" + num[i] + "</span></div>";
}); queueMicrotask(() => {
} statistic.push(
observer.disconnect(); // 停止观察元素，因为不再需要触发此回调 new CountUp(title[i], 0, num[i], 0, 2, {
} useEasing: true,
useGrouping: true,
separator: ",",
decimal: ".",
prefix: "",
suffix: "",
})
);
}); });
}; }
const options = { let statisticElement = document.querySelector(".about-statistic.author-content-item");
root: null,
rootMargin: "0px", function statisticUP() {
threshold: 0 if (!statisticElement) return;
};
const observer = new IntersectionObserver(callback, options); const callback = (entries, observer) => {
observer.observe(statisticElement); entries.forEach(entry => {
} if (entry.isIntersecting) {
statisticUP() for (let i = 0; i < num.length; i++) {
}); if (i == 0) continue;
queueMicrotask(() => {
statistic[i - 1].start();
});
}
observer.disconnect(); // 停止观察元素，因为不再需要触发此回调
}
});
};
const options = {
root: null,
rootMargin: "0px",
threshold: 0
};
const observer = new IntersectionObserver(callback, options);
observer.observe(statisticElement);
}
statisticUP()
});
} }
initAboutPage(); initAboutPage();
</script> </script>

2
theme.yaml
View File

@ -51,5 +51,5 @@ spec:
repo: https://githubfast.com/liuzhihang/halo-theme-hao repo: https://githubfast.com/liuzhihang/halo-theme-hao
settingName: "theme-hao-setting" settingName: "theme-hao-setting"
configMapName: "theme-hao-configMap" configMapName: "theme-hao-configMap"
version: "1.4.5" version: "1.4.7-beta1"
require: ">=2.10.0" require: ">=2.10.0"