diff --git a/package.json b/package.json index 0daf97b0..981dc261 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "halo-theme-hao", - "version": "1.4.5", + "version": "1.4.6", "dependencies": { } } diff --git a/settings.yaml b/settings.yaml index 66a6e360..7fb3407b 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1489,24 +1489,6 @@ spec: value: true - label: 禁用 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 name: copyrights label: 版权声明 diff --git a/templates/about.html b/templates/about.html index 7e74c163..df1baa62 100644 --- a/templates/about.html +++ b/templates/about.html @@ -9,19 +9,19 @@ _type = 'website')}"> - +
- +
- +
- - + +
- - - + + +
- - - - + + + +
- + - + - - + +
- +
diff --git a/templates/modules/post/copyright/copyright-one.html b/templates/modules/post/copyright/copyright-one.html index 50496b36..799e288f 100644 --- a/templates/modules/post/copyright/copyright-one.html +++ b/templates/modules/post/copyright/copyright-one.html @@ -67,16 +67,6 @@
- -
diff --git a/templates/modules/sidebar.html b/templates/modules/sidebar.html index ef9b4bb4..dc88a4cc 100644 --- a/templates/modules/sidebar.html +++ b/templates/modules/sidebar.html @@ -61,7 +61,7 @@ 标签
+ th:with="tags = ${tagFinder.listAll()}, tagQuantity = ${#conversions.convert(theme.config.sidebar.tagQuantity, 'java.lang.Integer')}">
致谢
- [[${theme.config.aboutReward.title}]] -
+ [[${theme.config.aboutReward.title}]] +
[[${theme.config.aboutReward.content}]]
- +
@@ -14,57 +14,63 @@
[[${theme.config.aboutReward.reward.name}]]
-
- - - - - - - - - - -
- - - - - - +
+ + + + + + + - + -
-
- - - - - - - - - -
+ +
+ + + + + + + + + + + +
+
+ + + + + + + + + + + +

共[[${theme.config.aboutReward.reward_list.size()}]]人

- +
[[${authorReward.name}]]
¥ - [[${authorReward.amount}]]
+ [[${authorReward.amount}]] +
¥ [[${authorReward.amount}]]
- +
-
\ No newline at end of file +
diff --git a/templates/modules/widgets/about-widgets/statistics-map.html b/templates/modules/widgets/about-widgets/statistics-map.html index e7bec0f0..1b9d1558 100644 --- a/templates/modules/widgets/about-widgets/statistics-map.html +++ b/templates/modules/widgets/about-widgets/statistics-map.html @@ -1,42 +1,53 @@ -
+
数据
访问统计
-
统计信息来自 统计信息来自 51la网站统计
- +
- - + +
我现在住在 - [[${theme.config.about.map.StrengthenTitle}]] + [[${theme.config.about.map.StrengthenTitle}]] +
-
生于2000 +
+ 生于2000
-
太原理工大学计算机科学 +
+ 太原理工大学计算机科学
-
现在职业BI工程师 +
+ 现在职业BI工程师
@@ -52,18 +63,19 @@ background-size: 100%; transition: 1s ease-in-out; } - + [data-theme=dark] .author-content-item.map { background: url([[${theme.config.about.map.backgroundDark}]]) no-repeat center; background-size: 100%; } + .author-content-item.map:hover { background-size: 120%; transition: 4s ease-in-out; background-position-x: 0; background-position-y: 36%; } - + .author-content-item.map .map-title { position: absolute; bottom: 0px; @@ -75,21 +87,23 @@ -webkit-backdrop-filter: blur(20px); transition: 1s ease-in-out; font-size: 20px; + border-radius: 0 0 1rem 1rem; } - + .author-content-item.map:hover .map-title { bottom: -100%; + border-radius: 0 0 1rem 1rem; } - + .author-content-item.map .map-title b { color: var(--heo-fontcolor); } - + @media screen and (max-width: 768px) { .author-content-item.map.myphoto { background-size: cover !important; } - + .author-content-item.map .map-title { padding: 1rem; } @@ -100,71 +114,74 @@ // 链接替换即可，不需要后面的参数 function initAboutPage() { fetch("https://v6-widget.51.la/v6/[[${theme.config.about.LingQueMonitorID}]]/quote.js") - .then(res => res.text()) - .then(data => { - let title = ["最近活跃", "今日人数", "今日访问", "昨日人数", "昨日访问", "本月访问", "总访问量"]; - // let num = data.match(/(?<=<\/span>).*?(?=<\/span><\/p>)/g) - let num = data.match(/(<\/span>).*?(\/span><\/p>)/g); - - num = num.map(el => { - let val = el.replace(/(<\/span>)/g, ""); - let str = val.replace(/(<\/span><\/p>)/g, ""); - 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 += - "
" + title[i] + "" + num[i] + "
"; - queueMicrotask(() => { - statistic.push( - new CountUp(title[i], 0, num[i], 0, 2, { - useEasing: true, - useGrouping: true, - separator: ",", - decimal: ".", - prefix: "", - suffix: "", - }) - ); + .then(res => res.text()) + .then(data => { + let title = ["最近活跃", "今日人数", "今日访问", "昨日人数", "昨日访问", "本月访问", "总访问量"]; + // let num = data.match(/(?<=<\/span>).*?(?=<\/span><\/p>)/g) + let num = data.match(/(<\/span>).*?(\/span><\/p>)/g); + + num = num.map(el => { + let val = el.replace(/(<\/span>)/g, ""); + let str = val.replace(/(<\/span><\/p>)/g, ""); + return str; }); - } - - let statisticElement = document.querySelector(".about-statistic.author-content-item"); - function statisticUP() { - if (!statisticElement) return; - - const callback = (entries, observer) => { - entries.forEach(entry => { - if (entry.isIntersecting) { - for (let i = 0; i < num.length; i++) { - if (i == 0) continue; - queueMicrotask(() => { - statistic[i - 1].start(); - }); - } - observer.disconnect(); // 停止观察元素，因为不再需要触发此回调 - } + + let statisticEl = document.getElementById("statistic"); + + // 自定义不显示哪个或者显示哪个，如下为不显示 最近活跃访客 和 总访问量 + let statistic = []; + for (let i = 0; i < num.length; i++) { + if (!statisticEl) return; + if (i == 0) continue; + statisticEl.innerHTML += + "
" + title[i] + "" + num[i] + "
"; + queueMicrotask(() => { + statistic.push( + new CountUp(title[i], 0, num[i], 0, 2, { + useEasing: true, + useGrouping: true, + separator: ",", + decimal: ".", + prefix: "", + suffix: "", + }) + ); }); - }; - - const options = { - root: null, - rootMargin: "0px", - threshold: 0 - }; - const observer = new IntersectionObserver(callback, options); - observer.observe(statisticElement); - } - statisticUP() - }); + } + + let statisticElement = document.querySelector(".about-statistic.author-content-item"); + + function statisticUP() { + if (!statisticElement) return; + + const callback = (entries, observer) => { + entries.forEach(entry => { + if (entry.isIntersecting) { + 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(); - +
diff --git a/theme.yaml b/theme.yaml index 1f91b77a..d16f3c06 100644 --- a/theme.yaml +++ b/theme.yaml @@ -51,5 +51,5 @@ spec: repo: https://githubfast.com/liuzhihang/halo-theme-hao settingName: "theme-hao-setting" configMapName: "theme-hao-configMap" - version: "1.4.5" + version: "1.4.7-beta1" require: ">=2.10.0"