From 478dfd1594c5eb56eac54efc353e6f996ed2e4e4 Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Mon, 7 Aug 2023 00:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=B3=E9=97=AD=E5=8F=B3?=
=?UTF-8?q?=E9=94=AE=E8=8F=9C=E5=8D=95=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
settings.yaml | 8 ++----
templates/assets/js/heo.js | 16 ++++++++---
templates/assets/zhheo/blogex.js | 36 +++++++++++++++++++++---
templates/equipment.html | 2 +-
templates/modules/head.html | 1 +
templates/modules/widgets/nav-right.html | 2 +-
templates/moments.html | 2 +-
7 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/settings.yaml b/settings.yaml
index b2391ca3..93579b69 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -544,6 +544,7 @@ spec:
label: 个人卡片
value:
profileStyle: default
+ helloText: 🤖️ 数码科技爱好者, 🔍 分享与热心帮助, 🏠 智能家居小能手, 🔨 设计开发一条龙, 🤝 专修交互与设计, 🏃 脚踏实地行动派, 🧱 团队小组发动机, 💢 壮汉人狠话不多
children:
- $formkit: select
name: profileStyle
@@ -570,7 +571,6 @@ spec:
name: helloText
label: 作者打招呼
placeholder: 请填写作者打招呼
- value: 🤖️ 数码科技爱好者, 🔍 分享与热心帮助, 🏠 智能家居小能手, 🔨 设计开发一条龙, 🤝 专修交互与设计, 🏃 脚踏实地行动派, 🧱 团队小组发动机, 💢 壮汉人狠话不多
help: 注意格式 （🤖️ 数码科技爱好者, 🔍 分享与热心帮助 ） 以逗号隔开
- $formkit: text
name: profileName
@@ -1047,14 +1047,13 @@ spec:
name: footer_group
label: 页脚友链
value:
- enable_footer_group:
- num:
+ enable_footer_group: true
+ num: 3
children:
- $formkit: radio
name: enable_footer_group
id: enable_footer_group
key: enable_footer_group
- value: true
options:
- label: 启用
value: true
@@ -1064,7 +1063,6 @@ spec:
if: $get(enable_footer_group).value
name: num
label: 友链数
- value: 3
validation: required
- $formkit: group
name: footerContent
diff --git a/templates/assets/js/heo.js b/templates/assets/js/heo.js
index 4d4feb7f..fae6aced 100644
--- a/templates/assets/js/heo.js
+++ b/templates/assets/js/heo.js
@@ -294,7 +294,9 @@ var heo = {
btf.snackbarShow("✨ 已开启评论弹幕", false, 2000)
}
}
- rm.hideRightMenu();
+ if(GLOBAL_CONFIG.rightMenuEnable){
+ rm.hideRightMenu();
+ }
},
//隐藏cookie窗口
@@ -372,20 +374,26 @@ var heo = {
let msgPause = '暂停音乐';
if (heo_musicPlaying) {
navMusicEl.classList.remove("playing");
- document.getElementById("menu-music-toggle").innerHTML = msgPlay;
+ if(GLOBAL_CONFIG.rightMenuEnable){
+ document.getElementById("menu-music-toggle").innerHTML = msgPlay;
+ }
document.getElementById("nav-music-hoverTips").innerHTML = "音乐已暂停";
document.querySelector("#consoleMusic").classList.remove("on");
heo_musicPlaying = false;
navMusicEl.classList.remove("stretch");
} else {
navMusicEl.classList.add("playing");
- document.getElementById("menu-music-toggle").innerHTML = msgPause;
+ if(GLOBAL_CONFIG.rightMenuEnable){
+ document.getElementById("menu-music-toggle").innerHTML = msgPause;
+ }
document.querySelector("#consoleMusic").classList.add("on");
heo_musicPlaying = true;
navMusicEl.classList.add("stretch");
}
if (changePaly) document.querySelector("#nav-music meting-js").aplayer.toggle();
- rm.hideRightMenu();
+ if(GLOBAL_CONFIG.rightMenuEnable){
+ rm.hideRightMenu();
+ }
},
// 音乐绑定事件
diff --git a/templates/assets/zhheo/blogex.js b/templates/assets/zhheo/blogex.js
index 54f625ce..03e81784 100644
--- a/templates/assets/zhheo/blogex.js
+++ b/templates/assets/zhheo/blogex.js
@@ -324,6 +324,30 @@ var navFn = {
}
}
+//引用到评论
+function rightMenuCommentText(txt) {
+ if (GLOBAL_CONFIG.rightMenuEnable) {
+ rm.hideRightMenu();
+ }
+ var input = document.getElementsByClassName('el-textarea__inner')[0];
+ let evt = document.createEvent('HTMLEvents');
+ evt.initEvent('input', true, true);
+ let inputValue = replaceAll(txt, '\n', '\n> ')
+ input.value = '> ' + inputValue + '\n\n';
+ input.dispatchEvent(evt);
+ var domTop = document.querySelector("#post-comment").offsetTop;
+ window.scrollTo(0, domTop - 80);
+ input.focus();
+ input.setSelectionRange(-1, -1);
+ if (document.getElementById("comment-tips")) {
+ document.getElementById("comment-tips").classList.add("show");
+ }
+}
+//替换所有内容
+function replaceAll(string, search, replace) {
+ return string.split(search).join(replace);
+}
+
// 移除赞赏蒙版
function RemoveRewardMask() {
if (!document.querySelector(".reward-main")) return;
@@ -347,10 +371,14 @@ document.addEventListener('touchstart', e => {
//监听ctrl+C
$(document).unbind('keydown').bind('keydown', function (e) {
- if ((e.ctrlKey || e.metaKey) && (e.keyCode == 67) && (selectTextNow != '')) {
- btf.snackbarShow('复制成功，复制和转载请标注本文地址');
- rm.rightmenuCopyText(selectTextNow);
- return false;
+ if (GLOBAL_CONFIG.rightMenuEnable) {
+ if ((e.ctrlKey || e.metaKey) && (e.keyCode == 67) && (selectTextNow != '')) {
+ btf.snackbarShow('复制成功，复制和转载请标注本文地址');
+ rm.rightmenuCopyText(selectTextNow);
+ return false;
+ }
+ } else {
+
}
})
diff --git a/templates/equipment.html b/templates/equipment.html
index f0312370..112fa2ed 100644
--- a/templates/equipment.html
+++ b/templates/equipment.html
@@ -46,7 +46,7 @@
[[${equipment.button}]]
diff --git a/templates/modules/head.html b/templates/modules/head.html
index 64080d88..503ff10a 100644
--- a/templates/modules/head.html
+++ b/templates/modules/head.html
@@ -209,6 +209,7 @@
helloText: [[${#strings.listSplit(theme.config.sidebar.profile.helloText, ',')}]],
assetsLink: [[${assets_link}]],
profileStyle: [[${theme.config.sidebar.profile.profileStyle}]],
+ rightMenuEnable: [[${theme.config.tool.rightMenu.rightMenuEnable}]],
source: {
links: {
linksUrl: [[${ theme.config.link.linksUrl }]],
diff --git a/templates/modules/widgets/nav-right.html b/templates/modules/widgets/nav-right.html
index 29c3974e..1fde2e9c 100644
--- a/templates/modules/widgets/nav-right.html
+++ b/templates/modules/widgets/nav-right.html
@@ -22,7 +22,7 @@