From aa31cbbb55579a8a25fa7c25bfad65e809513f70 Mon Sep 17 00:00:00 2001 From: lvshuncai Date: Thu, 16 Sep 2021 01:07:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B4=E8=AF=B4=E6=A0=B7=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=B9=B6=E6=94=AF=E6=8C=81=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E5=85=A8=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/export/css/common.css | 17 +++++++++++++++++ src/export/js/messages.js | 38 +++++++++++++++++++++---------------- src/html/options.html | 10 +++++++++- src/js/config.js | 1 + src/js/modules/messages.js | 6 ++++-- src/js/options.js | 2 ++ src/templates/messages.html | 20 ++++--------------- 7 files changed, 59 insertions(+), 35 deletions(-) diff --git a/src/export/css/common.css b/src/export/css/common.css index 6086a5a..375147d 100644 --- a/src/export/css/common.css +++ b/src/export/css/common.css @@ -979,4 +979,21 @@ pre { .message-infos>.list-group-item{ padding: .25rem 1.25rem; +} + +/* 有全文时，限制高度 */ +.messageText pre.hasMore { + height: 13rem !important; + overflow: hidden; +} + +/* 查看全文时，不限制高度 */ +.messageText pre.more { + height: auto !important; +} + +/* 查看全文图标样式 */ +.readMore { + display: block; + text-align: center; } \ No newline at end of file diff --git a/src/export/js/messages.js b/src/export/js/messages.js index 7dfeace..cde5820 100644 --- a/src/export/js/messages.js +++ b/src/export/js/messages.js @@ -13,15 +13,9 @@ const ITEM_TPL = `
<%/* 说说内容 */%> <%/* 说说全文 */%> + 
<%:=API.Common.formatContent(message, "HTML", false, false)%>
<%if(message.has_more_con){%> -
- 查看全文 -
- <%:=API.Common.formatContent(message, "HTML", false, false)%> -
-
- <%}else{%> - 
<%:=API.Common.formatContent(message, "HTML", false, false)%>
+ <%}%> <%/* 语音内容 */%> <%if(message.custom_voices){%> @@ -36,15 +30,9 @@ const ITEM_TPL = ` <%:=API.Common.formatContent(message.rt_uinname)%>： <%/* 转发全文 */%> + 
<%:=API.Common.formatContent(message, "HTML", true, false)%>
<%if(message.rt_has_more_con && message.rt_con){%> -
- 查看全文 -
- <%:=API.Common.formatContent(message, "HTML", true, false)%> -
-
- <%}else{%> - 
<%:=API.Common.formatContent(message, "HTML", true, false)%>
+ <%}%> <%}%> <%/* 多媒体内容 */%> @@ -281,4 +269,22 @@ $(function () { API.Common.showVisitorsWin(this, messages); }); + // 查看全文 + $(".readMore").unbind("click").click(function(e) { + const text = $(this).attr('title'); + if (text == "展开全文") { + $(this).attr('title',"收起全文"); + $(this).removeClass("fa-angle-down"); + $(this).addClass("fa-angle-up"); + $(this).prev().addClass("more"); + } + if (text == "收起全文") { + $(this).attr('title',"展开全文"); + $(this).removeClass("fa-angle-up"); + $(this).addClass("fa-angle-down"); + $(this).prev().removeClass("more"); + } + return; + }); + }); \ No newline at end of file diff --git a/src/html/options.html b/src/html/options.html index 74325c4..ca1081e 100644 --- a/src/html/options.html +++ b/src/html/options.html @@ -130,7 +130,15 @@
- 默认不获取全文，勾选获取全文，适用长说说 + 默认获取全文，取消勾选不获取全文 + +
+
展开全文：
+
+ + +
+ 默认不自动展开全文，勾选将自动展开全文
屏蔽开关：
diff --git a/src/js/config.js b/src/js/config.js index 579cbaf..7383cc5 100644 --- a/src/js/config.js +++ b/src/js/config.js @@ -34,6 +34,7 @@ const Default_Config = { max: 2 }, isFull: true, //是否获取全文 + isShowMore: false, //是否展开全文 Comments: { isFull: true, //是否全部评论 pageSize: 20, diff --git a/src/js/modules/messages.js b/src/js/modules/messages.js index dd8dbfc..2ac2314 100644 --- a/src/js/modules/messages.js +++ b/src/js/modules/messages.js @@ -362,7 +362,8 @@ API.Messages.exportToHtml = async(messages) => { _messageMaps.set(year, monthMaps); let params = { messageMaps: _messageMaps, - total: yearItems.length + total: yearItems.length, + config: QZone_Config } let yearFile = await API.Common.writeHtmlofTpl('messages', params, QZone.Messages.ROOT + "/" + year + ".html"); console.info('生成说说年份HTML文件结束', year, yearItems, yearFile); @@ -372,7 +373,8 @@ API.Messages.exportToHtml = async(messages) => { // 基于模板生成汇总说说HTML let params = { messageMaps: API.Utils.groupedByTime(messages, "custom_create_time", 'all'), - total: messages.length + total: messages.length, + config: QZone_Config } let allFile = await API.Common.writeHtmlofTpl('messages', params, QZone.Messages.ROOT + "/index.html"); console.info('生成说说汇总HTML文件结束', allFile, messages); diff --git a/src/js/options.js b/src/js/options.js index b918d32..779ced0 100644 --- a/src/js/options.js +++ b/src/js/options.js @@ -326,6 +326,7 @@ $("#messages_list_cost_max").val(options.Messages.randomSeconds.max); $("#messages_list_limit").val(options.Messages.pageSize); $("#messages_full").prop("checked", options.Messages.isFull); + $("#messages_full_show").prop("checked", options.Messages.isShowMore); $("#message_is_filter").prop("checked", options.Messages.isFilterKeyword).change(); $("#filterKeywords").val(options.Messages.FilterKeyWords.join('\n')); // 评论列表 @@ -522,6 +523,7 @@ QZone_Config.Messages.randomSeconds.max = $("#messages_list_cost_max").val() * 1; QZone_Config.Messages.pageSize = $("#messages_list_limit").val() * 1; QZone_Config.Messages.isFull = $("#messages_full").prop("checked"); + QZone_Config.Messages.isShowMore = $("#messages_full_show").prop("checked"); QZone_Config.Messages.isFilterKeyword = $("#message_is_filter").prop("checked"); QZone_Config.Messages.FilterKeyWords = $("#filterKeywords").val().split('\n'); // 评论列表 diff --git a/src/templates/messages.html b/src/templates/messages.html index 6473f0b..4407052 100644 --- a/src/templates/messages.html +++ b/src/templates/messages.html @@ -63,15 +63,9 @@
<%/* 说说内容 */%> <%/* 说说全文 */%> + 
<%:=API.Common.formatContent(message, "HTML", false, false)%>
<%if(message.has_more_con){%> -
- 查看全文 -
- <%:=API.Common.formatContent(message, "HTML", false, false)%> -
-
- <%}else{%> - 
<%:=API.Common.formatContent(message, "HTML", false, false)%>
+ <%}%> <%/* 语音内容 */%> <%if(message.custom_voices){%> @@ -86,15 +80,9 @@ <%:=API.Common.formatContent(message.rt_uinname)%>： <%/* 转发全文 */%> + 
<%:=API.Common.formatContent(message, "HTML", true, false)%>
<%if(message.rt_has_more_con && message.rt_con){%> -
- 查看全文 -
- <%:=API.Common.formatContent(message, "HTML", true, false)%> -
-
- <%}else{%> - 
<%:=API.Common.formatContent(message, "HTML", true, false)%>
+ <%}%> <%}%> <%/* 多媒体内容 */%>