From b338ccd3c3d646f85215518e4b16b45c1ca697fb Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <1152958806@qq.com> Date: Wed, 27 Dec 2023 21:19:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B8=A9=E9=A6=A8=E6=8F=90=E7=A4=BA,=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 28 ++++++++++++++++++++++++++++ templates/post.html | 11 ++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/settings.yaml b/settings.yaml index 4ebaf1bd..d79d4e63 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1249,6 +1249,34 @@ spec: label: 你的博客地址 help: 注意保留最后的斜杠 value: https://xx.xx/ + - $formkit: group + name: passage_tips + label: 温馨提示 + value: + enable: false + content: 文章内容可能已经过时。 + day: 7 + children: + - $formkit: radio + name: enable + id: enable + options: + - label: 启用 + value: true + - label: 禁用 + value: false + - $formkit: number + if: "$get(enable).value" + name: day + label: 更新时间大于天数显示 + validation: required + - $formkit: code + if: "$get(enable).value" + name: content + height: 100px + label: 温馨提示文案 + help: "自定义温馨提示的文案，支持html语法" + language: html - $formkit: select name: copyrightsStyle id: copyrightsStyle diff --git a/templates/post.html b/templates/post.html index 8e929a7e..a3c40ca5 100644 --- a/templates/post.html +++ b/templates/post.html @@ -165,7 +165,16 @@ -
+
+ +
+

+ +

+
+ +
From 14f19fc7cae5b087d05ad402d1ccd92e38cdc820 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <1152958806@qq.com> Date: Wed, 27 Dec 2023 21:39:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E2=80=9C=E5=B7=A6=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E2=80=9D=E5=92=8C=E2=80=9C=E4=B8=BB=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E2=80=9D=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 36 ++++++++++++++++++++++++- templates/modules/sidebar.html | 4 +-- templates/modules/widgets/nav-left.html | 2 +- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/settings.yaml b/settings.yaml index d79d4e63..53f6acf2 100644 --- a/settings.yaml +++ b/settings.yaml @@ -39,9 +39,43 @@ spec: - group: nav label: 导航 formSchema: + - $formkit: group + name: menus + label: 菜单控制 + value: + pc_leftMenu: true + phone_leftMenu: true + phone_menu: true + children: + - $formkit: radio + name: pc_leftMenu + id: pc_leftMenu + label: pc端左侧菜单 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + name: phone_leftMenu + label: 移动左侧菜单 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false + - $formkit: radio + name: phone_menu + label: 移动主菜单 + options: + - label: 显示 + value: true + - label: 隐藏 + value: false - $formkit: menuRadio name: leftMenu - label: 站点名左侧 + if: $get(pc_leftMenu).value + label: 站点名左侧菜单 help: 默认只有主菜单，可前往【外观】—>【菜单】新建菜单组 value: "" - $formkit: group diff --git a/templates/modules/sidebar.html b/templates/modules/sidebar.html index 327bae69..b52cb2b2 100644 --- a/templates/modules/sidebar.html +++ b/templates/modules/sidebar.html @@ -10,7 +10,7 @@ 显示模式 -
@@ -36,7 +36,7 @@
-
diff --git a/templates/modules/widgets/nav-left.html b/templates/modules/widgets/nav-left.html index 63b6733d..a8cbd1da 100644 --- a/templates/modules/widgets/nav-left.html +++ b/templates/modules/widgets/nav-left.html @@ -1,7 +1,7 @@
-
Date: Wed, 27 Dec 2023 21:59:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E6=95=88=E6=9E=9C=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 9 +++++++++ templates/modules/variables/layout.html | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/settings.yaml b/settings.yaml index 53f6acf2..5f89488c 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1202,6 +1202,15 @@ spec: - label: 关闭 value: false help: 文章主色匹配图片颜色 + - $formkit: radio + name: opacity + label: 目录模糊效果 + value: true + options: + - label: 打开 + value: true + - label: 关闭 + value: false - $formkit: group name: aiDescription label: 文章 AI 摘要 diff --git a/templates/modules/variables/layout.html b/templates/modules/variables/layout.html index 09f7220c..3a19a316 100644 --- a/templates/modules/variables/layout.html +++ b/templates/modules/variables/layout.html @@ -32,4 +32,10 @@ [data-theme=light] { --halo-search-widget-color-result-item-title : #4B5563 } + [# th:if="${!theme.config.post.opacity}"] + #aside-content #card-toc .toc-content a.toc-link:not(.active) { + opacity: 1; + filter: blur(0px); + } + [/] \ No newline at end of file From 77d1b82feb5208f0d76402d9b7b0db4631569fc0 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <1152958806@qq.com> Date: Wed, 27 Dec 2023 22:36:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=88=B0QQ=EF=BC=8C=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=88=B0=E5=BE=AE=E4=BF=A1=E6=9C=8B=E5=8F=8B=E5=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 36 +++++++------- templates/assets/zhheo/rightmenu.js | 48 +++++++++++++++++++ templates/modules/head.html | 2 + .../post/copyright/copyright-default.html | 10 ++++ .../modules/post/copyright/copyright-one.html | 10 ++++ 5 files changed, 88 insertions(+), 18 deletions(-) diff --git a/settings.yaml b/settings.yaml index 5f89488c..14c25a8e 100644 --- a/settings.yaml +++ b/settings.yaml @@ -1393,24 +1393,24 @@ 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: 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/assets/zhheo/rightmenu.js b/templates/assets/zhheo/rightmenu.js index f4f16ad8..f1c31d53 100644 --- a/templates/assets/zhheo/rightmenu.js +++ b/templates/assets/zhheo/rightmenu.js @@ -262,6 +262,54 @@ rm.sharePage = function () { 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 = ''; document.onmouseup = document.ondbclick = selceText; diff --git a/templates/modules/head.html b/templates/modules/head.html index 8a1c5909..f03a0a80 100644 --- a/templates/modules/head.html +++ b/templates/modules/head.html @@ -163,6 +163,8 @@ + + diff --git a/templates/modules/post/copyright/copyright-default.html b/templates/modules/post/copyright/copyright-default.html index de1f7441..274ca90b 100644 --- a/templates/modules/post/copyright/copyright-default.html +++ b/templates/modules/post/copyright/copyright-default.html @@ -61,6 +61,16 @@
+ +
diff --git a/templates/modules/post/copyright/copyright-one.html b/templates/modules/post/copyright/copyright-one.html index 799e288f..50496b36 100644 --- a/templates/modules/post/copyright/copyright-one.html +++ b/templates/modules/post/copyright/copyright-one.html @@ -67,6 +67,16 @@
+ +
From a244ecec8296cc8ceb8daaaf266d2b8cbe29c8d6 Mon Sep 17 00:00:00 2001 From: "1152958806@qq.com" <1152958806@qq.com> Date: Wed, 27 Dec 2023 22:50:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=A0=8F=E5=9C=A8=E5=B7=A6=E4=BE=A7=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/assets/zhheo/zhheoblog.css | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css index 0ea2ee3a..8f45ad5f 100644 --- a/templates/assets/zhheo/zhheoblog.css +++ b/templates/assets/zhheo/zhheoblog.css @@ -7679,20 +7679,22 @@ div#power-star-title { width: 100%; } -/* 侧边栏在左侧时，显示 100% */ -.layout.left-aside > div:first-child { - -webkit-box-ordinal-group: 2; - -moz-box-ordinal-group: 2; - -o-box-ordinal-group: 2; - -ms-flex-order: 2; - -webkit-order: 2; - order: 2; -} +@media screen and (min-width: 1200px) { + /* 侧边栏在左侧时，显示 100% */ + .layout.left-aside > div:first-child { + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + -o-box-ordinal-group: 2; + -ms-flex-order: 2; + -webkit-order: 2; + order: 2; + } -/* 侧栏在左侧时，关闭左边距，打开右边距 */ -.layout.left-aside .aside-content { - padding-right: 15px; - padding-left: 0px !important; + /* 侧栏在左侧时，关闭左边距，打开右边距 */ + .layout.left-aside .aside-content { + padding-right: 15px; + padding-left: 0px !important; + } } /* 主页分类 */