diff --git a/README.md b/README.md
index 79b813e..cfc0fcf 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@
 
 ## 使用说明
 1. 进行助手的安装，参考[在线安装](#在线安装)或[离线安装](#离线安装)进行助手安装
-2. 助手安装完成后，可进行助手的配置，可参考[配置说明](https://lvshuncai.com/qzone-export.html#配置说明)
+2. 助手安装完成后，可进行助手的配置，可参考[配置说明](https://lvshuncai.com/archives/qzone-export.html#配置说明)
 3. 助手配置完成后，先登录自己的[QQ空间](https://i.qq.com/)
 4. 进入需要备份的QQ空间，如若备份自己的[QQ空间](https://i.qq.com/)，可跳过
 5. 刷新QQ空间使助手配置生效，如若是保存配置后再打开的QQ空间页面，可跳过
@@ -74,18 +74,18 @@
    [![7TIqG8.png](https://s4.ax1x.com/2022/01/24/7TIqG8.png)](https://imgtu.com/i/7TIqG8)
 8. 助手将开始收集QQ空间的数据，请耐心等待数据收集完成
    [![75eUC8.png](https://s4.ax1x.com/2022/01/23/75eUC8.png)](https://imgtu.com/i/75eUC8)
-9.  采集完成后，助手自动添加[多媒体文件](https://lvshuncai.com/qzone-export.html#多媒体文件)的下载任务到[文件下载工具](https://lvshuncai.com/qzone-export.html#文件下载工具)
+9.  采集完成后，助手自动添加[多媒体文件](https://lvshuncai.com/archives/qzone-export.html#多媒体文件)的下载任务到[文件下载工具](https://lvshuncai.com/archives/qzone-export.html#文件下载工具)
    [![75mZrj.png](https://s4.ax1x.com/2022/01/23/75mZrj.png)](https://imgtu.com/i/75mZrj)
 10. 下载任务添加完成后，备份界面下方将出现【打包下载】按钮
    [![75mbes.png](https://s4.ax1x.com/2022/01/23/75mbes.png)](https://imgtu.com/i/75mbes)
-11. 点击【打包下载】按钮时，助手自动打包[文案内容](https://lvshuncai.com/qzone-export.html#文案内容)到ZIP包中并下载ZIP包
+11. 点击【打包下载】按钮时，助手自动打包[文案内容](https://lvshuncai.com/archives/qzone-export.html#文案内容)到ZIP包中并下载ZIP包
    [![75nAFx.png](https://s4.ax1x.com/2022/01/23/75nAFx.png)](https://imgtu.com/i/75nAFx)
-12. ZIP包下载完成后，点击【查看备份】按钮查看ZIP包，或自行打开[文案内容下载文件夹](https://lvshuncai.com/qzone-export.html#文案内容下载文件夹)查看[备份压缩包](https://lvshuncai.com/qzone-export.html#备份压缩包)
+12. ZIP包下载完成后，点击【查看备份】按钮查看ZIP包，或自行打开[文案内容下载文件夹](https://lvshuncai.com/archives/qzone-export.html#文案内容下载文件夹)查看[备份压缩包](https://lvshuncai.com/archives/qzone-export.html#备份压缩包)
    [![75neSO.png](https://s4.ax1x.com/2022/01/23/75neSO.png)](https://imgtu.com/i/75neSO)
-13. 再进行[文案内容备份文件夹](https://lvshuncai.com/qzone-export.html#文案内容备份文件夹)与[多媒体文件备份文件夹](https://lvshuncai.com/qzone-export.html#多媒体文件备份文件夹)进行合并，详情参考：[备份文件夹合并](https://lvshuncai.com/qzone-export.html#备份文件夹合并)
-14. 合并完成后，根据备份类型的不同，自行[查看备份内容](https://lvshuncai.com/qzone-export.html#查看备份内容)
+13. 再进行[文案内容备份文件夹](https://lvshuncai.com/archives/qzone-export.html#文案内容备份文件夹)与[多媒体文件备份文件夹](https://lvshuncai.com/archives/qzone-export.html#多媒体文件备份文件夹)进行合并，详情参考：[备份文件夹合并](https://lvshuncai.com/archives/qzone-export.html#备份文件夹合并)
+14. 合并完成后，根据备份类型的不同，自行[查看备份内容](https://lvshuncai.com/archives/qzone-export.html#查看备份内容)
    [![7T4kxH.png](https://s4.ax1x.com/2022/01/24/7T4kxH.png)](https://imgtu.com/i/7T4kxH)
-15. [点击这里查看更多说明](https://lvshuncai.com/qzone-export.html#使用说明)
+15. [点击这里查看更多说明](https://lvshuncai.com/archives/qzone-export.html#使用说明)
 
 ## 常见问题    
 是否会导致QQ空间账号被冻结
@@ -108,14 +108,14 @@
 - 官方版保证安全，第三方修改版除外。
 - 更多详情请访问[隐私政策](https://github.com/ShunCai/QZoneExport/wiki/Privacy-Policy)
 
-> 更多问题请访问：[常见问题](https://lvshuncai.com/qzone-export.html#常见问题)
+> 更多问题请访问：[常见问题](https://lvshuncai.com/archives/qzone-export.html#常见问题)
 
 ## 配置说明
 1. 浏览器插件栏右键助手图标，选择【选项】菜单后，将进入助手配置页   
 [![75Fc4g.png](https://s4.ax1x.com/2022/01/23/75Fc4g.png)](https://imgtu.com/i/75Fc4g)
 3. 【注意事项】：助手更新配置后，需要点击下方配置页的保存按钮
 4. 【注意事项】：保存后，需要刷新QQ空间页面才能使最新的配置在备份页面生效。
-5. 更多配置说明请访问：[配置说明](https://lvshuncai.com/qzone-export.html#配置说明)
+5. 更多配置说明请访问：[配置说明](https://lvshuncai.com/archives/qzone-export.html#配置说明)
 
 
 ## 预览
diff --git a/src/css/content.css b/src/css/content.css
index c083078..b505f6e 100644
--- a/src/css/content.css
+++ b/src/css/content.css
@@ -1,11 +1,24 @@
 .blocker {
-    z-index:9999;
+    z-index: 9999;
 }
 
-#progressModal{
+#progressModal {
     color: #333;
 }
 
 #progressModal a {
     color: rgb(0, 123, 255) !important;
+}
+
+#progressModal p {
+    font-size: medium;
+}
+
+#progressModal details {
+    font-size: medium;
+    display: none;
+}
+
+#progressModal details>p {
+    margin-left: 14px;
 }
\ No newline at end of file
diff --git a/src/export/css/common.css b/src/export/css/common.css
index f0db7b0..14afeca 100644
--- a/src/export/css/common.css
+++ b/src/export/css/common.css
@@ -30,23 +30,7 @@ body::-webkit-scrollbar-track-piece {
 
 body {
     min-height: 900px;
-    font: normal 16px sans-serif;
-}
-
-@media screen and (max-width: 820px) {
-    body {
-        min-height: 1100px;
-    }
-}
-
-@media screen and (max-width: 640px) {
-    body {
-        min-height: 1100px;
-    }
-}
-
-.BlogAnchor {
-    top: 56px !important;
+    font: normal 100% sans-serif;
 }
 
 .markdown-body {
@@ -95,9 +79,12 @@ body {
     border-radius: 15px;
 }
 
+
+/* 首页背景 */
+
 .export-tips {
     margin-top: 30px;
-    height: 400px;
+    height: 50vh;
     filter: saturate(0.5);
     background-image: url(../images/index.jpg);
     background-size: 100%;
@@ -106,19 +93,8 @@ body {
     border-radius: 20px;
 }
 
-@media screen and (max-width: 820px) {
-    .export-tips {
-        background-size: 100% 100%;
-        height: 232px;
-    }
-}
 
-@media screen and (max-width: 640px) {
-    .export-tips {
-        background-size: 100% 100%;
-        height: 232px;
-    }
-}
+/* 首页描述 */
 
 .export-tips h5 {
     position: fixed;
@@ -127,20 +103,20 @@ body {
     color: white;
 }
 
+
+/* 首页模块导航 */
+
 .data-info {
     margin-top: 30px;
 }
 
 
-/* 通用样式 */
-
-
 /* 头像 */
 
 .avatar {
     display: block;
-    width: 50px;
-    height: 50px;
+    width: 40px;
+    height: 40px;
     float: left;
     margin: .2em 0 0;
 }
@@ -161,6 +137,9 @@ body {
     line-height: inherit;
 }
 
+
+/* 日志分类 */
+
 #blogs-types {
     max-height: 90%;
     overflow: auto;
@@ -171,40 +150,6 @@ body {
     z-index: 1030;
 }
 
-@media screen and (max-width: 820px) {
-    #blogs-types {
-        display: none;
-    }
-}
-
-@media screen and (max-width: 640px) {
-    #blogs-types {
-        display: none;
-    }
-}
-
-#blogs-type-list {
-    left: 18%;
-}
-
-@media screen and (max-width: 820px) {
-    #blogs-type-list {
-        left: 0;
-        flex: 0 0 auto;
-        width: auto;
-        max-width: 100%;
-    }
-}
-
-@media screen and (max-width: 640px) {
-    #blogs-type-list {
-        left: 0;
-        flex: 0 0 auto;
-        width: auto;
-        max-width: 100%;
-    }
-}
-
 
 /* 日志样式 */
 
@@ -271,10 +216,6 @@ body {
     overflow: hidden;
 }
 
-.medias-item:nth-last-child(1):first-child {
-    flex: 0 0 40%;
-}
-
 .content a {
     cursor: pointer;
 }
@@ -336,73 +277,6 @@ body {
     border-radius: 4px
 }
 
-.BlogAnchor {
-    width: 210px !important
-}
-
-@media screen and (max-width: 1620px) {
-    #write {
-        margin: 40px 40px 40px 250px;
-        padding: 20px 40px;
-    }
-    .BlogAnchor {
-        width: 210px !important
-    }
-}
-
-@media screen and (max-width: 1370px) {
-    #write {
-        margin: 30px 30px 30px 230px;
-        padding: 20px 40px;
-    }
-    .BlogAnchor {
-        width: 200px !important
-    }
-}
-
-@media screen and (max-width: 1220px) {
-    #write {
-        margin: 20px 20px 20px 220px;
-        padding: 20px 40px;
-    }
-}
-
-@media screen and (max-width: 820px) {
-    #write {
-        margin: 20px 20px 20px 200px;
-        padding: 20px 20px;
-        font-size: 15px;
-        line-height: 170%
-    }
-    .BlogAnchor {
-        width: 180px !important
-    }
-    .html_header span::before {
-        margin-left: 0
-    }
-    .html_header span::after {
-        font-size: 15px;
-    }
-}
-
-@media screen and (max-width: 640px) {
-    #write {
-        margin: 10px;
-        padding: 16px;
-        font-size: 14px;
-        line-height: 160%
-    }
-    .BlogAnchor {
-        display: none;
-    }
-    h2 {
-        font-size: 28px;
-    }
-    h3 {
-        font-size: 22px;
-    }
-}
-
 
 /*scroll_style*/
 
@@ -451,13 +325,12 @@ body {
 
 .BlogAnchor {
     background: #fff;
-    /* padding: 10px 0; */
     line-height: 180%;
     position: fixed;
     height: 100%;
-    width: 200px;
+    width: 210px;
     left: 0;
-    top: 0;
+    top: 56px;
     border-right: 1px solid #E6ECF1;
 }
 
@@ -512,11 +385,13 @@ body {
     font-weight: bold;
 }
 
+
 /* 左侧导航徽章数 */
+
 .BlogAnchor li .nav_item .itemSize {
     text-indent: 0px;
     float: right;
-    margin-top: 6px;
+    margin-top: 7px;
 }
 
 #AnchorContentToggle {
@@ -592,11 +467,13 @@ body {
     background-color: transparent !important;
 }
 
+
+/* 相册、相片下方统计信息 */
+
 .pic-num-wrap {
     position: absolute;
-    top: 10.4vw;
     left: 0;
-    bottom: 0px;
+    top: 200px;
     width: 100%;
     height: 50px;
     text-align: right;
@@ -621,7 +498,6 @@ body {
     display: flex;
     justify-content: center;
     align-items: center;
-    height: 13vw;
     cursor: pointer;
     overflow-x: hidden;
     text-align: center;
@@ -641,7 +517,7 @@ body {
 
 .comment-img {
     height: 100px !important;
-    width: 100px!important;
+    width: 100px !important;
     cursor: pointer;
     text-decoration: none;
 }
@@ -913,7 +789,7 @@ pre {
 }
 
 .visitor-list {
-    margin-top: .5rem!important;
+    margin-top: .5rem !important;
 }
 
 .visitor-list .list-group-item {
@@ -935,41 +811,58 @@ pre {
     width: 110px;
 }
 
-@media screen and (max-width: 820px) {
-    .index-list-group .list-group-item {
-        display: flex!important;
-        justify-content: space-between!important;
-        align-items: center!important;
-    }
+
+/* 相册相片列表赞、评论、浏览按钮样式 */
+
+
+/* 点赞 */
+
+#albums_html .thumbnail .viewlikes,
+.photos .thumbnail .viewlikes,
+.videos .thumbnail .viewlikes {
+    font-size: 18px;
+    line-height: 1.5;
 }
 
-@media screen and (max-width: 640px) {
-    .index-list-group .list-group-item {
-        display: flex!important;
-        justify-content: space-between!important;
-        align-items: center!important;
-    }
+
+/* 评论 */
+
+#albums_html .thumbnail .viewcomments,
+.photos .thumbnail .viewcomments,
+.videos .thumbnail .viewcomments {
+    font-size: 18px;
+    line-height: 1.5;
 }
 
 
-/* 相册相片列表赞、评论、浏览按钮样式 */
+/* 最近浏览 */
 
-.photos .thumbnail .viewlikes {
-    position: absolute;
-    top: 25px;
-    left: 10px;
-    font-size: 20px;
+#albums_html .thumbnail .viewVisitors,
+.photos .thumbnail .viewVisitors,
+.videos .thumbnail .viewVisitors {
+    font-size: 18px;
+    line-height: 1.5;
 }
 
-.photos .thumbnail .viewcomments {
+
+/* 相册相片数量 */
+
+.album-photo-total {
     position: absolute;
-    top: 25px;
-    left: 50px;
-    font-size: 20px;
+    right: 0;
+    font-size: larger;
+    background-color: #28a745cc;
 }
 
 
-/* 说说图片左右上下居中 */
+/* 九宫格-图片左右上下居中 */
+
+
+/* 九宫格单图样式 */
+
+.medias-item:nth-last-child(1):first-child {
+    flex: 0 0 35%;
+}
 
 .message-lightbox {
     display: flex;
@@ -987,42 +880,43 @@ pre {
     object-fit: cover;
 }
 
+
+/* 九宫格双列样式 */
+
 .two {
-    /* max-width: 600px; */
-    max-width: 30vw;
+    max-width: 550px;
     overflow: hidden;
 }
 
 .two .message-lightbox {
-    /* width: 279px;
-    height: 279px; */
-    width: 12vw;
-    height: 12vw;
+    width: 250px;
+    height: 250px;
     overflow: hidden;
 }
 
 .two .message-lightbox-external {
-    /* width: 279px;
-    height: 279px; */
-    width: 12vw;
-    height: 12vw;
+    width: 250px;
+    height: 250px;
     overflow: hidden;
 }
 
+
+/* 九宫格三列样式 */
+
 .three {
-    max-width: 40vw;
+    max-width: 500px;
     overflow: hidden;
 }
 
 .three .message-lightbox {
-    width: 12vw;
-    height: 12vw;
+    width: 150px;
+    height: 150px;
     overflow: hidden;
 }
 
 .three .message-lightbox-external {
-    width: 12vw;
-    height: 12vw9vw;
+    width: 150px;
+    height: 150px;
     overflow: hidden;
 }
 
@@ -1054,21 +948,36 @@ pre {
 }
 
 
-/* 画廊相册自定义样式 */
+/* 评论人头像 */
+
+.comment .avatar {
+    width: 40px;
+    height: 40px;
+}
 
 
 /* 相册右侧评论样式 */
 
+.lg-comment-body {
+    padding-left: 10px;
+}
+
+
+/* 相册画廊左侧图片展示区 */
+
 .lg-outer.lg-comment-active {
     width: auto;
-    right: 20%;
+    right: 25%;
     left: 10px;
 }
 
+
+/* 相册画廊右侧评论展示区 */
+
 .lg-outer.lg-comment-active .lg-comment-box {
     left: auto;
     top: 0;
-    width: 20%;
+    width: 25%;
     bottom: 0;
     position: fixed;
     right: 0;
@@ -1080,7 +989,7 @@ pre {
 }
 
 .lg-comment-toggle.lg-icon.has-comments {
-    color: #007bff!important;
+    color: #007bff !important;
 }
 
 .lg-comment-box {
@@ -1101,20 +1010,20 @@ pre {
 
 .lg-comment-box .comments.border-top {
     border-top: none !important;
-    border-bottom: 1px solid #dee2e6!important;
+    border-bottom: 1px solid #dee2e6 !important;
 }
 
 
 /* 画廊相册视频预览图不拉伸 */
 
 .lg-outer .lg-video-cont .lg-object {
-    width: auto!important;
-    height: 100%!important;
+    width: auto !important;
+    height: 100% !important;
 }
 
 .lg-outer .lg-object.lg-video-poster {
-    width: auto!important;
-    height: 100%!important;
+    width: auto !important;
+    height: 100% !important;
 }
 
 
@@ -1129,24 +1038,9 @@ pre {
     position: relative;
 }
 
-@media (min-width: 1200px) {
-    .messages {
-        max-width: 60vw;
-    }
-}
-
 
 /* 相册样式 */
 
-#albums_html .card-img {
-    width: inherit;
-    height: 13vw;
-}
-
-#albums_html .thumbnail {
-    width: 13vw;
-}
-
 #albums_html .thumbnail a {
     display: flex;
     justify-content: center;
@@ -1158,184 +1052,495 @@ pre {
 }
 
 
-/* 相册赞、评论、浏览按钮样式 */
-
-#albums_html .thumbnail .viewlikes {
-    position: absolute;
-    top: 25px;
-    left: 10px;
-    font-size: 17px;
-}
+/* 好友列表样式 */
 
-#albums_html .thumbnail .viewcomments {
-    position: absolute;
-    top: 25px;
-    left: 50px;
-    font-size: 17px;
+#friends-table img {
+    width: 50px;
+    height: 50px;
+    max-width: 50px;
+    max-height: 50px;
+    border-radius: 50px;
 }
 
-#albums_html .thumbnail .viewVisitors {
-    position: absolute;
-    top: 25px;
-    left: 95px;
-    font-size: 17px;
+#friends-list img {
+    width: 50px;
+    height: 50px;
+    border-radius: 50px;
 }
 
-@media screen and (max-width: 1990px) {
-    .albums .pic-num-wrap {
-        top: 10.4vw;
-    }
+#friends-list .list-group-item {
+    border-radius: 15px;
 }
 
-@media screen and (max-width: 1680px) {
-    .albums .pic-num-wrap {
-        top: 10vw;
-    }
+#friends-list .fa {
+    line-height: inherit;
 }
 
-@media screen and (max-width: 1600px) {
-    .albums .pic-num-wrap {
-        top: 9.9vw;
-    }
+#friends-types {
+    max-height: 90%;
+    overflow: auto;
+    position: fixed;
+    top: 60px;
+    right: 0;
+    left: 0;
+    z-index: 1030;
 }
 
-@media screen and (max-width: 1440px) {
-    #albums_html {
-        max-width: 65vw;
-    }
-    .albums .pic-num-wrap {
-        top: 9.5vw;
-    }
-}
 
-@media screen and (max-width: 1400px) {
-    .albums .pic-num-wrap {
-        top: 9.5vw;
-    }
-}
+/* 好友列表左边距 */
 
-@media screen and (max-width: 1366px) {
-    .albums .pic-num-wrap {
-        top: 9.4vw;
-    }
+#friends-type-list {
+    left: 25%;
 }
 
-@media screen and (max-width: 1280px) {
-    #albums_html {
-        max-width: 65vw;
-    }
-    .albums .pic-num-wrap {
-        top: 9.1vw;
-    }
-}
 
-@media screen and (max-width: 1152px) {
-    .albums .pic-num-wrap {
-        top: 8.8vw;
-    }
-}
+/* 好友图标下边距 */
 
-@media screen and (max-width: 1024px) {
-    .albums .pic-num-wrap {
-        top: 8vw;
-    }
-}
-
-@media screen and (max-width: 800px) {
-    #albums_html {
-        max-width: 55vw;
-    }
-    .albums .pic-num-wrap {
-        top: 6.7vw;
-    }
+#friends-type-list .list-inline {
+    margin-bottom: 0.3rem;
 }
 
 
-/* 留言板样式 */
+/* 评论人内容 */
 
-@media (min-width: 1200px) {
-    #boards_html {
-        max-width: 60vw;
-    }
+.comment-text {
+    margin-left: 45px;
 }
 
 
-/* 收藏夹样式 */
+/* 语音 */
 
-@media (min-width: 1200px) {
-    #favorites_html {
-        max-width: 60vw;
-    }
+audio {
+    max-width: 80%;
 }
 
 
-/* 好友列表样式 */
+/* 留言引用 */
 
-#friends-table img {
-    width: 50px;
-    height: 50px;
-    border-radius: 50px;
+#boards_html .comment_quote {
+    padding: 5px;
+    margin-top: 8px;
+    margin-bottom: 8px;
+    background-color: #f5f5f5;
 }
 
-#friends-list img {
-    width: 50px;
-    height: 50px;
-    border-radius: 50px;
-}
 
-#friends-list .list-group-item {
-    border-radius: 15px;
-}
+/* 相册、相片、视频名称、描述 */
 
-#friends-list img {
-    max-width: 10vw;
-    max-height: 225px;
+.card-body {
+    padding: 1.25rem 0.5rem !important;
 }
 
-#friends-list .fa {
-    line-height: inherit;
-}
 
-#friends-types {
-    max-height: 90%;
-    overflow: auto;
-    position: fixed;
-    top: 60px;
-    right: 0;
-    left: 0;
-    z-index: 1030;
+/* 引用块，比如转发的说说、分享的来源 */
+
+blockquote.source {
+    border-left: 0.35rem solid #dee2e6 !important;
+    padding-left: 0.75rem;
 }
 
-@media screen and (max-width: 820px) {
+@media (max-width: 576px) {
+    /* 首页 */
+    .export-tips {
+        background-size: 100% 100%;
+        height: 232px;
+    }
+    /* 头像 */
+    .avatar {
+        width: 35px;
+        height: 35px;
+    }
+    /* 评论人头像 */
+    .comment-avatar>.avatar {
+        width: 35px;
+        height: 35px;
+    }
+    /* 左侧导航 */
+    #BlogAnchor {
+        display: none !important;
+    }
+    /* 日志分类 */
+    #blogs-types {
+        display: none;
+    }
+    /* 日志列表 */
+    #blogs-type-list {
+        left: 0;
+        flex: 0 0 auto;
+        width: 100%;
+        max-width: 100%;
+    }
+    /* 好友分组 */
     #friends-types {
         display: none;
     }
+    /* 好友列表 */
+    #friends-type-list {
+        left: 0;
+        flex: 0 0 auto;
+        width: 100%;
+        max-width: 100%;
+    }
+    /* 相册列表 */
+    #albums_html .card-img {
+        width: inherit;
+        height: 250px;
+    }
+    #albums_html .thumbnail {
+        width: 100%;
+    }
+    /* 相片列表 */
+    .photos .card-img {
+        width: inherit;
+        height: 250px;
+    }
+    .photos .thumbnail {
+        width: 100%;
+    }
+    .photos .lightbox {
+        height: 250px;
+    }
+    /* 视频列表 */
+    .videos .lightbox {
+        height: 250px;
+    }
+    /* 九宫格单图样式 */
+    .medias-item:nth-last-child(1):first-child {
+        flex: 0 0 90%;
+    }
+    /* 九宫格两列布局 */
+    .two {
+        max-width: 350px;
+        overflow: hidden;
+    }
+    /* 九宫格两列布局 */
+    .two .message-lightbox {
+        width: 150px !important;
+        height: 150px !important;
+        overflow: hidden;
+    }
+    .two .message-lightbox-external {
+        width: 150px !important;
+        height: 150px !important;
+        overflow: hidden;
+    }
+    /* 九宫格三列布局 */
+    .three {
+        max-width: 350px;
+        overflow: hidden;
+    }
+    /* 九宫格两列布局 */
+    .three .message-lightbox {
+        width: 100px !important;
+        height: 100px !important;
+        overflow: hidden;
+    }
+    .three .message-lightbox-external {
+        width: 100px !important;
+        height: 100px !important;
+        overflow: hidden;
+    }
+    /* 相册画廊左侧图片展示区 */
+    .lg-outer.lg-comment-active {
+        right: 0 !important;
+    }
+    /* 相册画廊右侧评论展示区 */
+    .lg-outer.lg-comment-active .lg-comment-box {
+        width: 100% !important;
+    }
 }
 
-@media screen and (max-width: 640px) {
+@media (min-width: 576px) {
+    /* 头像 */
+    .avatar {
+        width: 35px;
+        height: 35px;
+    }
+    /* 评论人头像 */
+    .comment-avatar>.avatar {
+        width: 35px;
+        height: 35px;
+    }
+    /* 左侧导航 */
+    #BlogAnchor {
+        display: none !important;
+    }
+    /* 日志分类 */
+    #blogs-types {
+        display: none;
+    }
+    /* 日志列表 */
+    #blogs-type-list {
+        left: 0;
+        flex: 0 0 auto;
+        width: 100%;
+        max-width: 100%;
+    }
+    /* 好友分组 */
     #friends-types {
         display: none;
     }
-}
-
-#friends-type-list {
-    left: 25%;
-}
-
-@media screen and (max-width: 820px) {
+    /* 好友列表 */
     #friends-type-list {
         left: 0;
         flex: 0 0 auto;
-        width: auto;
+        width: 100%;
         max-width: 100%;
     }
+    /* 相册列表 */
+    #albums_html .card-img {
+        width: inherit;
+        height: 250px;
+    }
+    #albums_html .thumbnail {
+        width: 100%;
+    }
+    /* 相片列表 */
+    .photos .card-img {
+        width: inherit;
+        height: 250px;
+    }
+    .photos .thumbnail {
+        width: 100%;
+    }
+    .photos .lightbox {
+        height: 250px;
+    }
+    /* 视频列表 */
+    .videos .card-img {
+        width: inherit;
+        height: 250px;
+    }
+    .videos .thumbnail {
+        width: 250px;
+    }
+    .videos .lightbox {
+        height: 250px;
+    }
+    /* 九宫格两列布局 */
+    .two {
+        max-width: 350px;
+        overflow: hidden;
+    }
+    /* 九宫格两列布局 */
+    .two .message-lightbox {
+        width: 150px !important;
+        height: 150px !important;
+        overflow: hidden;
+    }
 }
 
-@media screen and (max-width: 640px) {
+@media (min-width: 768px) {
+    /* 左侧导航 */
+    #BlogAnchor {
+        display: none !important;
+    }
+    /* 日志分类 */
+    #blogs-types {
+        display: none;
+    }
+    /* 日志列表 */
+    #blogs-type-list {
+        left: 0;
+        flex: 0 0 auto;
+        width: 100%;
+        max-width: 100%;
+    }
+    /* 好友分组 */
+    #friends-types {
+        display: none;
+    }
+    /* 好友列表 */
     #friends-type-list {
         left: 0;
         flex: 0 0 auto;
-        width: auto;
+        width: 100%;
         max-width: 100%;
     }
+    /* 相册列表 */
+    #albums_html .card-img {
+        width: inherit;
+        height: 175px;
+    }
+    #albums_html .thumbnail {
+        width: 175px;
+    }
+    #albums_html .pic-num-wrap {
+        top: 125px;
+    }
+    /* 相片列表 */
+    .photos .card-img {
+        width: inherit;
+        height: 175px;
+    }
+    .photos .thumbnail {
+        width: 175px;
+    }
+    .photos .lightbox {
+        height: 175px;
+    }
+    .photos .pic-num-wrap {
+        top: 125px;
+    }
+    /* 视频列表 */
+    .videos .card-img {
+        width: inherit;
+        height: 175px;
+    }
+    .videos .thumbnail {
+        width: 175px;
+    }
+    .videos .lightbox {
+        height: 175px;
+    }
+    .videos .pic-num-wrap {
+        top: 125px;
+    }
+    /* 九宫格两列布局 */
+    .two {
+        max-width: 350px;
+        overflow: hidden;
+    }
+    /* 九宫格两列布局 */
+    .two .message-lightbox {
+        width: 150px !important;
+        height: 150px !important;
+        overflow: hidden;
+    }
+}
+
+@media (min-width: 1000px) {
+    /* 头像 */
+    .avatar {
+        width: 40px;
+        height: 40px;
+    }
+    /* 评论人头像 */
+    .comment-avatar>.avatar {
+        width: 40px;
+        height: 40px;
+    }
+    /* 左侧导航 */
+    #BlogAnchor {
+        display: block !important;
+    }
+    /* 说说 */
+    #messages_html,
+    #albums_html,
+    #boards_html,
+    #favorites_html,
+    #shares_html,
+    #visitors_html {
+        max-width: 60vw;
+    }
+    /* 日志分类 */
+    #blogs-types {
+        display: block !important;
+    }
+    /* 日志列表 */
+    #blogs-type-list {
+        left: 18%;
+        max-width: 60vw;
+        flex: auto;
+    }
+    /* 好友分组 */
+    #friends-types {
+        display: block !important;
+    }
+    /* 好友列表 */
+    #friends-type-list {
+        left: 18%;
+        max-width: 60vw;
+        flex: auto;
+    }
+    /* 相册列表 */
+    #albums_html .card-img {
+        width: inherit;
+        height: 180px;
+    }
+    #albums_html .thumbnail {
+        width: 180px;
+    }
+    #albums_html .pic-num-wrap {
+        top: 130px;
+    }
+    /* 相片列表 */
+    .photos .card-img {
+        width: inherit;
+        height: 180px;
+    }
+    .photos .thumbnail {
+        width: 180px;
+    }
+    .photos .lightbox {
+        height: 180px;
+    }
+    .photos .pic-num-wrap {
+        top: 130px;
+    }
+    /* 视频列表 */
+    .videos .card-img {
+        width: inherit;
+        height: 180px;
+    }
+    .videos .thumbnail {
+        width: 180px;
+    }
+    .videos .lightbox {
+        height: 180px;
+    }
+    .videos .pic-num-wrap {
+        top: 130px;
+    }
+    /* 九宫格两列布局 */
+    .two {
+        max-width: 31vw;
+    }
+    /* 九宫格两列布局 */
+    .two .message-lightbox {
+        width: 14vw !important;
+        height: 14vw !important;
+    }
+}
+
+@media (min-width: 1400px) {
+    /* 相册列表 */
+    #albums_html .card-img {
+        width: inherit;
+        height: 250px;
+    }
+    #albums_html .thumbnail {
+        width: 250px;
+    }
+    #albums_html .pic-num-wrap {
+        top: 200px;
+    }
+    /* 相片列表 */
+    .photos .card-img {
+        width: inherit;
+        height: 300px;
+    }
+    .photos .thumbnail {
+        width: 300px;
+    }
+    .photos .lightbox {
+        height: 300px;
+    }
+    .photos .pic-num-wrap {
+        top: 250px;
+    }
+    /* 视频列表 */
+    .videos .card-img {
+        width: inherit;
+        height: 300px;
+    }
+    .videos .thumbnail {
+        width: 300px;
+    }
+    .videos .lightbox {
+        height: 300px;
+    }
+    .videos .pic-num-wrap {
+        top: 250px;
+    }
 }
\ No newline at end of file
diff --git a/src/export/js/albums.js b/src/export/js/albums.js
index ce27df8..4038dbb 100644
--- a/src/export/js/albums.js
+++ b/src/export/js/albums.js
@@ -8,4 +8,7 @@ $(function() {
     // 最近访问
     API.Common.registerShowLikeWin(albums);
 
+    // 初始化提示
+    $('[data-toggle="tooltip"]').tooltip();
+
 });
\ No newline at end of file
diff --git a/src/export/js/boards.js b/src/export/js/boards.js
index 9afded6..c004b71 100644
--- a/src/export/js/boards.js
+++ b/src/export/js/boards.js
@@ -39,7 +39,7 @@ $(function() {
             mode: 'lg-fade',
             selector: '.lightgallery',
             download: false,
-            thumbnail: true,
+            thumbnail: false,
             loop: false
         });
         $galleryDom.galleryIns = galleryIns;
diff --git a/src/export/js/common.js b/src/export/js/common.js
index b2cb798..fbda27d 100644
--- a/src/export/js/common.js
+++ b/src/export/js/common.js
@@ -180,7 +180,8 @@ const API = {
     Videos: {}, // 视频模块
     Favorites: {}, // 收藏夹模块
     Shares: {}, // 分享模块
-    Visitors: {} // 访客模块
+    Visitors: {}, // 访客模块
+    Statistics: {} // 数据统计模块
 };
 
 /**
@@ -521,7 +522,7 @@ API.Common = {
      * 转换HTML特殊字符
      */
     escHTML(content) {
-        var l = { "&amp;": /&/g, "&lt;": /</g, "&gt;": />/g, "&#039;": /\x27/g, "&quot;": /\x22/g };
+        var l = { "&amp;": /&/g, "&lt;": /</g, "&gt;": />/g, "&quot;": /\x22/g };
         for (var i in l) {
             content = content.replace(l[i], i);
         }
@@ -645,8 +646,9 @@ API.Common = {
      * @param {string} type 转换类型，默认TEXT,可选HTML,MD
      * @param {boolean} isRt 是否是处理转发内容
      * @param {boolean} isSupportedHtml 内容本身是否支持HTML
+     * @param {boolean} isEscHTML 是否全部转换HTML标签
      */
-    formatContent(item, type, isRt, isSupportedHtml) {
+    formatContent(item, type, isRt, isSupportedHtml, isEscHTML) {
         if (typeof item === 'string') {
             // 转换特殊符号
             if (!isSupportedHtml) {
@@ -660,7 +662,7 @@ API.Common = {
             item = this.formatMention(item, type);
             // 转换微信表情
             item = API.Common.formatWxEmoji(item, type);
-            return item;
+            return isEscHTML ? API.Utils.escHTML(item) : item;
         }
         var conlist = (isRt && item.rt_con && item.rt_con['conlist']) || item.conlist || [];
         var contents = [];
@@ -703,7 +705,7 @@ API.Common = {
                     // 普通说说内容？
                     if (info.con) {
                         // 转换话题
-                        info.custom_display = this.formatTopic(info.con, type);
+                        info.custom_display = this.formatTopic(this.escHTML(info.con), type);
                         // 转换表情
                         info.custom_display = this.formatEmoticon(info.custom_display, type);
                         // 转换微信表情
@@ -724,9 +726,8 @@ API.Common = {
                     break;
             }
         }
-        let content = contents.join("");
-        content = content.replace(/^[\s\xA0]+/, "").replace(/[\s\xA0]+$/, "");
-        return content;
+        const content = contents.join("").replace(/^[\s\xA0]+/, "").replace(/[\s\xA0]+$/, "");
+        return isEscHTML ? API.Utils.escHTML(content) : content;
     },
 
     /**
@@ -775,6 +776,9 @@ API.Common = {
             case 'Photos_HTML':
                 res = '../' + res;
                 break;
+            case 'Photos_MarkDown':
+                res = '../../../' + res;
+                break;
             case 'Videos_HTML':
                 res = '../' + res;
                 break;
@@ -1163,7 +1167,7 @@ API.Common = {
 
                 break;
             case 'Shares':
-                const shareIdx = shares.getIndex(eventTarget.id.replace('Shares-LG-', ''), 'id');
+                const shareIdx = shares.getIndex(eventTarget.id.replace('share-medias-', ''), 'id');
                 // 当前相片的评论
                 const share = shares[shareIdx];
                 // 实际上需要显示的评论
@@ -1189,6 +1193,8 @@ API.Common = {
                 const index = $(this).index();
                 API.Common.renderPhotoPreviews(index, 30);
             })
+
+
         });
 
         // 画廊切换图片前
@@ -1200,6 +1206,9 @@ API.Common = {
         gallery.addEventListener('lgAfterSlide', (event) => {
             // 处理评论信息
             API.Common.handleCommentBomEvent(event);
+
+            // 初始化提示信息
+            $('.lg-sub-html [data-toggle="tooltip"]').tooltip();
         });
     },
 
@@ -1359,7 +1368,7 @@ API.Photos = {
                 photoType = "GIF";
                 break;
             case 3:
-                photoType = "PND";
+                photoType = "PNG";
                 break;
             case 4:
                 photoType = "BMP";
@@ -1394,12 +1403,20 @@ API.Favorites = {
         if (!share_info) {
             return "#";
         }
+        // 相册分享
+        if (share_info.album_info && Object.keys(share_info.album_info).length > 0) {
+            return 'https://user.qzone.qq.com/{owner_uin}/photo/{id}'.format(share_info.album_info);
+        }
+        // 日志分享
+        if (share_info.blog_info && Object.keys(share_info.blog_info).length > 0) {
+            return 'https://user.qzone.qq.com/{owner_uin}/blog/{id}'.format(share_info.blog_info);
+        }
+        // 音乐分享
         if (share_info.music_list && share_info.music_list.length > 0) {
-            // 音乐分享
             return share_info.music_list[0].music_info.play_url;
         }
+        // 视频分享
         if (share_info.video_list && share_info.video_list.length > 0) {
-            // 视频分享
             return share_info.video_list[0].video_info.play_url;
         }
         return share_info.share_url;
@@ -1809,81 +1826,83 @@ TPL.VISITOR_LIST = `
  * 通用的单条评论模板
  */
 TPL.COMMON_COMMENT = `
-    <div class="border-bottom comments mt-3">
-        <div class="container comment">
-            <a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
-                <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
-            </a>
-            <div class="ml-5">
-                <div class="container">
-                    <a class="author">
-                        <a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
-                            <span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
-                        </a>
-                        <%if(comment.private){%>
-                            <span class="text-info"> 私密评论 </span>
+<div class="comments mt-2">
+    <div class="comment">
+        <div class="d-flex justify-content-start ">
+            <div class="comment-avatar">
+                <a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+                    <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
+                </a>
+            </div>
+            <div class="comment-infos ml-2">
+                <a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+                    <span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
+                </a>
+                <%if(comment.private){%>
+                    <span class="text-warning"> 私密评论 </span>
+                <%}%>
+                <div class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></div>
+            </div>
+        </div>
+        <div class="comment-text">
+            <div class="messageText">
+                <p><%:=API.Common.formatContent(comment.content)%></p>
+                <%if(comment.pic){%>
+                    <div class="comment-lightgallery">
+                        <%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
+                            <%const image = comment.pic[cmIdx];%>
+                            <a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
+                                data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+                                <img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
+                            </a>
                         <%}%>
-                        <br>
-                        <span class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></span>
-                    </a>
-                </div>
-                <div class="messageText container">
-                    <p><%:=API.Common.formatContent(comment.content)%></p>
-                    <%if(comment.pic){%>
-                        <div class="comment-lightgallery">
-                            <%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
-                                <%const image = comment.pic[cmIdx];%>
-                                <a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
-                                    data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
-                                    <img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
-                                </a>
-                            <%}%>
-                        </div>
-                    <%}%>
-                </div>
-                <% const replies = comment.replies || comment.list_3 || []%>
-                <%if(replies.length > 0){%>
-                    <%for(const reply of replies){%>
-                        <div class="comments">
-                            <div class="container comment p-0">
-                                <a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
-                                    <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
-                                </a>
-                                <div class="ml-5">
-                                    <div class="container">
-                                        <a class="author">
-                                            <a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
-                                                <span class="text-info"><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
-                                            </a>
-                                            <%if(reply.private){%>
-                                                <span class="text-info"> 私密回复 </span>
+                    </div>
+                <%}%>
+            </div>
+            <% const replies = comment.replies || comment.list_3 || []%>
+            <%if(replies.length > 0){%>
+                <%for(const reply of replies){%>
+                    <div class="comments">
+                        <div class="comment">
+                            <div class="d-flex justify-content-start">
+                                <div class="comment-avatar">
+                                    <a class="avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+                                        <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
+                                    </a>
+                                </div>
+                                <div class="comment-infos ml-2">
+                                    <a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+                                        <span><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
+                                    </a>
+                                    <%if(reply.private){%>
+                                        <span class="text-warning"> 私密回复 </span>
+                                    <%}%>
+                                    <div class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></div>
+                                </div>
+                            </div>
+                            <div class="comment-text">
+                                <div class="messageText">
+                                    <p><%:=API.Common.formatContent(reply.content)%></p>
+                                    <%if(reply.pic){%>
+                                        <div class="comment-lightgallery">
+                                            <%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
+                                                <%const image = reply.pic[cmIdx];%>
+                                                <a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
+                                                    data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+                                                    <img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
+                                                </a>
                                             <%}%>
-                                            <br>
-                                            <span class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></span>
-                                        </a>
-                                    </div>
-                                    <div class="messageText container">
-                                        <p><%:=API.Common.formatContent(reply.content)%></p>
-                                        <%if(reply.pic){%>
-                                            <div class="comment-lightgallery">
-                                                <%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
-                                                    <%const image = reply.pic[cmIdx];%>
-                                                    <a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
-                                                        data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
-                                                        <img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
-                                                    </a>
-                                                <%}%>
-                                            </div>
-                                        <%}%>
-                                    </div>
+                                        </div>
+                                    <%}%>
                                 </div>
                             </div>
                         </div>
-                    <%}%>
+                    </div>
                 <%}%>
-            </div>
+            <%}%>
         </div>
     </div>
+</div>
 `
 
 /**
@@ -1907,6 +1926,7 @@ TPL.MESSAGES_COMMENTS = `
 <%if(message.custom_comments && message.custom_comments.length > 0){%>
     <%/* 遍历评论 */%>
     <%for(let comment of message.custom_comments){%>
+        <hr>
         ` + TPL.COMMON_COMMENT + `
     <%}%>
 <%}%>
@@ -1916,175 +1936,181 @@ TPL.MESSAGES_COMMENTS = `
  * 说说年今日的单条说说模板
  */
 TPL.MESSAGES_ITEM = `
-<div class="card w-70 mt-3 border">
+<div class="card w-70 mt-2 border">
     <div class="card-body">
-        <div class="p-1 comments">
-            <div class="container comment  m-1 p-0">
-                <a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(message.uin)%>">
+        <div class="d-flex justify-content-start message-infos">
+            <div class="message-avatar-img">
+                <a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(message.uin)%>">
                     <img class="w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(message.uin)%>">
                 </a>
-                <div class="ml-4">
-                    <div class="messageText ml-4 container m-2">
-                        <%/* 说说内容 */%>
-                        <%/* 说说全文 */%>
-                        <pre class="card-text content <%:=message.has_more_con ? 'hasMore' : ''%>"><%:=API.Common.formatContent(message, "HTML", false, false)%></pre>
-                        <%if(message.has_more_con){%>
-                            <span class="fa fa-2x fa-angle-down cursor readMore" title="展开全文"></span>
-                        <%}%>
-                        <%/* 语音内容 */%>
-                        <%if(message.custom_voices){%>
-                            <%for (const voice of message.custom_voices) {%>
-                                <audio controls src="<%:=(voice.custom_filepath || voice.custom_url)%>"></audio>
-                            <%}%>
-                        <%}%>
-                        <%/* 转发内容 */%>
-                        <%if(message.rt_tid){%>
-                            <hr>
-                            <a class="float-left" target="_blank" href="<%:=API.Common.getUserUrl(message.rt_uin)%>">
-                                <span class="text-info"><%:=API.Common.formatContent(message.rt_uinname)%>：</span>
-                            </a>
-                            <%/* 转发全文 */%>
-                            <pre class="card-text content <%:=message.has_more_con ? 'hasMore' : ''%>"><%:=API.Common.formatContent(message, "HTML", true, false)%></pre>
-                            <%if(message.rt_has_more_con && message.rt_con){%>
-                                <span class="fa fa-2x fa-angle-down cursor readMore" title="展开全文"></span>
-                            <%}%>
-                        <%}%>
-                        <%/* 查看大图的详情 */%>
-                        <div id="<%:= 'QZIMG-'+ message.tid%>" class='photo-detail' style="display:none">
-                            <div class="container">
-                                <div class="row">
-                                    <div class="col-sm text-white-50 text-left">
-                                        <p>
-                                            <i title="发表时间" class="fa fa-clock-o text-primary"><%:=API.Utils.formatDate(message.created_time)%></i>
-                                        </p>
-                                        <p>
-                                            <%if(!(!message.story_info || !message.story_info.time || !message.story_info.lbs)){%>
-                                                <a class="fa fa-map-marker text-primary" target="_blank" href="<%:=API.Messages.getMapUrl(message.story_info.lbs)%>" class="card-link"><%:=message.story_info.lbs.idname || message.story_info.lbs.name%></a> 
-                                                <span class="fa fa-camera text-muted">拍摄于 <%:=API.Utils.formatDate(message.story_info.time)%> </span>
-                                            <%}else{%>
-                                                <%if(message.lbs && message.lbs.pos_x && message.lbs.pos_y){%>
-                                                    <a title="上传地点" class="text-primary" href="<%:=API.Messages.getMapUrl(message.lbs)%>" target="_blank"><i class="fa fa-map-marker"></i><%:=message.lbs.idname || message.lbs.name%></a>
-                                                <%}%>
-                                            <%}%>
-                                        </p>
-                                    </div>
-                                    <div class="col-sm">
-                                        <p class="text-white">
-                                            <%:=API.Common.formatContent(message, "HTML", false, false)%>
-                                        </p>
-                                    </div>
-                                    <div class="col-sm"></div>
-                                </div>
-                            </div>
-                        </div>
-                        <%/* 多媒体内容 */%>
-                        <div id="<%:= 'QZ-'+ message.tid%>" class="medias row p-3 lightgallery <%:=API.Common.getImgClassType(message)%>">
-                            <%/* 视频内容（一般为单视频） */%>
-                            <%if(message.custom_videos){%>
-                                <%let imgIdx = 0%>
-                                <%for(let video of message.custom_videos){%>
-                                    <%if (API.Videos.isExternalVideo(video)) {%>
-                                        <a class="medias-item border message-lightbox-external" href="<%:=API.Videos.getVideoUrl(video)%>" target="_blank">
-                                            <span class="message-video"></span>
-                                            <img class="lazyload loading w-100 h-100" src="../Common/Images/loading.gif" data-src="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>">
-                                        </a>
-                                    <%}else{%>
-                                        <%/* 空间视频 */%>
-                                        <a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-video='{"source": [{"src":"<%:=(video.custom_filepath || video.custom_url || video.url3)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}'
-                                            data-poster="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
-                                            <span class="message-video"></span>
-                                            <img class="lazyload loading w-100 h-100" data-id="<%:=video.video_id%>" src="../Common/Images/loading.gif"  data-src="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>" />
-                                        </a>
-                                        <%imgIdx++%>
-                                    <%}%>
-                                <%}%>
-                            <%}%>
-                            <%/*  图片内容(含视频，即同时存在图片与视频) */%>
-                            <%if(message.custom_images){%>
-                                <%let imgIdx = 0%>
-                                <%for(let image of message.custom_images){%>
-                                    <%if(image.is_video && image.video_info){%>
-                                        <%if (API.Videos.isExternalVideo(image.video_info)) {%>
-                                            <a class="medias-item border message-lightbox-external" href="<%:=API.Videos.getVideoUrl(image.video_info)%>" target="_blank">
-                                                <span class="message-video"></span>
-                                                <img class="lazyload loading w-100 h-100" src="../Common/Images/loading.gif" data-src="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>">
-                                            </a>
-                                        <%}else{%>
-                                            <%/* 空间视频 */%>
-                                            <a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-video='{"source": [{"src":"<%:=(image.video_info.custom_filepath || image.video_info.custom_url || image.video_info.url3)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}'
-                                                data-poster="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
-                                                <span class="message-video"></span>
-                                                <img class="lazyload loading w-100 h-100" data-id="<%:=image.video_info.video_id%>" src="../Common/Images/loading.gif" data-src="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>" />
-                                            </a>
-                                            <%imgIdx++%>
-                                        <%}%>
-                                    <%}else{%>
-                                        <a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
-                                            <img class="lazyload loading w-100 h-100" data-id="<%:=image.pic_id%>" src="../Common/Images/loading.gif" src="../Common/Images/loading.gif" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
-                                        </a>
-                                        <%imgIdx++%>
+            </div>
+            <div class="message-info ml-2">
+                <a class="message-avatar-name" target="_blank" href="<%:=API.Common.getUserUrl(message.uin)%>">
+                    <%:=API.Common.formatContent(message.name)%>
+                </a>
+                <div class="message-time text-muted small"><%:=API.Common.formatContent(message.custom_create_time)%></div>
+            </div>
+        </div>
+        <div class="messageText mt-3">
+            <!-- 说说内容 -->
+            <pre class="card-text content <%:=message.has_more_con ? 'hasMore' : ''%> <%:=QZone_Config.Messages.isShowMore ? 'more' : ''%> "><%:=API.Common.formatContent(message, "HTML", false, false)%></pre>
+            <!-- 说说全文 -->
+            <%if(message.has_more_con){%>
+                <span class="fa fa-2x <%:=QZone_Config.Messages.isShowMore ? 'fa-angle-up' : 'fa-angle-down'%> cursor <%:=QZone_Config.Messages.isShowMore ? 'more' : ''%> readMore" title="<%:=QZone_Config.Messages.isShowMore ? '收起全文' : '展开全文'%>"></span>
+            <%}%>
+            <!-- 语音内容 -->
+            <%if(message.custom_voices){%>
+                <%for (const voice of message.custom_voices) {%>
+                    <audio controls src="<%:=(voice.custom_filepath || voice.custom_url)%>"></audio>
+                <%}%>
+            <%}%>
+            <!-- 转发内容 -->
+            <%if(message.rt_tid){%>
+                <hr>
+                <a class="float-left" target="_blank" href="<%:=API.Common.getUserUrl(message.rt_uin)%>">
+                    <span class="text-info"><%:=API.Common.formatContent(message.rt_uinname)%>：</span>
+                </a>
+                <!-- 转发全文 -->
+                <pre class="card-text content <%:=message.has_more_con ? 'hasMore' : ''%> <%:=QZone_Config.Messages.isShowMore ? 'more' : ''%> "><%:=API.Common.formatContent(message, "HTML", true, false)%></pre>
+                <%if(message.rt_has_more_con && message.rt_con){%>
+                    <span class="fa fa-2x <%:=QZone_Config.Messages.isShowMore ? 'fa-angle-up' : 'fa-angle-down'%> cursor readMore" title="<%:=QZone_Config.Messages.isShowMore ? '收起全文' : '展开全文'%>"></span>
+                <%}%>
+            <%}%>
+            <!-- 查看大图 -->
+            <div id="<%:= 'QZIMG-'+ message.tid%>" class='photo-detail' style="display:none">
+                <div class="container">
+                    <div class="row">
+                        <div class="col text-white-50 text-left">
+                            <p>
+                                <i title="发表时间" class="fa fa-clock-o text-primary"><%:=API.Utils.formatDate(message.created_time)%></i>
+                            </p>
+                            <p>
+                                <%if(!(!message.story_info || !message.story_info.time || !message.story_info.lbs)){%>
+                                    <a class="fa fa-map-marker text-primary" target="_blank" href="<%:=API.Messages.getMapUrl(message.story_info.lbs)%>" class="card-link"><%:=message.story_info.lbs.idname || message.story_info.lbs.name%></a> 
+                                    <span class="fa fa-camera text-muted">拍摄于 <%:=API.Utils.formatDate(message.story_info.time)%> </span>
+                                <%}else{%>
+                                    <%if(message.lbs && message.lbs.pos_x && message.lbs.pos_y){%>
+                                        <a title="上传地点" class="text-primary" href="<%:=API.Messages.getMapUrl(message.lbs)%>" target="_blank"><i class="fa fa-map-marker"></i><%:=message.lbs.idname || message.lbs.name%></a>
                                     <%}%>
                                 <%}%>
-                            <%}%>
-                            <%/* 动画表情内容（目前只支持一个） */%>
-                            <%if(message.custom_magics){%>
-                                <%for(let image of message.custom_magics){%>
-                                    <a class="medias-item border" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
-                                        <img class="lazyload loading w-100 h-100" data-src='<%:=(image.custom_filepath || image.custom_url)%>'>
-                                    </a>
-                                    <hr>
-                                <%}%>
-                            <%}%>
+                            </p>
                         </div>
-                        <%/* 音乐内容（目前已无法正常播放，直接显示专辑图片与歌曲信息） */%>
-                        <%if(message.custom_audios && message.audiototal > 0){%>
-                            <div class="medias row p-3">
-                                <ul class="list-unstyled w-100">
-                                    <%for(let music of message.custom_audios){%>
-                                        <li class="border">
-                                            <a class="medias-item text-center" data-src="<%:=(music.custom_filepath || music.image)%>" href="<%:=music.playurl%>">
-                                                <img class="lazyload loading border" data-src="<%:=(music.custom_filepath || music.image)%>">
-                                                <span><%:=music.name%></span>
-                                            </a>
-                                        </li>
-                                    <%}%>
-                                </ul>
-                            </div>
-                        <%}%>
-                        <%/* 投票内容（待定） */%>
-                        <%/* 说说评论 */%>
-                        ` + TPL.MESSAGES_COMMENTS + `
+                        <div class="col text-truncate">
+                            <p class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(message, "HTML", false, false)%>">
+                                <%:=API.Common.formatContent(message, "HTML", false, false)%>
+                            </p>
+                        </div>
+                        <div class="col"></div>
                     </div>
-                    <ul class="message-infos list-group list-group-flush ml-4">
-                        <%if(message.lbs && message.lbs.pos_x && message.lbs.pos_y){%>
-                            <li class="list-group-item">
-                                <a class="fa fa-map-marker" target="_blank" href="<%:=API.Messages.getMapUrl(message.lbs)%>" class="card-link"> <%:=message.lbs.idname || message.lbs.name%></a>
-                            </li>
+                </div>
+            </div>
+            <!-- 多媒体内容 -->
+            <div id="<%:= 'QZ-'+ message.tid%>" class="medias row pl-3 lightgallery <%:=API.Common.getImgClassType(message)%>">
+                <!-- 视频内容（一般为单视频） -->
+                <%if(message.custom_videos){%>
+                    <%let imgIdx = 0%>
+                    <%for(let video of message.custom_videos){%>
+                        <%if (API.Videos.isExternalVideo(video)) {%>
+                            <!-- 外部视频 -->
+                            <a class="medias-item border message-lightbox-external" href="<%:=API.Videos.getVideoUrl(video)%>" target="_blank">
+                                <span class="message-video"></span>
+                                <img class="lazyload loading w-100 h-100" src="../Common/Images/loading.gif" data-src="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>">
+                            </a>
+                        <%}else{%>
+                            <!-- 空间视频 -->
+                            <a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-video='{"source": [{"src":"<%:=(video.custom_filepath || video.custom_url || video.url3)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}'
+                                data-poster="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
+                                <span class="message-video"></span>
+                                <img class="lazyload loading w-100 h-100" data-id="<%:=video.video_id%>" src="../Common/Images/loading.gif"  data-src="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>" />
+                            </a>
+                            <%imgIdx++%>
                         <%}%>
-                        <%if(!(!message.story_info || !message.story_info.time || !message.story_info.lbs)){%>
-                            <li class="list-group-item">
-                                <a class="fa fa-map-marker" target="_blank" href="<%:=API.Messages.getMapUrl(message.story_info.lbs)%>" class="card-link"><%:=message.story_info.lbs.idname || message.story_info.lbs.name%></a> 
-                                <span class="fa fa-camera text-muted">拍摄于 <%:=API.Utils.formatDate(message.story_info.time)%> </span>
-                            </li>
+                    <%}%>
+                <%}%>
+                <!-- 图片内容(含视频，即同时存在图片与视频) -->
+                <%if(message.custom_images){%>
+                    <%let imgIdx = 0%>
+                    <%for(let image of message.custom_images){%>
+                        <%if(image.is_video && image.video_info){%>
+                            <%if (API.Videos.isExternalVideo(image.video_info)) {%>
+                                <!-- 外部视频 -->
+                                <a class="medias-item border message-lightbox-external" href="<%:=API.Videos.getVideoUrl(image.video_info)%>" target="_blank">
+                                    <span class="message-video"></span>
+                                    <img class="lazyload loading w-100 h-100" src="../Common/Images/loading.gif" data-src="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>">
+                                </a>
+                            <%}else{%>
+                                <!-- 空间视频 -->
+                                <a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-video='{"source": [{"src":"<%:=(image.video_info.custom_filepath || image.video_info.custom_url || image.video_info.url3)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}'
+                                    data-poster="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
+                                    <span class="message-video"></span>
+                                    <img class="lazyload loading w-100 h-100" data-id="<%:=image.video_info.video_id%>" src="../Common/Images/loading.gif" data-src="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>" />
+                                </a>
+                                <%imgIdx++%>
+                            <%}%>
+                        <%}else{%>
+                            <a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
+                                <img class="lazyload loading w-100 h-100" data-id="<%:=image.pic_id%>" src="../Common/Images/loading.gif" src="../Common/Images/loading.gif" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
+                            </a>
+                            <%imgIdx++%>
                         <%}%>
-                        <%if(message.source_name){%>
-                            <li class="list-group-item">
-                                <%if(message.source_url){%>
-                                    <span class="text-info"><a target="_blank" href="<%:=message.source_url%>"><%:=API.Common.formatContent(message.source_name)%></a></span>
-                                <%}else{%>
-                                    <span class="text-info fa fa-mobile-phone"> <%:=API.Common.formatContent(message.source_name)%></span>
-                                <%}%>
-                            </li>	
+                    <%}%>
+                <%}%>
+                <!-- 动画表情内容（目前只支持一个） -->
+                <%if(message.custom_magics){%>
+                    <%for(let image of message.custom_magics){%>
+                        <a class="medias-item border" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
+                            <img class="lazyload loading w-100 h-100" data-src='<%:=(image.custom_filepath || image.custom_url)%>'>
+                        </a>
+                        <hr>
+                    <%}%>
+                <%}%>
+            </div>
+            <!-- 音乐内容（目前已无法正常播放，直接显示专辑图片与歌曲信息） -->
+            <%if(message.custom_audios && message.audiototal > 0){%>
+                <div class="medias row p-3">
+                    <ul class="list-unstyled w-100">
+                        <%for(let music of message.custom_audios){%>
+                            <li class="border">
+                                <a class="medias-item text-center" data-src="<%:=(music.custom_filepath || music.image)%>" href="<%:=music.playurl%>">
+                                    <img class="lazyload loading border" data-src="<%:=(music.custom_filepath || music.image)%>">
+                                    <span><%:=music.name%></span>
+                                </a>
+                            </li>
                         <%}%>
                     </ul>
                 </div>
-            </div>
+            <%}%>
+            <!-- 投票内容（待定），功能下线了，找不到历史数据，暂不实现 -->
+            <!-- 说说评论 -->
+            ` + TPL.MESSAGES_COMMENTS + `
         </div>
+        <!-- 说说额外信息 -->
+        <ul class="message-infos small list-group list-group-flush">
+            <%if(message.lbs && message.lbs.pos_x && message.lbs.pos_y){%>
+                <li class="list-group-item pl-0">
+                    <a class="fa fa-map-marker" target="_blank" href="<%:=API.Messages.getMapUrl(message.lbs)%>" class="card-link"> <%:=message.lbs.idname || message.lbs.name%></a>
+                </li>
+            <%}%>
+            <%if(!(!message.story_info || !message.story_info.time || !message.story_info.lbs)){%>
+                <li class="list-group-item pl-0">
+                    <a class="fa fa-map-marker" target="_blank" href="<%:=API.Messages.getMapUrl(message.story_info.lbs)%>" class="card-link"><%:=message.story_info.lbs.idname || message.story_info.lbs.name%></a> 
+                    <span class="fa fa-camera text-muted">拍摄于 <%:=API.Utils.formatDate(message.story_info.time)%> </span>
+                </li>
+            <%}%>
+            <%if(message.source_name){%>
+                <li class="list-group-item pl-0">
+                    <%if(message.source_url){%>
+                        <span class="text-info"><a target="_blank" href="<%:=message.source_url%>"><%:=API.Common.formatContent(message.source_name)%></a></span>
+                    <%}else{%>
+                        <span class="text-info fa fa-mobile-phone"> <%:=API.Common.formatContent(message.source_name)%></span>
+                    <%}%>
+                </li>	
+            <%}%>
+        </ul>
     </div>
     <div class="card-footer text-muted">
-        <%:=API.Common.formatContent(message.custom_create_time)%>
-        <span class="text-primary p-1 float-right fa fa-thumbs-up mr-2 cursor viewlikes" title="点赞列表" data-field="tid" data-target="<%:=message.tid%>"><%:=message.likeTotal || 0 %></span>
-        <span class="text-primary p-1 float-right fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="tid" data-target="<%:=message.tid%>"><%:=message.custom_visitor && message.custom_visitor.viewCount || 0 %></span>
+        <span class="text-primary p-1 fa fa-thumbs-up mr-2 cursor viewlikes" title="点赞列表" data-field="tid" data-target="<%:=message.tid%>"><%:=message.likeTotal || 0 %></span>
+        <span class="text-primary p-1 fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="tid" data-target="<%:=message.tid%>"><%:=message.custom_visitor && message.custom_visitor.viewCount || 0 %></span>
     </div>
 </div>
 `
@@ -2094,10 +2120,10 @@ TPL.MESSAGES_ITEM = `
  */
 TPL.MESSAGES_YEAR_ITEMS = `
 <%if (yearMaps && yearMaps.size > 0) {%>
-    <h5 class="sidebar-h1" data-tag="h1">那年今日</h5>
+    <h4 class="sidebar-h1" data-tag="h1">那年今日</h4>
     <%for (const [year, yearItems] of yearMaps) {%>
         <%if (yearItems && yearItems.length > 0) {%>
-            <h6 class="sidebar-h2" data-tag="h2"><%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=yearItems.length%><span></h6>
+            <h5 class="sidebar-h2 mt-2" data-tag="h2"><%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=yearItems.length%><span></h5>
             <%for (const message of yearItems) {%>
                 ` + TPL.MESSAGES_ITEM + `
             <%}%>  
@@ -2111,50 +2137,51 @@ TPL.MESSAGES_YEAR_ITEMS = `
  * 单条留言模板
  */
 TPL.BOARDS_ITEM = `
-<div class="card border p-2 mt-1">
+<div class="card border mt-1">
     <div class="card-body">
-        <div class="p-1 comments">
-            <div class="container comment  m-1 p-0">
-                <a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(board.uin)%>">
-                    <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(board.uin)%>">
-                </a>
-                <div class="ml-4">
-                    <div class="container ml-4">
-                        <a class="author">
-                            <a target="_blank" href="<%:=API.Common.getUserUrl(board.uin)%>">
-                                <span><%:=API.Common.formatContent(board.nickname)%></span>
-                            </a>
-                            <br>
-                            <span class="text-muted small"><%:=API.Utils.formatDate(board.pubtime)%></span>
+        <div class="comments">
+            <div class="comment p-0">
+                <div class="d-flex justify-content-start ">
+                    <div class="comment-avatar">
+                        <a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(board.uin)%>">
+                            <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(board.uin)%>" >
                         </a>
                     </div>
-                    <div class="messageText ml-4 container m-2">
-                        <%:=API.Common.formatContent(board.htmlContent,'HTML', false, true)%>
+                    <div class="comment-infos ml-2">
+                        <a target="_blank" href="<%:=API.Common.getUserUrl(board.uin)%>">
+                            <span><%:=API.Common.formatContent(board.nickname)%></span>
+                        </a>
+                        <div class="text-muted small mt-1"><%:=API.Utils.formatDate(board.pubtime)%></div>
                     </div>
-                    <%if(board.replyList){%>
-                        <div class="p-1 comments m-3">
-                            <%for (var reply of board.replyList) {%>
-                                <div class="container comment  m-3 p-0">
-                                    <a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.uin)%>">
-                                        <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.uin)%>">
-                                    </a>
-                                    <div class=" ml-4  ">
-                                        <div class="container ml-4">
-                                            <a class="author">
-                                                <a target="_blank" href="<%:=API.Common.getUserUrl(reply.uin)%>">
-                                                    <span class="text-info"><%:=API.Common.formatContent(reply.nick)%></span>
-                                                </a>
-                                                <br>
-                                                <span class="text-muted small"><%:=API.Utils.formatDate(reply.time)%></span>
-                                            </a>
-                                        </div>
-                                        <div class="messageText ml-4 container m-2"><%:=API.Common.formatContent(reply.content)%></div>
+                </div>
+                <div class="messageText ml-5">
+                    <%:=API.Common.formatContent(board.htmlContent,'HTML', false, true)%>
+                </div>
+                <%if(board.replyList && board.replyList.length > 0){%>
+                    <hr>
+                    <div class="comments m-3">
+                        <%for (const reply of board.replyList) {%>
+                            <div class="comment p-0 mt-2">
+                                <div class="d-flex justify-content-start ">
+                                    <div class="comment-avatar">
+                                        <a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(reply.uin)%>">
+                                            <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.uin)%>" >
+                                        </a>
+                                    </div>
+                                    <div class="comment-infos ml-2">
+                                        <a target="_blank" href="<%:=API.Common.getUserUrl(reply.uin)%>">
+                                            <span><%:=API.Common.formatContent(reply.nick)%></span>
+                                        </a>
+                                        <div class="text-muted small"><%:=API.Utils.formatDate(reply.time)%></div>
                                     </div>
                                 </div>
-                            <%}%>
-                        </div>
-                    <%}%>
-                </div>
+                                <div class="messageText ml-5">
+                                    <%:=API.Common.formatContent(reply.content)%>
+                                </div>
+                            </div>
+                        <%}%>
+                    </div>
+                <%}%>
             </div>
         </div>
     </div>
@@ -2166,10 +2193,10 @@ TPL.BOARDS_ITEM = `
  */
 TPL.BOARDS_YEAR_ITEMS = `
 <%if (yearMaps && yearMaps.size > 0) {%>
-    <h5 class="sidebar-h1" data-tag="h1">那年今日</h5>
+    <h4 class="sidebar-h1" data-tag="h1">那年今日</h4>
     <%for (const [year, yearItems] of yearMaps) {%>
         <%if (yearItems && yearItems.length > 0) {%>
-            <h6 class="sidebar-h2" data-tag="h2"><%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=yearItems.length%><span></h6>
+            <h5 class="sidebar-h2" data-tag="h2"><%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=yearItems.length%><span></h5>
             <%for (const board of yearItems) {%>
                 ` + TPL.BOARDS_ITEM + `
             <%}%>  
@@ -2186,6 +2213,7 @@ TPL.SHARES_COMMENTS = `
  <%if(share.comments && share.comments.length > 0){%>
      <%/* 遍历评论 */%>
      <%for(let comment of comments.comments){%>
+        <hr>
          ` + TPL.COMMON_COMMENT + `
      <%}%>
  <%}%>
@@ -2195,57 +2223,74 @@ TPL.SHARES_COMMENTS = `
  * 单条分享的那年今日模板
  */
 TPL.SHARES_ITEM = `
-<div class="card w-70 mt-3 border">
+<div id="<%:='share-' + share.id%>" class="card w-70 mt-3 border share-row">
     <div class="card-body">
-        <div class="p-1 comments">
-            <div class="container comment  m-1 p-0">
-                <a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(share.uin)%>">
-                    <img class="w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(share.uin)%>">
-                </a>
-                <div class="ml-4">
-                    <div class="messageText ml-4 container m-2">
-                        <%/* 分享描述 */%>
-                        <p id="<%:='Shares-Desc-' + share.id%>"><a target="_blank" href="<%:=API.Common.getUserUrl(share.uin)%>"><%:=API.Common.formatContent(share.nickname)%></a> <span class="text-secondary">分享<span class="border-warning border rounded text-warning small p-1"><%:=API.Shares.getDisplayType(share.type)%></span>：</span><%:=API.Common.formatContent(share.desc, "HTML", false, false)%></p>
-                        <%/* 分享源标题 */%>
-                        <%if(share.source && share.source.title){%>
-                            <p>《<a target="_blank" href="<%:=share.source.url%>"><%:=share.source.title%></a>》</p>
-                        <%}%>
-                        <%/* 分享源描述 */%>
-                        <%if(share.source && share.source.desc){%>
-                            <p><%:=API.Common.formatContent(share.source.desc, "HTML", false, false)%></p>
+        <div class="comments">
+            <div class="comment p-0">
+                <div class="d-flex justify-content-start ">
+                    <div class="comment-avatar">
+                        <a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(share.uin)%>">
+                            <img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(share.uin)%>" >
+                        </a>
+                    </div>
+                    <div class="comment-infos ml-2">
+                        <a target="_blank" href="<%:=API.Common.getUserUrl(share.uin)%>">
+                            <span><%:=API.Common.formatContent(share.nickname)%></span>
+                        </a>
+                        分享<span class="border-warning border rounded text-warning small p-1"><%:=API.Shares.getDisplayType(share.type)%></span>
+                        <div class="text-muted small mt-1"><%:=API.Utils.formatDate(share.shareTime)%></div>
+                    </div>
+                </div>
+                <div class="messageText mt-2">
+                    <!-- 分享描述 -->
+                    <%if(share && share.desc){%>
+                        <p id="<%:='share-desc-' + share.id%>"><%:=API.Common.formatContent(share.desc, "HTML", false, false)%></p>
+                    <%}%>
+                    <blockquote class="source">
+                        <!-- 分享源标题 -->
+                        <%if(share.source && Object.keys(share.source).length > 0 ){%>
+                            <%if(share.source.title){%>
+                                <p><a target="_blank" href="<%:=share.source.url%>"><%:=share.source.title%></a></p>
+                            <%}%>
+                            <!-- 分享源描述 -->
+                            <%if(share.source.desc){%>
+                                <p id="<%:='share-source-desc-' + share.id%>"><%:=API.Common.formatContent(share.source.desc, "HTML", false, false)%></p>
+                            <%}%>
                         <%}%>
-                        <%/* 分享内容 */%>
-                        <%/* 多媒体内容 */%>
-                        <div id="<%:='Shares-LG-' + share.id%>" class="medias row p-3 lightgallery <%:=API.Common.getImgClassType(share,true)%>">
-                            <%/*  分享源图片 */%>
-                            <%if(share.source.images){%>
+                        <!-- 分享内容 -->
+                        <!-- 多媒体内容 -->
+                        <!-- 分享源图片 -->
+                        <%if(share.source.images && share.source.images.length > 0){%>
+                            <div id="<%:='share-medias-' + share.id%>" class="medias row pl-3 lightgallery <%:=API.Common.getImgClassType(share,true)%>">
                                 <%for (let idx = 0; idx < share.source.images.length; idx++) {%>
                                     <%const image = share.source.images[idx];%>
-                                    <a class="medias-item border message-lightbox" data-idx="<%:=idx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>" data-sub-html="#<%:='Shares-Desc-' + share.id%>">
+                                    <a class="medias-item border message-lightbox" data-idx="<%:=idx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>" data-sub-html="#<%:='share-source-desc-' + share.id%>">
                                         <img class="lazyload loading w-100 h-100" data-idx="<%:=idx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
                                     </a>
                                 <%}%>
-                            <%}%>
-                        </div>
-                        <%/* 分享评论 */%>
-                        ` + TPL.SHARES_COMMENTS + `
-                    </div>
-                    <%/* 分享源来源 */%>
-                    <%if(share.source && share.source.from){%>
-                        <ul class="list-group list-group-flush ml-3">
-                            <li class="list-group-item">
-                                <span class="text-secondary">来自<a target="_blank" href="<%:=share.source.from.url%>"><%:=share.source.from.name%></a> 共分享<%:=share.source.count%>次</span>
-                            </li>
-                        </ul>
-                    <%}%>
+                            </div>
+                        <%}%>
+                    </blockquote>
+                    <!-- 分享评论 -->
+                    ` + TPL.SHARES_COMMENTS + `
                 </div>
+                <!-- 分享源来源 -->
+                <%if(share.source && share.source.from){%>
+                    <ul class="list-group list-group-flush">
+                        <li class="list-group-item pl-0">
+                            <%if(share.source.from.name){%>
+                                <span class="text-secondary">来自<a target="_blank" href="<%:=share.source.from.url%>"><%:=share.source.from.name%></a> </span>
+                            <%}%>
+                            <span class="text-secondary">共分享<%:=share.source.count%>次</span>
+                        </li>
+                    </ul>
+                <%}%>
             </div>
         </div>
     </div>
     <div class="card-footer text-muted">
-        <%:=API.Utils.formatDate(share.shareTime)%>
-        <span class="text-primary p-1 float-right fa fa-thumbs-up mr-2 cursor viewlikes" title="点赞列表" data-field="id" data-target="<%:=share.id%>"><%:=share.likeTotal || 0 %></span>
-        <span class="text-primary p-1 float-right fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="id" data-target="<%:=share.id%>"><%:=share.custom_visitor && share.custom_visitor.viewCount || 0 %></span>
+        <span class="text-primary p-1 fa fa-thumbs-up mr-2 cursor viewlikes" title="点赞列表" data-field="id" data-target="<%:=share.id%>"><%:=share.likeTotal || 0 %></span>
+        <span class="text-primary p-1 fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="id" data-target="<%:=share.id%>"><%:=share.custom_visitor && share.custom_visitor.viewCount || 0 %></span>
     </div>
 </div>
 `
@@ -2335,12 +2380,12 @@ TPL.BLOGS_TYPE_LIST = `
     <%}%> 
     <div class="col-2" id="blogs-types">
         <div class="list-group" id="list-tab" role="tablist">
-            <a class="list-group-item list-group-item-action active" id="list-all-list" data-toggle="list" href="#list-all" role="tab">
+            <a class="list-group-item list-group-item-action align-items-center active" id="list-all-list" data-toggle="list" href="#list-all" role="tab">
                 全部日志
                 <span class="badge badge-warning badge-pill float-right"><%:=blogs.length%></span>
             </a>
             <%for (const [category, categoryItems] of categoryMaps) {%>
-                <a class="list-group-item list-group-item-action" id="list-<%:=cateHexMaps.get(category)%>-list" data-category="<%:=category%>" data-toggle="list" href="#list-<%:=cateHexMaps.get(category)%>" role="tab">
+                <a class="list-group-item list-group-item-action align-items-center" id="list-<%:=cateHexMaps.get(category)%>-list" data-category="<%:=category%>" data-toggle="list" href="#list-<%:=cateHexMaps.get(category)%>" role="tab">
                     <%:=category%>
                     <span class="badge badge-warning badge-pill float-right"><%:=categoryItems.length%></span>
                 </a>
@@ -2371,11 +2416,11 @@ TPL.BLOGS_TYPE_LIST = `
  */
 TPL.FRIENDS_LIST_ITEM = `
  <div class="list-group-item list-group-item-action mb-2">
-     <div class="align-middle mb-3">
+     <div class="align-middle mb-2">
         <a href="<%:=API.Common.getUserUrl(friend.uin)%>" target="_blank" title="访问TA的QQ空间">
             <img src="<%:=API.Common.getMediaPath(API.Common.getUserLogoUrl(friend.uin), friend.custom_avatar, "Friends_HTML")%>">
         </a>
-        <span title="备注/昵称" class="ml-2"><%:=friend.remark || friend.name%></span>
+        <span title="备注/昵称" class="ml-2"><%:=API.Common.formatContent(friend.remark || friend.name)%></span>
      </div>
      <ul class="list-inline">
         <li class="list-inline-item qq-message">
@@ -2390,6 +2435,8 @@ TPL.FRIENDS_LIST_ITEM = `
         <li class="list-inline-item oneWay">
             <%:=API.Friends.getShowFriendType(friend, 'HTML')%>
         </li>
+    </ul>
+    <ul class="list-inline">
         <li class="list-inline-item addFriendTime">
             <span class="badge badge-primary badge-pill" title="好友成立时间：<%:=API.Friends.getShowFriendTime(friend, 0)%>" >相识：<%:=API.Friends.getShowFriendTime(friend, 1)%></small>
         </li>
@@ -2434,21 +2481,21 @@ TPL.FRIENDS_GROUP_LIST = `
         <%let groupKey = groupName ==groupNameItems[0] && groupNameItems[0].groupName && groupNameItems[0].groupid || API.Utils.newUid()%>
         <%groupKeyMaps.set(groupName,groupKey)%>
     <%}%> 
-    <div class="col-3" id="friends-types">
+    <div class="col-2" id="friends-types">
         <div class="list-group" id="list-tab" role="tablist">
-            <a class="list-group-item list-group-item-action active" id="list-all-list" data-toggle="list" href="#list-all" role="tab">
+            <a class="list-group-item list-group-item-action align-items-center active" id="list-all-list" data-toggle="list" href="#list-all" role="tab">
                 全部好友
                 <span class="badge badge-warning badge-pill float-right"><%:=friends.length%></span>
             </a>
             <%for (const [groupName, groupNameItems] of groupMaps) {%>
-                <a class="list-group-item list-group-item-action" id="list-<%:=groupKeyMaps.get(groupName)%>-list" data-toggle="list" href="#list-<%:=groupKeyMaps.get(groupName)%>" role="tab">
+                <a class="list-group-item list-group-item-action align-items-center" id="list-<%:=groupKeyMaps.get(groupName)%>-list" data-toggle="list" href="#list-<%:=groupKeyMaps.get(groupName)%>" role="tab">
                     <%:=groupName%>
                     <span class="badge badge-warning badge-pill float-right"><%:=groupNameItems.length%></span>
                 </a>
             <%}%> 
         </div>
     </div>
-    <div class="col-7" id="friends-type-list">
+    <div class="col-8" id="friends-type-list">
         <div class="tab-content" id="nav-tabContent">
             <div class="tab-pane fade show active" id="list-all" role="tabpanel" aria-labelledby="list-all-list">
                 <div class="list-group">
diff --git a/src/export/js/favorites.js b/src/export/js/favorites.js
index 3b50e91..08fc105 100644
--- a/src/export/js/favorites.js
+++ b/src/export/js/favorites.js
@@ -31,10 +31,10 @@ $(function() {
             mode: 'lg-fade',
             selector: '.message-lightbox',
             download: false,
-            thumbnail: true,
+            thumbnail: false,
             mousewheel: true,
             loop: false,
-            autoplayVideoOnSlide: true
+            autoplayVideoOnSlide: false
         });
 
         $galleryDom.galleryIns = galleryIns;
@@ -45,4 +45,7 @@ $(function() {
 
     // 取消懒加载样式
     API.Common.registerImageLoadedEvent();
+
+    // 初始化提示
+    $('[data-toggle="tooltip"]').tooltip();
 });
\ No newline at end of file
diff --git a/src/export/js/friends.js b/src/export/js/friends.js
index 9eb8618..68ba012 100644
--- a/src/export/js/friends.js
+++ b/src/export/js/friends.js
@@ -14,11 +14,6 @@ API.Friends.showList = function() {
     const careFriends = friends.filter((item) => item.care === true);
     const careShowTip = careFriends.length == 1 ? "TA" : "TA们";
     newGroupMaps.set('<span title="你特别关心的' + careShowTip + '，' + careShowTip + '一定很重要、重要、重要吧"><span class="fa fa-heartbeat text-danger mr-2"></span>特别关心<span>', careFriends);
-
-    // QQ分组
-    for (const [groupName, groupItems] of groupMaps) {
-        newGroupMaps.set(groupName, groupItems);
-    }
     // 虚拟无权限分组
     const notAccessFriends = friends.filter((item) => item.access === false);
     newGroupMaps.set('<span title="无权限访问TA们的空间或TA们未开通QQ空间"><span class="fa fa-lock text-danger mr-2"></span>无权访问</span>', notAccessFriends);
@@ -27,6 +22,11 @@ API.Friends.showList = function() {
     const oneWayFriends = friends.filter((item) => item.isFriend === 2);
     newGroupMaps.set('<span title="TA们在你的QQ好友列表，你不在TA们的QQ好友列表，反正很让人心情不爽就对了"><span class="fa fa-user-times text-danger mr-2"></span>单向好友<span>', oneWayFriends);
 
+    // QQ分组
+    for (const [groupName, groupItems] of groupMaps) {
+        newGroupMaps.set(groupName, groupItems);
+    }
+
     // 基于模板渲染列表
     const list_html = template(TPL.FRIENDS_GROUP_LIST, { friends: friends, groupMaps: newGroupMaps });
 
diff --git a/src/export/js/messages.js b/src/export/js/messages.js
index 4a2a460..c048f16 100644
--- a/src/export/js/messages.js
+++ b/src/export/js/messages.js
@@ -50,11 +50,11 @@ $(function() {
             mode: 'lg-fade',
             selector: '.message-lightbox',
             download: false,
-            thumbnail: true,
+            thumbnail: false,
             mousewheel: true,
             commentBox: true,
             loop: false,
-            autoplayVideoOnSlide: true,
+            autoplayVideoOnSlide: false,
             commentsMarkup: '<div id="lg-comment-box" class="lg-comment-box lg-fb-comment-box"><div class="lg-comment-header"><h3 class="lg-comment-title">评论</h3><span class="lg-comment-close lg-icon"></span></div><div class="lg-comment-body"></div></div>'
         });
 
@@ -87,7 +87,7 @@ $(function() {
             mode: 'lg-fade',
             selector: '.comment-img-lightbox',
             download: false,
-            thumbnail: true,
+            thumbnail: false,
             loop: false
         });
         $galleryDom.galleryIns = galleryIns;
@@ -108,4 +108,7 @@ $(function() {
     // 取消懒加载样式
     API.Common.registerImageLoadedEvent();
 
+    // 初始化提示
+    $('[data-toggle="tooltip"]').tooltip();
+
 });
\ No newline at end of file
diff --git a/src/export/js/photos.js b/src/export/js/photos.js
index 0538b93..15e215b 100644
--- a/src/export/js/photos.js
+++ b/src/export/js/photos.js
@@ -47,7 +47,7 @@ $(function() {
         thumbnail: true,
         commentBox: true,
         loop: false,
-        autoplayVideoOnSlide: true,
+        autoplayVideoOnSlide: false,
         commentsMarkup: '<div id="lg-comment-box" class="lg-comment-box lg-fb-comment-box"><div class="lg-comment-header"><h3 class="lg-comment-title">评论</h3><span class="lg-comment-close lg-icon"></span></div><div class="lg-comment-body"></div></div>'
     });
 
@@ -66,4 +66,7 @@ $(function() {
     // 取消懒加载样式
     API.Common.registerImageLoadedEvent();
 
+    // 初始化提示
+    $('[data-toggle="tooltip"]').tooltip();
+
 });
\ No newline at end of file
diff --git a/src/export/js/shares.js b/src/export/js/shares.js
index 5554cf9..d4f56e3 100644
--- a/src/export/js/shares.js
+++ b/src/export/js/shares.js
@@ -48,11 +48,11 @@ $(function() {
             mode: 'lg-fade',
             selector: '.message-lightbox',
             download: false,
-            thumbnail: true,
+            thumbnail: false,
             mousewheel: true,
             commentBox: true,
             loop: false,
-            autoplayVideoOnSlide: true,
+            autoplayVideoOnSlide: false,
             commentsMarkup: '<div id="lg-comment-box" class="lg-comment-box lg-fb-comment-box"><div class="lg-comment-header"><h3 class="lg-comment-title">评论</h3><span class="lg-comment-close lg-icon"></span></div><div class="lg-comment-body"></div></div>'
         });
 
@@ -85,7 +85,7 @@ $(function() {
             mode: 'lg-fade',
             selector: '.comment-img-lightbox',
             download: false,
-            thumbnail: true,
+            thumbnail: false,
             loop: false
         });
         $galleryDom.galleryIns = galleryIns;
diff --git a/src/export/js/sidebar.js b/src/export/js/sidebar.js
index a3dd5cf..9537e83 100644
--- a/src/export/js/sidebar.js
+++ b/src/export/js/sidebar.js
@@ -26,14 +26,14 @@ const initSidebar = function() {
 
     haders.each(function(i, item) {
         const tag = $(this).attr('data-tag') || $(item).get(0).tagName.toLowerCase();
-        var id = API.Utils.newUid();
-        var className = 'item_' + tag;
+        const id = API.Utils.newUid();
+        const className = 'item_' + tag;
         $(item).attr("id", "wow" + id);
         $(item).addClass("wow_head");
         // 显示的内容
         const html = $(this).attr('data-sidebar') || $(this).html();
         $("#AnchorContent").css('max-height', ($(window).height() - 80) + 'px');
-        $("#AnchorContent").append('<li><a class="nav_item ' + className + ' anchor-link text-truncate" title=' + $('<div>' + html + '</div>').text() + ' href="#wow' + id + '">' + "" + "" + html + '</a></li>');
+        $("#AnchorContent").append(`<li><a class="nav_item {0} anchor-link text-truncate" data-toggle="tooltip" data-html="true" title='{1}' href="#wow{2}">{3}</a></li>`.format(className, html, id, html));
     });
 
     $(".anchor-link").click(function() {
diff --git a/src/export/js/videos.js b/src/export/js/videos.js
index c450410..b318171 100644
--- a/src/export/js/videos.js
+++ b/src/export/js/videos.js
@@ -1,18 +1,10 @@
 $(function() {
 
     // 指定年份的页面
-    const isYearPage = yearItems !== '<%:=JSON.stringify(videos)%>';
-    if (isYearPage) {
-        videos = JSON.parse(yearItems);
+    if (targetYear !== 'ALL') {
+        videos = videos.filter(item => new Date((item.uploadtime || item.uploadTime) * 1000).getFullYear() == targetYear);
     }
 
-    // 获取模板元素
-    const videos_tpl = document.getElementById('videos_tpl').innerHTML;
-    // 生成模板
-    const videos_html = template(videos_tpl, { videos: videos || [] });
-    // 渲染模板到页面
-    $("#lightgallery").html(videos_html);
-
     // 图片懒加载
     lazyload();
 
@@ -42,7 +34,7 @@ $(function() {
         thumbnail: true,
         commentBox: true,
         loop: false,
-        autoplayVideoOnSlide: true,
+        autoplayVideoOnSlide: false,
         commentsMarkup: '<div id="lg-comment-box" class="lg-comment-box lg-fb-comment-box"><div class="lg-comment-header"><h3 class="lg-comment-title">评论</h3><span class="lg-comment-close lg-icon"></span></div><div class="lg-comment-body"></div></div>'
     });
     $gallery.galleryIns = galleryIns;
@@ -60,4 +52,7 @@ $(function() {
     // 取消懒加载样式
     API.Common.registerImageLoadedEvent();
 
+    // 初始化提示
+    $('[data-toggle="tooltip"]').tooltip();
+
 });
\ No newline at end of file
diff --git a/src/html/about.html b/src/html/about.html
index cc21649..67bee90 100644
--- a/src/html/about.html
+++ b/src/html/about.html
@@ -9,6 +9,7 @@
     <title>QQ空间导出助手-关于</title>
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
 </head>
 
 <body>
diff --git a/src/html/indicator.html b/src/html/indicator.html
index 964bbf0..96f011f 100644
--- a/src/html/indicator.html
+++ b/src/html/indicator.html
@@ -14,87 +14,123 @@ <h5 class="modal-title h5" id="exampleModalLongTitle">QQ空间导出助手</h5>
 				</button>
             </div>
             <div class="modal-body">
-                <h6 class="h6" id="backupStatus">正在收集QQ空间数据，<span style="color:red">请不要关闭或刷新当前页面和打开新的QQ空间页面。</span></h6>
+                <h6 class="h6" id="backupStatus">正在采集QQ空间数据，请不要<span style="color:red">关闭、刷新、或打开新的</span>QQ空间页面。</h6>
                 <h6 class="h6">如若初次使用，请先查看
-                    <a href="javascript:void(0)" class="skipLink" data-link="https://github.com/ShunCai/QZoneExport/wiki/Privacy-Policy">隐私政策</a>
-                    与
-                    <a class="skipLink" href="javascript:void(0)" data-link="https://github.com/ShunCai/QZoneExport/wiki/Question">常见问题</a>
-                    ！如遇长时间无动静、卡死等，可点击
-                    <a class="skipLink" href="javascript:void(0)" data-link="html/about.html">这里</a>
-                    反馈问题
+                    <a href="javascript:void(0)" class="skipLink" data-link="https://github.com/ShunCai/QZoneExport/wiki/Privacy-Policy">隐私政策</a> 与
+                    <a class="skipLink" href="javascript:void(0)" data-link="https://github.com/ShunCai/QZoneExport/wiki/Question">常见问题</a> ！
                 </h6>
+                <h6 class="h6">如遇长时间无动静、卡死等，可点击<a class="skipLink" href="javascript:void(0)" data-link="html/about.html">这里</a>查看反馈渠道并反馈问题！</h6>
                 <h6 class="h6" id="backupCurrentTab">备份过程中，建议浏览器停留在当前页面，可加快备份速度！</h6>
                 <hr />
-                <div class="container">
-                    <p id="InitIncrement_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Filter_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Full_Content_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_More_Images_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Voices_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Comments_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Like_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Visitor_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Images_Mime_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Messages_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Blogs_Tips" style="font-size: medium;"></p>
-                    <p id="Blogs_Content_Tips" style="font-size: medium;"></p>
-                    <p id="Blogs_Comments_Tips" style="font-size: medium;"></p>
-                    <p id="Blogs_Like_Tips" style="font-size: medium;"></p>
-                    <p id="Blogs_Visitor_Tips" style="font-size: medium;"></p>
-                    <p id="Blogs_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Blogs_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Diaries_Tips" style="font-size: medium;"></p>
-                    <p id="Diaries_Content_Tips" style="font-size: medium;"></p>
-                    <p id="Diaries_Comments_Tips" style="font-size: medium;"></p>
-                    <p id="Diaries_Like_Tips" style="font-size: medium;"></p>
-                    <p id="Diaries_Visitor_Tips" style="font-size: medium;"></p>
-                    <p id="Diaries_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Diaries_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Boards_Tips" style="font-size: medium;"></p>
-                    <p id="Boards_Images_Mime_Tips" style="font-size: medium;"></p>
-                    <p id="Boards_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Boards_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Friends_Tips" style="font-size: medium;"></p>
-                    <p id="Friends_Time_Tips" style="font-size: medium;"></p>
-                    <p id="Friends_Access_Tips" style="font-size: medium;"></p>
-                    <p id="Friends_Care_Tips" style="font-size: medium;"></p>
-                    <p id="Friends_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Favorites_Tips" style="font-size: medium;"></p>
-                    <p id="Favorites_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Favorites_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Shares_Tips" style="font-size: medium;"></p>
-                    <p id="Shares_Comments_Tips" style="font-size: medium;"></p>
-                    <p id="Shares_Like_Tips" style="font-size: medium;"></p>
-                    <p id="Shares_Visitor_Tips" style="font-size: medium;"></p>
-                    <p id="Shares_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Shares_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Visitors_Tips" style="font-size: medium;"></p>
-                    <p id="Visitors_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Visitors_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Albums_Comments_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Albums_Like_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Albums_Visitor_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Images_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Images_Mime_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Images_Info_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Images_Comments_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Images_Like_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Images_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Photos_Images_Export_Other_Tips" style="font-size: medium;"></p>
-                    <p id="Videos_Tips" style="font-size: medium;"></p>
-                    <p id="Videos_Comments_Tips" style="font-size: medium;"></p>
-                    <p id="Videos_Like_Tips" style="font-size: medium;"></p>
-                    <p id="Videos_Export_Tips" style="font-size: medium;"></p>
-                    <p id="Common_File_Tips" style="font-size: medium;"></p>
-                    <p id="Common_Thunder_Tips" style="font-size: medium;"></p>
-                    <p id="Common_Thunder_Link_Tips" style="font-size: medium;"></p>
-                    <p id="Common_Browser_Tips" style="font-size: medium;"></p>
-                    <p id="Common_Aria2_Tips" style="font-size: medium;"></p>
+                <div id="backupIndicator" class="container">
+                    <p id="InitIncrement_Tips"></p>
+                    <details id="Messages_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">说说</span>模块数据，请稍后...</summary>
+                        <p id="Messages_Tips"></p>
+                        <p id="Messages_Filter_Tips"></p>
+                        <p id="Messages_Full_Content_Tips"></p>
+                        <p id="Messages_More_Images_Tips"></p>
+                        <p id="Messages_Voices_Tips"></p>
+                        <p id="Messages_Comments_Tips"></p>
+                        <p id="Messages_Like_Tips"></p>
+                        <p id="Messages_Visitor_Tips"></p>
+                        <p id="Messages_Images_Mime_Tips"></p>
+                        <p id="Messages_Export_Tips"></p>
+                        <p id="Messages_Export_Other_Tips"></p>
+                    </details>
+                    <details id="Blogs_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">日志</span>模块数据，请稍后...</summary>
+                        <p id="Blogs_Tips"></p>
+                        <p id="Blogs_Content_Tips"></p>
+                        <p id="Blogs_Comments_Tips"></p>
+                        <p id="Blogs_Like_Tips"></p>
+                        <p id="Blogs_Visitor_Tips"></p>
+                        <p id="Blogs_Export_Tips"></p>
+                        <p id="Blogs_Export_Other_Tips"></p>
+                    </details>
+                    <details id="Diaries_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">私密日记</span>模块数据，请稍后...</summary>
+                        <p id="Diaries_Tips"></p>
+                        <p id="Diaries_Content_Tips"></p>
+                        <p id="Diaries_Comments_Tips"></p>
+                        <p id="Diaries_Like_Tips"></p>
+                        <p id="Diaries_Visitor_Tips"></p>
+                        <p id="Diaries_Export_Tips"></p>
+                        <p id="Diaries_Export_Other_Tips"></p>
+                    </details>
+                    <details id="Boards_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">留言板</span>模块数据，请稍后...</summary>
+                        <p id="Boards_Tips"></p>
+                        <p id="Boards_Images_Mime_Tips"></p>
+                        <p id="Boards_Export_Tips"></p>
+                        <p id="Boards_Export_Other_Tips"></p>
+                    </details>
+                    <details id="Friends_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">QQ好友</span>模块数据，请稍后...</summary>
+                        <p id="Friends_Tips"></p>
+                        <p id="Friends_Time_Tips"></p>
+                        <p id="Friends_Access_Tips"></p>
+                        <p id="Friends_Care_Tips"></p>
+                        <p id="Friends_Export_Tips"></p>
+                    </details>
+                    <details id="Favorites_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">收藏夹</span>模块数据，请稍后...</summary>
+                        <p id="Favorites_Tips"></p>
+                        <p id="Favorites_Export_Tips"></p>
+                        <p id="Favorites_Export_Other_Tips"></p>
+                    </details>
+                    <details id="Shares_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">分享</span>模块数据，请稍后...</summary>
+                        <p id="Shares_Tips"></p>
+                        <p id="Shares_Comments_Tips"></p>
+                        <p id="Shares_Like_Tips"></p>
+                        <p id="Shares_Visitor_Tips"></p>
+                        <p id="Shares_Export_Tips"></p>
+                        <p id="Shares_Export_Other_Tips"></p>
+                    </details>
+                    <details id="Visitors_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">访客</span>模块数据，请稍后...</summary>
+                        <p id="Visitors_Tips"></p>
+                        <p id="Visitors_Export_Tips"></p>
+                        <p id="Visitors_Export_Other_Tips"></p>
+                    </details>
+                    <details id="Photos_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">相册</span>模块数据，请稍后...</summary>
+                        <p id="Photos_Tips"></p>
+                        <p id="Photos_Albums_Comments_Tips"></p>
+                        <p id="Photos_Albums_Like_Tips"></p>
+                        <p id="Photos_Albums_Visitor_Tips"></p>
+                        <p id="Photos_Images_Tips"></p>
+                        <p id="Photos_Images_Mime_Tips"></p>
+                        <p id="Photos_Images_Info_Tips"></p>
+                        <p id="Photos_Images_Comments_Tips"></p>
+                        <p id="Photos_Images_Like_Tips"></p>
+                        <p id="Photos_Export_Tips"></p>
+                        <p id="Photos_Export_Other_Tips"></p>
+                        <p id="Photos_Images_Export_Tips"></p>
+                        <p id="Photos_Images_Export_Other_Tips"></p>
+                    </details>
+                    <details id="Videos_Row_Infos_Tips" class="row">
+                        <summary>正在采集<span class="text-primary">视频</span>模块数据，请稍后...</summary>
+                        <p id="Videos_Tips"></p>
+                        <p id="Videos_Comments_Tips"></p>
+                        <p id="Videos_Like_Tips"></p>
+                        <p id="Videos_Export_Tips"></p>
+                    </details>
+                    <details id="Common_Row_Infos_Tips" class="row">
+                        <summary>正在处理<span class="text-primary">其它</span>模块，请稍后...</summary>
+                        <p id="Init_User_Info_Export_Tips"></p>
+                        <p id="Init_User_Info_Export_Other_Tips"></p>
+                        <p id="User_Config_Infos_Tips"></p>
+                        <p id="Backup_Save_Tips"></p>
+                        <p id="Backup_Export_Tips"></p>
+                        <p id="Common_File_Tips"></p>
+                        <p id="Common_Thunder_Tips"></p>
+                        <p id="Common_Thunder_Clipboard_Tips"></p>
+                        <p id="Common_Thunder_Link_Tips"></p>
+                        <p id="Common_Browser_Tips"></p>
+                        <p id="Common_Aria2_Tips"></p>
+                    </details>
                 </div>
                 <br />
                 <div id="progress" class="progress" style="display: none;">
diff --git a/src/html/options.html b/src/html/options.html
index 4f6f4f0..a68514b 100644
--- a/src/html/options.html
+++ b/src/html/options.html
@@ -22,6 +22,7 @@
     <script src="https://cdn.jsdelivr.net/npm/x-editable-4-bs4@2.2.0/dist/bootstrap4-editable/js/bootstrap-editable.min.js" integrity="sha256-F2w/rRTJCTminpQHTIZ69RCFJyyeTThqqNeGbhxaY9A=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/extensions/resizable/bootstrap-table-resizable.min.js" integrity="sha256-bnx3qhjwjuNaU+aDr622pnYc6QFjZ5fnpSqp6FWWhBs=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/tempusdominus-bootstrap-4@5.39.0/build/js/tempusdominus-bootstrap-4.min.js" integrity="sha256-VpqYzVoiXWnJ6OWGzqbreWjWS5pu3mLoqyQSLyQD6aE=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
 </head>
 
 <body>
@@ -94,13 +95,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Messages">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">说说文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即说说的配图、语音、视频、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法查看多媒体内容"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为发表时间，表示上次备份时间之前的内容(修改、点赞、评论、最近访问等)都不会重新获取，如上次备份后，说说新增/删除了评论，增量备份完成后，新增/删除的评论无法查看，但如若上次备份后，新发表了说说，那该说说将会备份！又比如上次备份后，删除了说说，该说说仍会存在备份中不会被删除！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="messages_increment_time_row">
@@ -361,13 +356,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Blogs">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">日志文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即日志的配图、语音、视频、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法查看多媒体内容"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为发表时间，表示上次备份时间之前的内容(修改、点赞、评论、最近访问等)都不会重新获取，如上次备份后，日志新增/删除了评论，增量备份完成后，新增/删除的评论无法查看，但如若上次备份后，新发表了日志，那该日志将会备份！又比如上次备份后，删除了日志，该日志仍会存在备份中不会被删除！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="blogs_increment_time_row">
@@ -396,7 +385,7 @@ <h5 style="color:cadetblue">日志选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <small class="text-muted">日志列表的展示方式：表格：表格方式展示、列表：普通列表展示，仅适用HTML备份方式</small>
+                                        <small class="text-muted">日志列表的查看/展示方式，表格：列表以表格方式展示；列表：普通列表展示，仅适用HTML备份方式</small>
                                     </div>
                                 </div>
                                 <div class="form-group row">
@@ -560,13 +549,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Diaries">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">日记文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即日记的配图、语音、视频、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法查看多媒体内容"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为发表时间，表示上次备份时间之前的内容(修改、点赞、评论、最近访问等)都不会重新获取，如上次备份后，日记新增/删除了评论，增量备份完成后，新增/删除的评论无法查看，但如若上次备份后，新发表了日记，那该日记将会备份！又比如上次备份后，删除了日记，该日记仍会存在备份中不会被删除！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="diaries_increment_time_row">
@@ -595,7 +578,7 @@ <h5 style="color:cadetblue">日记选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <small class="text-muted">日记列表的展示方式：表格：表格方式展示、列表：普通列表展示，仅适用HTML备份方式</small>
+                                        <small class="text-muted">日记列表列表的查看/展示方式，表格：列表以表格方式展示；列表：普通列表展示，仅适用HTML备份方式</small>
                                     </div>
                                 </div>
                                 <div class="form-group row">
@@ -747,13 +730,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Photos">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">相片文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即相片的配图、语音、视频、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法正常显示相片"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为发表时间，表示上次备份时间之前的内容(修改、点赞、评论、最近访问等)都不会重新获取，如上次备份后，相册或相片新增/删除了评论，增量备份完成后，新增/删除的评论无法查看，但如若上次备份后，新发表了相册或相片，那该相册或相片将会备份！又比如上次备份后，删除了相册或相片，该相册或相片仍会存在备份中不会被删除！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="photos_increment_time_row">
@@ -772,6 +749,32 @@ <h5 style="color:cadetblue">公共选项：</h5>
                                 </div>
                                 <h5 style="color:cadetblue">相册选项：</h5>
                                 <hr>
+                                <div class="form-group row">
+                                    <label for="photos_albums_sort_type" class="col-sm-auto col-form-label">排序方式：</label>
+                                    <div class="col-sm-2">
+                                        <select id="photos_albums_sort_type" class="custom-select">
+											<option value="4" selected >最新上传在前</option>
+											<option value="1">最新创建在前</option>
+											<option value="0">最新创建在后</option>
+											<option value="2">自定义排序</option>
+										</select>
+                                    </div>
+                                    <div class="col-sm-auto">
+                                        <small class="text-muted">相册的排序方式</small>
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label for="photos_albums_folder_rename_type" class="col-sm-auto col-form-label">命名方式：</label>
+                                    <div class="col-sm-2">
+                                        <select id="photos_albums_folder_rename_type" class="custom-select">
+											<option value="Default" selected >相册名</option>
+											<option value="Sort">排序号+相册名</option>
+										</select>
+                                    </div>
+                                    <div class="col-sm-auto">
+                                        <small class="text-muted">相册备份文件夹的命名方式</small>
+                                    </div>
+                                </div>
                                 <div class="form-group row">
                                     <label class="col-sm-auto col-form-label">查询间隔：</label>
                                     <div class="col-sm-1">
@@ -829,12 +832,33 @@ <h5 style="color:cadetblue">相册选项：</h5>
                                 </div>
                                 <h5 style="color:cadetblue">相片选项：</h5>
                                 <hr>
+                                <div class="form-group row">
+                                    <label for="photos_file_structure_type" class="col-sm-auto col-form-label">归类方式：</label>
+                                    <div class="col-sm-2">
+                                        <select id="photos_file_structure_type" class="custom-select">
+											<option value="File" selected >相册</option>
+											<option value="Year">年份</option>
+											<option value="Month">月份</option>
+											<option value="Date">日期</option>
+										</select>
+                                    </div>
+                                    <div class="col-sm-auto">
+                                        <small class="text-muted">基于相册的相片的文件归类存放方式
+                                            <span class="fa fa-question-circle-o fa-lg" data-toggle="tooltip" data-html="true" title='
+                                            相册：相册/相片<br>
+                                            年份：相册/年/相片<br>
+                                            月份：相册/年/月/相片<br>
+                                            日期：相册/年/月/日/相片<br>
+                                            时间优先取原图的拍摄时间，非原图或无拍摄时间，再取相片上传时间'></span>
+                                        </small>
+                                    </div>
+                                </div>
                                 <div class="form-group row">
                                     <label for="photos_images_list_type" class="col-sm-auto col-form-label">列表类型：</label>
                                     <div class="col-sm-2">
                                         <select id="photos_images_list_type" class="custom-select">
-											<option value="Default" selected>默认列表</option>
-											<option value="Detail">详情列表</option>
+											<option value="Default">默认列表</option>
+											<option value="Detail" selected>详情列表</option>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
@@ -1080,13 +1104,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Videos">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">视频文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即视频的配图、语音、视频、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法查看多媒体内容"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为发表时间，表示上次备份时间之前的内容(修改、点赞、评论、最近访问等)都不会重新获取，如上次备份后，视频新增/删除了评论，增量备份完成后，新增/删除的评论无法查看，但如若上次备份后，新发表了视频，那该视频将会备份！又比如上次备份后，删除了视频，该视频仍会存在备份中不会被删除！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="videos_increment_time_row">
@@ -1105,6 +1123,27 @@ <h5 style="color:cadetblue">公共选项：</h5>
                                 </div>
                                 <h5 style="color:cadetblue">视频选项：</h5>
                                 <hr>
+                                <div class="form-group row">
+                                    <label for="videos_file_structure_type" class="col-sm-auto col-form-label">归类方式：</label>
+                                    <div class="col-sm-2">
+                                        <select id="videos_file_structure_type" class="custom-select">
+											<option value="File" selected >默认</option>
+											<option value="Year">年份</option>
+											<option value="Month">月份</option>
+											<option value="Date">日期</option>
+										</select>
+                                    </div>
+                                    <div class="col-sm-auto">
+                                        <small class="text-muted">基于视频文件归类存放方式
+                                            <span class="fa fa-question-circle-o fa-lg" data-toggle="tooltip" data-html="true" title='
+                                            默认：Videos/视频文件<br>
+                                            年份：Videos/年/视频文件<br>
+                                            月份：Videos/年/月/视频文件<br>
+                                            日期：Videos/年/月/日/视频文件<br>
+                                            时间取视频的上传时间'></span>
+                                        </small>
+                                    </div>
+                                </div>
                                 <div class="form-group row">
                                     <label class="col-sm-auto col-form-label">查询间隔：</label>
                                     <div class="col-sm-1">
@@ -1221,13 +1260,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Boards">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">留言文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即留言的配图、语音、留言、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法查看多媒体内容"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为发表时间，表示上次备份时间之前的内容(新增/删除留言或回复)都不会重新获取，如上次备份后，新发表了留言，那该留言将会备份！又比如上次备份后，删除了留言，该留言仍会存在备份中不会被删除！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="boards_increment_time_row">
@@ -1325,7 +1358,7 @@ <h5 style="color:cadetblue">好友选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <small class="text-muted">好友的展示方式：表格：表格方式展示、列表：普通列表展示，仅适用HTML备份方式</small>
+                                        <small class="text-muted">好友列表的查看/展示方式，表格：表格方式展示；列表：普通列表展示，仅适用HTML备份方式</small>
                                     </div>
                                 </div>
                                 <div class="form-group row">
@@ -1404,13 +1437,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Favorites">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">收藏文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即收藏的配图、语音、收藏、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法查看多媒体内容"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为发表时间，表示上次备份时间之前的内容(新增/删除收藏)都不会重新获取，如上次备份后，新增了收藏，那该收藏将会备份！又比如上次备份后，删除了收藏，该收藏仍会存在备份中不会被删除！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="favorites_increment_time_row">
@@ -1485,13 +1512,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Shares">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">分享文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即分享的配图、语音、视频、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法查看多媒体内容"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为发表时间，表示上次备份时间之前的内容(修改、点赞、评论、最近访问等)都不会重新获取，如上次备份后，分享新增/删除了评论，增量备份完成后，新增/删除的评论无法查看，但如若上次备份后，新发表了分享，那该分享将会备份！又比如上次备份后，删除了分享，该分享仍会存在备份中不会被删除！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="shares_increment_time_row">
@@ -1703,13 +1724,7 @@ <h5 style="color:cadetblue">公共选项：</h5>
 										</select>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <button type="button" class="btn btn-outline-danger reset_increment" data-toggle="tooltip" title="清除已备份数据与重置上次备份时间" data-module="Visitors">重置</button>
-                                    </div>
-                                    <div class="col-sm-auto">
-                                        <small class="text-muted">
-                                            <span class="text-danger ml-2">访客文件增量</span><span class="fa fa-question-circle-o fa-lg" title="即访客最近访问的配图、表情增量下载，已经下载过的文件不再重复下载，但前提是保留上次备份的文件，否则文案展示时，无法查看多媒体内容"></span>
-                                            <span class="text-danger ml-2">增量维度</span><span class="fa fa-question-circle-o fa-lg" title="增量维度为访问时间，表示上次备份时间之前的访客都不会重新获取，如上次备份后，新增了访客，那该分享将会备份！"></span>
-                                        </small>
+                                        <small class="text-muted">更多详情，请查看<a href='https://www.lvshuncai.com/qzone-export.html#配置-增量备份'>增量备份配置说明</a></small>
                                     </div>
                                 </div>
                                 <div class="form-group row" id="visitors_increment_time_row">
@@ -1779,8 +1794,9 @@ <h5 style="color:cadetblue">文件下载：</h5>
                                         <select id="common_download_type" class="custom-select" aria-describedby="common_download_type_help">
 											<option value="Browser" selected>浏览器</option>
 											<option value="Aria2">Aria2/Motrix</option>
-											<option value="Thunder">迅雷</option>
-											<option value="Thunder_Link">迅雷下载链接</option>
+											<option value="Thunder">迅雷（助手唤醒）</option>
+											<option value="Thunder_Clipboard">迅雷（剪切板唤醒）</option>
+											<option value="Thunder_Link">迅雷（下载链接）</option>
 											<option value="QZone">QQ空间外链</option>
 										</select>
                                     </div>
@@ -1814,7 +1830,7 @@ <h5 style="color:cadetblue">文件下载：</h5>
                                 <div id="common_thunder_task_count_row" class="form-group row" style="display: none;">
                                     <label for="common_thunder_task_count" class="col-sm-auto col-form-label">迅雷最大任务：</label>
                                     <div class="col-sm-2">
-                                        <input type="number" min="1000" class="form-control" id="common_thunder_task_count" placeholder="迅雷任务数" aria-describedby="common_thunder_task_count_help">
+                                        <input type="number" min="50" class="form-control" id="common_thunder_task_count" placeholder="迅雷任务数" aria-describedby="common_thunder_task_count_help">
                                     </div>
                                     <div class="col-sm-auto">
                                         <small id="common_thunder_task_count_help" class="text-muted">迅雷的最大任务数，当值为5000，照片数量为10000时，则唤起2次迅雷，每次5000个任务，不宜太大，太大将无法唤起迅雷。</small>
@@ -1841,15 +1857,17 @@ <h5 style="color:cadetblue">文件下载：</h5>
                                 </div>
                                 <!-- 浏览器下载相关配置 -->
                                 <div id="common_download_status_row" class="form-group row" style="display: none;">
-                                    <div class="col-sm-auto">启用状态栏：</div>
-                                    <div class="col-sm-2">
+                                    <div class="col-sm-auto">隐藏状态栏：</div>
+                                    <div class="col-sm-2 ml-3">
                                         <div class="custom-control custom-checkbox">
                                             <input type="checkbox" class="custom-control-input" id="common_download_status">
                                             <label class="custom-control-label" for="common_download_status" aria-describedby="common_download_status_help"></label>
                                         </div>
                                     </div>
                                     <div class="col-sm-auto">
-                                        <small id="common_download_status_help" class="text-muted">勾选表示启用，禁用后，会影响整个浏览器下载文件时无状态栏提醒，适用于下载方式为浏览器</small>
+                                        <small id="common_download_status_help" class="text-muted">勾选将隐藏浏览器底部的下载内容栏，也就隐藏浏览器的下载通知
+                                            <span class="fa fa-question-circle-o fa-lg" data-toggle="tooltip" title="影响范围是全局，也就是说，隐藏后，自己手动下载其它任务也无提醒"></span>
+                                        </small>
                                     </div>
                                 </div>
                                 <!-- Aria2下载相关配置 -->
diff --git a/src/html/popup.html b/src/html/popup.html
index 30eb2e2..2fcc551 100644
--- a/src/html/popup.html
+++ b/src/html/popup.html
@@ -3,24 +3,25 @@
 
 <head>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.18/dist/css/bootstrap-select.min.css" integrity="sha256-wiMI7buOV5UBzdWN4s4kXqE/LZ794hx5oJOOIQlDBaM=" crossorigin="anonymous">
+    <link rel="stylesheet" href="../vendor/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="../vendor/bootstrap-select/css/bootstrap-select.min.css">
     <link href="../css/popup.css" rel="stylesheet" type="text/css">
     <title>QQ空间导出助手</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.18/dist/js/bootstrap-select.min.js" integrity="sha256-qo0Cam4XJ0QQ06XnCiCFYBh3GDXU45j3lpUp+em2yBU=" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.18/dist/js/i18n/defaults-zh_CN.min.js" integrity="sha256-zHB2UnROJx8/VorUnkT+nsUKnTsZ7HemVEqeMyOZp/Q=" crossorigin="anonymous"></script>
+    <script src="../vendor/jquery/jquery.min.js"></script>
+    <script src="../vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+    <script src="../vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+    <script src="../vendor/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+    <script src="../vendor/lodash/lodash.min.js"></script>
 </head>
 
 <body>
     <div>
         <h5>QQ空间导出助手</h5>
         <hr>
-        <p>登录QQ：<span title="当前已经登录的QQ号" style="color: red" id="loginUin"></span></p>
-        <p>备份QQ：<span title="当前准备备份的QQ号，个人模式时为自己的QQ号，他人模式时为他人的QQ号" style="color: red" id="targetUin"></span></p>
-        <p>当前模式：<span title="个人模式：将备份自己的空间数据，他人模式，将备份他人的空间数据，将会在他人空间留下访客记录，当然，如果你是黄钻就当我没说。为啥黄钻就当我没说？真羡慕你看不懂。。。" style="color: red" id="userType"></span></p>
+        <p>登录QQ：<span class="font-weight-bold font-italic" style="color: red" id="loginUin"></span></p>
+        <p>备份QQ：<span class="font-weight-bold font-italic" style="color: red" id="targetUin"></span></p>
+        <p>备份模式：<span class="font-weight-bold font-italic" style="color: red" id="userType"></span></p>
         <hr>
         <div class="custom-control custom-checkbox custom-control-inline">
             <input type="checkbox" class="custom-control-input" id="Messages" name="exportType" value="Messages" checked>
@@ -66,7 +67,7 @@ <h5>QQ空间导出助手</h5>
             <div id="export_albums_div" class="form-group row" style="display: none;">
                 <label for="export_albums" class="col-sm-1 col-form-label">相册列表：</label>
                 <div class="col-sm-2">
-                    <select id="export_albums" class="form-control selectpicker" data-live-search="true" multiple title="请选择相册" data-live-search-placeholder="搜索相册" data-actions-box="true" data-selected-text-format="count > 3">
+                    <select id="export_albums" class="form-control selectpicker" data-header="选择备份相册" data-live-search="true" multiple title="请选择相册" data-live-search-placeholder="搜索相册" data-actions-box="true" data-selected-text-format="count > 3">
                         <optgroup label="分类">
                             <option value="1">相册一</option>
                             <option value="2">相册二</option>
@@ -87,7 +88,7 @@ <h5>QQ空间导出助手</h5>
             <button id="backup" type="button" class="btn btn-primary">开始备份</button>
         </div>
     </div>
-	<script src="../js/utils.js"></script>
+    <script src="../js/utils.js"></script>
     <script src="../js/popup.js"></script>
 </body>
 
diff --git a/src/html/tools.html b/src/html/tools.html
index 53960ba..01678b9 100644
--- a/src/html/tools.html
+++ b/src/html/tools.html
@@ -6,15 +6,18 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/bootstrap-table.min.css" integrity="sha256-ZD9Tb2mCr01yh68j+JrUV91+SoL5xpUzChErCIHDCko=" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tempusdominus-bootstrap-4@5.1.2/build/css/tempusdominus-bootstrap-4.min.css" integrity="sha256-vi00YWza8MRCSI5GdsFLptAZIULny5MPn62PxEf/ZTY=" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery.loadmask@1.0.1/jquery.loadmask.css" integrity="sha256-b1bMgmqsZl8mmXnqSwZDTgToEQDfwBOzTFPnbG1xS6Y=" crossorigin="anonymous">
     <link rel="stylesheet" href="../css/options.css">
     <link rel="icon" href="../img/icon-128.png">
     <meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <title>QQ空间导出助手-选项</title>
-	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/bootstrap-table.min.js" integrity="sha256-BqVxqb61C9Xd1gUXFZd13+wfPnmP/zj7EXriNQ3Jup0=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/locale/bootstrap-table-zh-CN.min.js" integrity="sha256-pE+tLWBaNzEJufpbligmXg6jcxEHGXrWjQe4rv3yUNY=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery.loadmask@1.0.1/jquery.loadmask.js" integrity="sha256-H6wQZnEUqzmTaAblQuLvp+cLdxre7XWdRyb3llskfAU=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
 </head>
 
 <body>
@@ -45,11 +48,12 @@
                 <div class="container-fluid">
                     <nav>
                         <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                            <a class="nav-item nav-link active" id="nav-messages-tab" data-toggle="tab" href="#nav-messages" role="tab" aria-controls="nav-messages" aria-selected="false">本地相册</a>
+                            <a class="nav-item nav-link active" id="nav-local-albums-tab" data-toggle="tab" href="#nav-local-albums" role="tab" aria-controls="nav-local-albums" aria-selected="true">本地相册</a>
+                            <a class="nav-item nav-link" id="nav-backedup-tab" data-toggle="tab" href="#nav-backedup" role="tab" aria-controls="nav-backedup" aria-selected="false">备份管理</a>
                         </div>
                     </nav>
                     <div class="tab-content" id="nav-tabContent">
-                        <div class="tab-pane fade show active" id="nav-messages" role="tabpanel" aria-labelledby="nav-messages-tab">
+                        <div class="tab-pane fade show active" id="nav-local-albums" role="tabpanel" aria-labelledby="nav-local-albums-tab">
                             <p class="mt-2 text-muted">基于已备份的QQ空间数据，添加本地相册，仅适用HTML备份方式</p>
                             <div id="toolbar">
                                 <button id="selectFolder" class="btn btn-secondary" data-toggle="tooltip" title="选择QQ空间备份文件夹">
@@ -62,6 +66,38 @@
                             </div>
                             <table id="localAlbums" data-toolbar="#toolbar"></table>
                         </div>
+                        <div class="tab-pane fade" id="nav-backedup" role="tabpanel" aria-labelledby="nav-backedup-tab">
+                            <p class="mt-2 text-muted">查看与管理已备份的数据，仅适用于增量备份</p>
+                            <div class="form-group row">
+                                <label for="backedup" class="col-sm-auto col-form-label">目标QQ：</label>
+                                <div class="col-sm-10">
+                                    <select id="backedup-uin" class="custom-select">
+                                    </select>
+                                </div>
+                            </div>
+                            <div id="backedup-toolbar">
+                                <button id="importBackedup" class="btn btn-primary" title="导入指定QQ的备份信息">导入</button>
+                                <button id="exportBackedup" class="btn btn-secondary" title="导出指定QQ的备份信息">导出</button>
+                                <button id="resetBackedup" class="btn btn-danger" title="删除指定QQ的备份信息">删除</button>
+                                <small id='backedup-tips' class="ml-3 text-danger">不勾选模块时，全量导入/删除；勾选模块时，仅导入/删除勾选的模块</small>
+                            </div>
+                            <table id="backedupItems" data-toolbar="#backedup-toolbar"></table>
+                            <div id="albumTableModal" data-backdrop="static" data-keyboard="false" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="file-list-lable" aria-hidden="true">
+                                <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
+                                    <div class="modal-content">
+                                        <div class="modal-header">
+                                            <h5 class="modal-title">相册列表</h5>
+                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                                <span aria-hidden="true">&times;</span>
+                                            </button>
+                                        </div>
+                                        <div class="modal-body">
+                                            <table id="albumTable"></table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/src/js/api.js b/src/js/api.js
index 6ce4d05..96b4aaf 100644
--- a/src/js/api.js
+++ b/src/js/api.js
@@ -200,7 +200,7 @@ const API = {
     Favorites: {}, // 收藏模块
     Shares: {}, // 分享模块
     Visitors: {}, // 访问模块
-    Statistics: {}, // 数据统计模块
+    Statistics: {} // 数据统计模块
 };
 
 /**
@@ -543,31 +543,47 @@ API.Utils = {
      * @param {string} url 请求URL
      */
     get(url, params) {
+        // 重试
+        const retryRequest = (ajax, reject, error) => {
+            if (ajax.retries > 0) {
+                ajax.retries--;
+                // 指定秒数后继续请求
+                setTimeout(function() {
+                    console.warn('请求接口异常，正在尝试重试', url, params, ajax.retries);
+                    $.ajax(ajax);
+                }, ajax.retryInterval);
+                return;
+            }
+            console.info('重试次数已用完，准备回调');
+            reject(error);
+        }
         return new Promise(function(resolve, reject) {
             $.ajax({
                 url: url,
                 type: 'GET',
                 data: params,
-                // async: false,
-                // cache: false,
                 retries: QZone_Config.Common.listRetryCount, // 重试次数
                 retryInterval: QZone_Config.Common.listRetrySleep * 1000, // 每次重试间隔秒数
                 success: function(result) {
+                    try {
+                        const resJson = API.Utils.toJson(result);
+                        if (resJson.code === -3000 || resJson.message === '请先登录' ||
+                            resJson.code === -99997 || resJson.message === '出了点小问题，请稍后再试') {
+                            // code = -3000 未登录
+                            // 如果返回未登录，而实际上是已登录，则继续重试，重试后，可能会成功，不成功继续重试，直到重试次数用完
+                            console.warn('接口请求成功，接口处理返回错误', resJson);
+                            retryRequest(this);
+                            return;
+                        }
+                    } catch (error) {
+                        // 转换JSON错误时，当作成功返回
+                        resolve(result);
+                        return;
+                    }
                     resolve(result);
                 },
                 error: function(xhr, status, error) {
-                    if (this.retries > 0) {
-                        this.retries--;
-                        // 指定秒数后继续请求
-                        let scope = this;
-                        setTimeout(function() {
-                            console.warn('请求接口异常，正在尝试重试', url, params, scope.retries);
-                            $.ajax(scope);
-                        }, this.retryInterval);
-                        return;
-                    }
-                    console.info('重试次数已用完，准备回调');
-                    reject(error);
+                    retryRequest(this, reject, error);
                 }
             });
         });
@@ -691,17 +707,28 @@ API.Utils = {
      * 获取QQ号
      */
     initUin() {
-        // 获取目标QQ
+
         let rs = /\/user\.qzone\.qq\.com\/([\d]+)/.exec(window.location.href);
         if (rs) {
             // 获取登录QQ
             const res = /\d.+/g.exec(API.Utils.getCookie('uin'));
             if (res && res.length > 0) {
+
+                // 当前登录用户信息
+                const $ownerInfoDom = document.querySelector('#QZ_Toolbar_Container > div > div.user-info > a.user-home > span');
                 QZone.Common.Owner.uin = /\d.+/g.exec(API.Utils.getCookie('uin'))[0] - 0;
+                QZone.Common.Owner.name = $ownerInfoDom && $ownerInfoDom.innerText.trim() || '我';
+                QZone.Common.Owner.nickname = QZone.Common.Owner.name;
+
+                // 备份目标用户信息
+                const $targetInfoDom = document.querySelector('#headContainer > div.head-detail > div.head-detail-name > span.user-name.textoverflow');
+
                 QZone.Common.Target = {
                     uin: rs[1] - 0,
                     title: document.title,
-                    description: $('meta[name="description"]').attr("content"),
+                    description: $('meta[name="description"]').attr("content") || document.title,
+                    name: $targetInfoDom && $targetInfoDom.innerText.trim() || 'TA',
+                    nickname: $targetInfoDom && $targetInfoDom.innerText.trim() || 'TA'
                 }
             }
         }
@@ -908,7 +935,7 @@ API.Utils = {
      * 转换HTML特殊字符
      */
     escHTML(content) {
-        var l = { "&amp;": /&/g, "&lt;": /</g, "&gt;": />/g, "&#039;": /\x27/g, "&quot;": /\x22/g };
+        var l = { "&amp;": /&/g, "&lt;": /</g, "&gt;": />/g, "&quot;": /\x22/g };
         for (var i in l) {
             content = content.replace(l[i], i);
         }
@@ -935,8 +962,9 @@ API.Utils = {
      * @param {string} type 转换类型，默认TEXT,可选HTML,MD
      * @param {boolean} isRt 是否是处理转发内容
      * @param {boolean} isSupportedHtml 内容本身是否支持HTML
+     * @param {boolean} isEscHTML 是否全部转换HTML标签
      */
-    formatContent(item, type, isRt, isSupportedHtml) {
+    formatContent(item, type, isRt, isSupportedHtml, isEscHTML) {
         if (typeof item === 'string') {
             // 转换特殊符号
             if (!isSupportedHtml) {
@@ -950,7 +978,7 @@ API.Utils = {
             item = API.Utils.formatMention(item, type);
             // 转换微信表情
             item = API.Common.formatWxEmoji(item, type);
-            return item;
+            return isEscHTML ? API.Utils.escHTML(item) : item;
         }
         var conlist = (isRt && item.rt_con && item.rt_con['conlist']) || item.conlist || [];
         var contents = [];
@@ -994,7 +1022,7 @@ API.Utils = {
                     // 普通说说内容？
                     if (info.con) {
                         // 转换话题
-                        info.custom_display = API.Utils.formatTopic(info.con, type);
+                        info.custom_display = this.formatTopic(this.escHTML(info.con), type);
                         // 转换表情
                         info.custom_display = API.Utils.formatEmoticon(info.custom_display, type);
                         // 转换微信表情
@@ -1015,9 +1043,8 @@ API.Utils = {
                     break;
             }
         }
-        let content = contents.join("");
-        content = content.replace(/^[\s\xA0]+/, "").replace(/[\s\xA0]+$/, "");
-        return content;
+        const content = contents.join("").replace(/^[\s\xA0]+/, "").replace(/[\s\xA0]+$/, "");
+        return isEscHTML ? API.Utils.escHTML(content) : content;
     },
 
     /**
@@ -1079,13 +1106,27 @@ API.Utils = {
      *  @param {integer} time 
      */
     formatDate(time, str) {
-        if (!Number.isInteger(time)) {
+        if (!_.isNumber(time)) {
             return time;
         }
         str = str || 'yyyy-MM-dd hh:mm:ss';
         return new Date(time * 1000).format(str);
     },
 
+    /**
+     * 转换时间
+     *  @param {integer} time 
+     */
+    parseDate(time) {
+        if (_.isNumber(time)) {
+            const sec = time * 1000;
+            if (sec < Date.now()) {
+                return new Date(sec);
+            }
+        }
+        return new Date(time);
+    },
+
     /**
      * 转换时间
      *  @param {integer} time 
@@ -1127,6 +1168,11 @@ API.Utils = {
             // 不基于正则替换，如果JSON本身有这些字符，会被替换掉
             // 懒得折腾了，还是直接截取简单
             json = json.substring(0, json.lastIndexOf(')'));
+        } else {
+            // 是否包含Callback关键字
+            if (json.indexOf('Callback(') > -1) {
+                json = json.substring(json.indexOf('Callback(') + 'Callback('.length);
+            }
         }
 
         try {
@@ -1259,21 +1305,22 @@ API.Utils = {
     downloadByBrowser(task) {
         return new Promise(function(resolve, reject) {
             // 简单克隆
-            let options = JSON.parse(JSON.stringify(task));
+            const newTask = JSON.parse(JSON.stringify(task));
 
             // 删除多余属性
-            delete options.id;
-            delete options.dir;
-            delete options.name;
-            delete options.source;
-            delete options.state;
-            delete options.downloadState;
-            delete options.module;
+            delete newTask.id;
+            delete newTask.dir;
+            delete newTask.name;
+            delete newTask.source;
+            delete newTask.state;
+            delete newTask.downloadState;
+            delete newTask.module;
 
             chrome.runtime.sendMessage({
                 from: 'content',
                 type: 'download_browser',
-                options: options
+                downloadThread: QZone_Config.Common.downloadThread,
+                task: newTask
             }, function(id) {
                 if (chrome.runtime.lastError) {
                     task.setId(0);
@@ -1515,6 +1562,32 @@ API.Utils = {
  */
 API.Common = {
 
+    /**
+     * 基于相片获取相片的文件夹结构路径
+     * @param {Date} dateTime 日期时间
+     * @param {String} fileStructureType 归类方式
+     */
+    getFileStructureFolderPath(dateTime, fileStructureType) {
+        let folder = '';
+        switch (fileStructureType) {
+            case 'Year':
+                // 年份/文件
+                folder = API.Utils.formatDate(dateTime / 1000, 'yyyy年');
+                break;
+            case 'Month':
+                // 年份/月份/文件
+                folder = API.Utils.formatDate(dateTime / 1000, 'yyyy年/MM月');
+                break;
+            case 'Date':
+                // 年份/月份/日期/文件
+                folder = API.Utils.formatDate(dateTime / 1000, 'yyyy年/MM月/dd日');
+                break;
+            default:
+                break;
+        }
+        return folder;
+    },
+
     /**
      * 获取来源类型（该判断不严谨）
      */
@@ -1780,6 +1853,39 @@ API.Common = {
      */
     getModuleRoot(module) {
         return API.Common.getRootFolder() + '/' + QZone[module].ROOT;
+    },
+
+    /**
+     * 获取多媒体路径
+     * @param {string} url 远程URL
+     * @param {string} filepath 本地文件路径
+     * @param {string} sourceType 来源类型
+     */
+    getMediaPath(url, filepath, sourceType) {
+        if (!filepath) {
+            return url;
+        }
+        let res = filepath || url;
+        switch (sourceType) {
+            case 'Messages_HTML':
+                res = '../' + res;
+                break;
+            case 'Photos_HTML':
+                res = '../' + res;
+                break;
+            case 'Photos_MarkDown':
+                res = '../../../' + res;
+                break;
+            case 'Videos_HTML':
+                res = '../' + res;
+                break;
+            case 'Friends_HTML':
+                res = '../' + res;
+                break;
+            default:
+                break;
+        }
+        return res;
     }
 }
 
@@ -1996,6 +2102,9 @@ API.Blogs = {
      * @returns 
      */
     isTemplateBlog(item) {
+        if (!item) {
+            return false;
+        }
         return item.exblogtype == 2 || item.blogType;
     },
 
@@ -2691,6 +2800,21 @@ API.Boards = {
  */
 API.Photos = {
 
+    /**
+     * 基于相片获取相片的文件夹结构路径
+     * @param {Object} photo 相片
+     */
+    getFileStructureFolderPath(photo) {
+
+        // 原图时间、上传时间
+        const dateTime = API.Utils.parseDate((photo.rawshoottime || photo.shootTime) || (photo.uploadtime || photo.uploadTime)).getTime();
+
+        // 文件夹结构
+        const fileStructureType = QZone_Config.Photos.Images.fileStructureType;
+
+        return API.Common.getFileStructureFolderPath(dateTime, fileStructureType);
+    },
+
     /**
      * 获取相片类型
      * @param {string} photo 相片对象
@@ -2707,7 +2831,7 @@ API.Photos = {
                 photoType = "GIF";
                 break;
             case 3:
-                photoType = "PND";
+                photoType = "PNG";
                 break;
             case 4:
                 photoType = "BMP";
@@ -2838,10 +2962,10 @@ API.Photos = {
             "needUserInfo": 1,
             "idcNum": QZone.Common.Target.route || this.getRoute(),
             "mode": 2, // 视图：普通视图
-            "sortOrder": 2, // 排序类型：自定义排序
+            "sortOrder": '2', // 排序类型：0：最新创建在后，1：最新创建在前，2：自定义排序，4：最新上传在前，如未自定义，则默认最新创建在后？
             "pageStart": page * QZone_Config.Photos.pageSize,
             "pageNum": QZone_Config.Photos.pageSize,
-            // "needSave": 1, // 保存视图
+            // "needSave": 1, // 保存排序
             "callbackFun": "shine0",
             "_": Date.now()
         }
@@ -3146,6 +3270,21 @@ API.Photos = {
  */
 API.Videos = {
 
+    /**
+     * 基于相片获取相片的文件夹结构路径
+     * @param {Object} video 相片
+     */
+    getFileStructureFolderPath(video) {
+
+        // 上传时间
+        const dateTime = API.Utils.parseDate(video.uploadtime || video.uploadTime).getTime();
+
+        // 文件夹结构
+        const fileStructureType = QZone_Config.Videos.fileStructureType;
+
+        return API.Common.getFileStructureFolderPath(dateTime, fileStructureType);
+    },
+
     /**
      * 获取视频列表
      * @param {integer} page 当前页
@@ -3239,8 +3378,7 @@ API.Videos = {
      * @param {string} url 视频地址
      */
     getFileName(url) {
-        url = url || '';
-        let result = /http:\/\/(.+)\/(.+\.mp4)\?(.+)/gi.exec(url);
+        let result = /http:\/\/(.+)\/(.+\.mp4)\?(.+)/gi.exec(API.Utils.toHttp(url || ''));
         if (result) {
             return result[2];
         }
@@ -3368,6 +3506,10 @@ API.Favorites = {
                     temp.source_info.video_list = temp.url_info.video_list || [];
                     temp.source_info.music_list = temp.url_info.music_list || [];
                     break;
+                case 2:
+                    // 相片
+                    console.warn('相片类型无需处理多媒体', temp);
+                    break;
                 case 3:
                     // 日志                    
                     temp.source_info.video_list = temp.blog_info.video_list || [];
@@ -3384,6 +3526,10 @@ API.Favorites = {
                     temp.source_info.music_list = temp.shuoshuo_info.music_list || [];
                     temp.shuoshuo_info.detail_shuoshuo_info = temp.shuoshuo_info.detail_shuoshuo_info || {};
                     break;
+                case 6:
+                    // 文本
+                    console.warn('文本类型无需处理多媒体', temp);
+                    break;
                 case 7:
                     // 分享
                     temp.share_info.reason = temp.share_info.reason.split('||')[0];
@@ -3456,6 +3602,12 @@ API.Favorites = {
         return API.Utils.get(REST_URLS.FAVORITE_LIST_URL, params);
     },
 
+    /**
+     * 获取收藏夹分享的URL
+     * @param {object} share_info 收藏夹分享信息
+     */
+
+
     /**
      * 获取收藏夹分享的URL
      * @param {object} share_info 收藏夹分享信息
@@ -3464,17 +3616,24 @@ API.Favorites = {
         if (!share_info) {
             return "#";
         }
+        // 相册分享
+        if (share_info.album_info && Object.keys(share_info.album_info).length > 0) {
+            return 'https://user.qzone.qq.com/{owner_uin}/photo/{id}'.format(share_info.album_info);
+        }
+        // 日志分享
+        if (share_info.blog_info && Object.keys(share_info.blog_info).length > 0) {
+            return 'https://user.qzone.qq.com/{owner_uin}/blog/{id}'.format(share_info.blog_info);
+        }
+        // 音乐分享
         if (share_info.music_list && share_info.music_list.length > 0) {
-            // 音乐分享
             return share_info.music_list[0].music_info.play_url;
         }
+        // 视频分享
         if (share_info.video_list && share_info.video_list.length > 0) {
-            // 视频分享
             return share_info.video_list[0].video_info.play_url;
         }
         return share_info.share_url;
     }
-
 };
 
 
diff --git a/src/js/background.js b/src/js/background.js
index ecfe0d9..52d6d2d 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -29,28 +29,47 @@ let sendMessage = (data, callback) => {
     });
 }
 
+/**
+ * 获取当前任务下载数
+ */
+const getInProgressTask = () => {
+    return new Promise(resolve => {
+        chrome.downloads.search({
+            state: "in_progress"
+        }, function(data) {
+            resolve(data)
+        })
+    })
+}
 
 /**
- * 浏览器下载(发送消息给背景页下载)
- * @param {object} options
+ * 浏览器下载
+ * @param {object} request
  */
-const downloadByBrowser = function(options) {
-    return new Promise(function(resolve, reject) {
-        chrome.downloads.download(options, function(downloadId) {
+const downloadByBrowser = function(request) {
+    return new Promise(async resolve => {
+        let dataList = await getInProgressTask();
+        console.log(`添加任务到浏览器，当前任务数：${dataList.length}`);
+        // 如果有配置最大并发数，需要查询当前下载任务数，如果等于或大于，则继续等待
+        while (request.downloadThread > 0 && dataList.length >= request.downloadThread) {
+            console.log(`添加任务到浏览器，当前任务数：${dataList.length}，不允许添加任务`);
+            // 等待1秒后重新查询当前任务数
+            await new Promise(resolve => setTimeout(resolve, 1000));
+            dataList = await getInProgressTask();
+        }
+        console.log(`添加任务到浏览器，当前任务数：${dataList.length}，允许添加任务`);
+        // 添加下载任务
+        chrome.downloads.download(request.task, function(downloadId) {
             if (chrome.runtime.lastError) {
-                console.error(chrome.runtime.lastError.message, options);
+                console.error(`添加任务到浏览器失败，请求参数：${JSON.stringify(request)}，错误信息：${chrome.runtime.lastError}`);
                 // 返回失败标识
                 resolve(0);
                 return;
             }
-            if (!downloadId) {
-                // 返回失败标识
-                resolve(0);
-            }
-            BrowseDownloads.set(downloadId, options)
+            BrowseDownloads.set(downloadId, request.task)
             resolve(downloadId);
         });
-    });
+    })
 }
 
 /**
@@ -104,7 +123,7 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
                     break;
                 case 'download_browser':
                     // 浏览器下载
-                    downloadByBrowser(request.options).then((downloadId) => {
+                    downloadByBrowser(request).then((downloadId) => {
                         sendResponse(downloadId);
                     });
                     break;
@@ -187,25 +206,16 @@ chrome.downloads.onDeterminingFilename.addListener(function(item, __suggest) {
 // 扩展安装时
 chrome.runtime.onInstalled.addListener((details) => {
     console.info('QQ空间导出助手安装中...', details);
-    let reason = details.reason;
-    let previousVersion = details.previousVersion;
-
-    // 打开更新日志
-    chrome.tabs.create({
-        url: 'https://github.com/ShunCai/QZoneExport/releases/latest'
-    });
-
-    switch (reason) {
+    switch (details.reason) {
         // 安装
         case chrome.runtime.OnInstalledReason.INSTALL:
             // 打开官网说明文档
             chrome.tabs.create({
-                url: 'https://lvshuncai.com/qzone-export.html'
+                url: 'https://lvshuncai.com/archives/qzone-export.html'
             });
             break;
-            // 更新
         case chrome.runtime.OnInstalledReason.UPDATE:
-            switch (previousVersion) {
+            switch (details.previousVersion) {
                 case '1.0.0':
                 case '1.0.1':
                 case '1.0.2':
@@ -222,9 +232,19 @@ chrome.runtime.onInstalled.addListener((details) => {
                     });
                     break;
                 case '1.1.4':
-                    // 打开官网说明文档
+                    // 打开更新日志
                     chrome.tabs.create({
-                        url: 'https://lvshuncai.com/qzone-export.html'
+                        url: 'https://www.lvshuncai.com/archives/qzone-export.html#更新日志'
+                    });
+                    break;
+                case '1.1.5':
+                    // 重置配置项
+                    chrome.storage.sync.clear(function() {
+                        console.info('清空配置完成');
+                    });
+                    // 重置备份数据S
+                    chrome.storage.local.clear(function() {
+                        console.info('重置备份数据完成');
                     });
                     break;
                 default:
diff --git a/src/js/config.js b/src/js/config.js
index 25782e2..302762a 100644
--- a/src/js/config.js
+++ b/src/js/config.js
@@ -1,3 +1,6 @@
+// 默认增量备份时间
+const Default_IncrementTime = "2005-06-06 00:00:00";
+
 /**
  * 默认配置
  */
@@ -5,7 +8,7 @@ const Default_Config = {
     // 公共配置
     Common: {
         // 重试次数
-        listRetryCount: 3,
+        listRetryCount: 5,
         // 重试间隔
         listRetrySleep: 2,
         // 文件下载类型
@@ -15,17 +18,17 @@ const Default_Config = {
             token: undefined
         },
         // 自动识别文件后缀
-        isAutoFileSuffix: false,
+        isAutoFileSuffix: true,
         // 后缀识别超时秒数
         autoFileSuffixTimeOut: 30,
         // 迅雷任务数        
-        thunderTaskNum: 3000,
+        thunderTaskNum: 1500,
         // 唤起迅雷间隔        
         thunderTaskSleep: 60,
         // 文件下载并发数        
         downloadThread: 10,
-        // 是否启用下载状态栏提醒
-        enabledShelf: true,
+        // 是否禁用下载状态栏提醒
+        disabledShelf: false,
         // 生成内容是否包含其他空间用户链接
         hasUserLink: true
     },
@@ -48,14 +51,8 @@ const Default_Config = {
             }
         },
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "created_time", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        },
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "created_time", // 增量字段
         isFilterKeyword: false, // 是否过滤关键字
         FilterKeyWords: [
             '促销',
@@ -132,14 +129,8 @@ const Default_Config = {
             }
         },
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "pubtime", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        },
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "pubtime", // 增量字段
         Like: {
             isGet: false, //是否获取赞
             randomSeconds: {
@@ -180,14 +171,8 @@ const Default_Config = {
             }
         },
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "pubtime", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        },
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "pubtime", // 增量字段
         Like: {
             isGet: false, //是否获取赞
             randomSeconds: {
@@ -220,9 +205,11 @@ const Default_Config = {
                 max: 3
             }
         },
+        SortType: "4", // 相册排序方式
+        RenameType: "Default", // 相册命名规则
         Images: {
             pageSize: 90,
-            listType: 'Default', // 默认为列表详情
+            listType: 'Detail', // 默认为列表详情
             randomSeconds: {
                 min: 2,
                 max: 4
@@ -245,17 +232,12 @@ const Default_Config = {
                 }
             },
             isGetVideo: true, // 是否获取相片关联的视频
-            isGetPreview: false
+            isGetPreview: false, // 是否获取预览图
+            fileStructureType: 'File' // 文件夹结构类型
         },
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "uploadTime", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        },
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "uploadTime", // 增量字段
         Like: {
             isGet: false, //是否获取赞
             randomSeconds: {
@@ -275,6 +257,7 @@ const Default_Config = {
     // 视频模块
     Videos: {
         exportType: "HTML",
+        fileStructureType: 'File', // 文件夹结构类型
         randomSeconds: {
             min: 1,
             max: 2
@@ -289,14 +272,8 @@ const Default_Config = {
             }
         },
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "uploadTime", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        },
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "uploadTime", // 增量字段
         Like: {
             isGet: false, //是否获取赞
             randomSeconds: {
@@ -314,14 +291,8 @@ const Default_Config = {
         },
         pageSize: 20,
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "pubtime", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        },
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "pubtime", // 增量字段
         hasThatYearToday: true
     },
     // QQ好友模块
@@ -346,14 +317,8 @@ const Default_Config = {
         },
         pageSize: 30,
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "create_time", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        }
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "create_time" // 增量字段
     },
     // 分享模块
     Shares: {
@@ -378,14 +343,8 @@ const Default_Config = {
             }
         },
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "shareTime", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        },
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "shareTime", // 增量字段
         hasThatYearToday: true,
         Like: {
             isGet: false, //是否获取赞
@@ -598,14 +557,8 @@ const Default_Config = {
             max: 2
         },
         IncrementType: "Full", // 增量备份类型
-        IncrementTime: "2005-06-06 00:00:00", // 增量时间
-        PreBackup: {
-            uin: 0, // 备份QQ
-            downloadType: undefined, // 下载方式
-            exportType: undefined, // 备份类型
-            field: "time", // 比较字段
-            time: "2005-06-06 00:00:00" // 上次备份时间，用于增量数据识别
-        }
+        IncrementTime: Default_IncrementTime, // 增量时间
+        IncrementField: "time" // 增量字段
     },
 
     // 访客模块
@@ -624,6 +577,27 @@ var QZone_Config = Object.assign({}, Default_Config);
  */
 const FOLDER_ROOT = '/QQ空间备份';
 
+/**
+ * 支持备份的模块名称 
+ */
+const MODULE_NAME_LIST = ['Messages', 'Blogs', 'Diaries', 'Photos', 'Videos', 'Boards', 'Friends', 'Favorites', 'Shares', 'Visitors'];
+
+/**
+ * 支持备份的模块名称 
+ */
+const MODULE_NAME_MAPS = {
+    Messages: '说说',
+    Blogs: '日志',
+    Diaries: '私密日记',
+    Photos: '相册',
+    Videos: '视频',
+    Boards: '留言板',
+    Friends: '好友',
+    Favorites: '收藏夹',
+    Shares: '分享',
+    Visitors: '访客'
+};
+
 /**
  * HTML备份导出文件
  */
@@ -759,7 +733,7 @@ var QZone = {
         Images: {
 
         },
-        // 相册分类
+        // 默认相册分类
         Class: {
             100: "最爱",
             101: "人物",
diff --git a/src/js/content.js b/src/js/content.js
index f841c4b..c085eba 100644
--- a/src/js/content.js
+++ b/src/js/content.js
@@ -171,8 +171,8 @@ class PageInfo {
  */
 const MAX_MSG = {
     InitIncrement: [
-        '存在需要增量备份的模块',
-        '正在获取上次备份的数据',
+        '存在增量备份模块',
+        '正在获取已备份的数据',
         '请稍后...'
     ],
     Messages: [
@@ -587,24 +587,51 @@ const MAX_MSG = {
         '总共 <span style="color: #1ca5fc;">{total}</span> 条',
         '请稍后...'
     ],
+    Common_Thunder_Clipboard: [
+        '正在第 <span style="color: #1ca5fc;">{index}</span> 次复制迅雷下载链接',
+        '将在 <span style="color: #1ca5fc;">{nextTip}</span> 秒后再次复制',
+        '已复制 <span style="color: #1ca5fc;">{downloaded}</span> 条',
+        '总共 <span style="color: #1ca5fc;">{total}</span> 条',
+        '请稍后...'
+    ],
     Common_Thunder_Link: [
         '正在生成迅雷下载链接',
         '打包下载后，打开迅雷复制根目录下的【迅雷下载链接.txt】',
         '请稍后...'
     ],
     Common_Browser: [
-        '正在添加下载任务到浏览器',
+        '正在添加多媒体文件下载任务到浏览器',
         '已添加 <span style="color: #1ca5fc;">{downloaded}</span> 条',
         '添加超时或失败 <span style="color: red;">{downloadFailed}</span> ',
         '总共 <span style="color: #1ca5fc;">{total}</span> 条',
         '请稍后...'
     ],
     Common_Aria2: [
-        '正在添加下载任务到Aria2',
+        '正在添加多媒体文件下载任务到Aria2',
         '已添加 <span style="color: #1ca5fc;">{downloaded}</span> 条',
         '添加超时或失败 <span style="color: red;">{downloadFailed}</span> ',
         '总共 <span style="color: #1ca5fc;">{total}</span> 条',
         '请稍后...'
+    ],
+    Init_User_Info_Export: [
+        '正在采集用户基本信息',
+        '请稍后...'
+    ],
+    Init_User_Info_Export_Other: [
+        '正在生成个人首页',
+        '请稍后...'
+    ],
+    User_Config_Infos: [
+        '正在导出助手配置信息',
+        '请稍后...'
+    ],
+    Backup_Save: [
+        '正在保存当前备份数据',
+        '请稍后...'
+    ],
+    Backup_Export: [
+        '正在导出当前备份数据',
+        '请稍后...'
     ]
 }
 
@@ -620,7 +647,7 @@ class StatusIndicator {
     constructor(type) {
         this.id = type + '_Tips'
         this.type = type
-        this.tip = MAX_MSG[type] || ''
+        this.tip = MAX_MSG[type] || []
         this.total = 0
         this.index = 0
         this.pageSize = 0
@@ -644,9 +671,16 @@ class StatusIndicator {
      * 输出提示信息
      */
     print() {
-        let $tip_dom = $("#" + this.id);
+        const $tip_dom = $("#" + this.id);
         $tip_dom.show();
-        $tip_dom.html(this.tip.join('，').format(this));
+        if (this.tip && this.tip.length > 0) {
+            $tip_dom.html(this.tip.join('，').format(this));
+        }
+
+        if ($tip_dom.is('details')) {
+            // 展开
+            $tip_dom.find('summary').click();
+        }
     }
 
     /**
@@ -654,9 +688,20 @@ class StatusIndicator {
      * @param {object} params 格式化参数
      */
     complete() {
-        let $tip_dom = $("#" + this.id)
+        const $tip_dom = $("#" + this.id)
         $tip_dom.show()
-        $tip_dom.html(this.tip.join('，').format(this).replace('正在', '已').replace('请稍后', '已完成').replace('...', ''))
+        let showTip = $tip_dom.html() || '';
+        if (this.tip && this.tip.length > 0) {
+            showTip = this.tip.join('，').format(this);
+        }
+        $tip_dom.html(showTip.replace('正在', '已').replace('请稍后', '已完成').replace('...', ''));
+
+        if ($tip_dom.is('details') && this.id !== 'Common_Row_Infos_Tips') {
+            // 收起
+            $tip_dom.find('summary').click();
+        }
+
+        $("#progressModal .modal-body").animate({ scrollTop: 1000 });
     }
 
     /**
@@ -815,7 +860,7 @@ const OperatorType = {
     /**
      * 导出用户信息
      */
-    USER_INFO: 'USER_INFO',
+    OTHERS_INFO: 'OTHERS_INFO',
 
     /**
      * 获取所有说说列表
@@ -867,11 +912,6 @@ const OperatorType = {
      */
     Visitors: 'Visitors',
 
-    /**
-     * 下载文件
-     */
-    FILE_LIST: 'FILE_LIST',
-
     /**
      * 压缩
      */
@@ -905,9 +945,7 @@ class QZoneOperator {
                 break;
             case OperatorType.INIT_USER_INFO:
                 // 重置QQ空间备份数据
-                API.Common.resetQzoneItems();
-                // 初始化用户信息
-                await API.Common.initUserInfo();
+                API.Common.resetQZoneBackupItems();
                 // 初始化上次备份信息
                 await API.Common.initBackedUpItems();
                 this.next(OperatorType.Messages);
@@ -980,33 +1018,35 @@ class QZoneOperator {
                 if (API.Common.isExport(moduleType)) {
                     await API.Videos.export();
                 }
-                this.next(OperatorType.USER_INFO);
-                break;
-            case OperatorType.USER_INFO:
-                // 导出用户信息
-                await API.Common.exportUser();
-                this.next(OperatorType.FILE_LIST);
+                this.next(OperatorType.OTHERS_INFO);
                 break;
-            case OperatorType.FILE_LIST:
-                // 保存数据
-                await API.Common.saveBackupItems();
-                // 下载文件
-                await API.Utils.downloadAllFiles();
+            case OperatorType.OTHERS_INFO:
+                // 其它信息导出
+                await API.Common.exportOthers();
                 this.next(OperatorType.ZIP);
                 break;
             case OperatorType.ZIP:
-                await API.Utils.sleep(1000);
-                // 压缩
-                await API.Utils.Zip(API.Common.getRootFolder());
-                operator.next(OperatorType.COMPLETE);
+                if (API.Common.isOnlyFileExport()) {
+                    // 仅文件导出，无需压缩文件
+                    console.log('仅文件导出，无需压缩文件');
+                } else {
+                    // 压缩文件
+                    await API.Utils.sleep(1000);
+                    await API.Utils.Zip(API.Common.getRootFolder());
+                    operator.next(OperatorType.COMPLETE);
+                }
                 break;
             case OperatorType.COMPLETE:
                 // 延迟3秒，确保压缩完
                 await API.Utils.sleep(1000);
-                $("#downloadBtn").show();
                 $("#fileList").show();
-                $("#backupStatus").html("数据采集完成，<span style='color:red' >请点击下方【打包下载】ZIP包</span>。");
-                API.Utils.notification("QQ空间导出助手通知", "空间数据已获取完成，请点击下载！");
+                if (API.Common.isOnlyFileExport()) {
+                    API.Utils.notification("QQ空间导出助手通知", "不涉及文案内容备份，多媒体文件下载任务已添加完成！");
+                } else {
+                    $("#downloadBtn").show();
+                    $("#backupStatus").html("数据采集完成，请点击下方<span style='color:red'>打包下载</span>按钮下载备份压缩包。");
+                    API.Utils.notification("QQ空间导出助手通知", "数据采集完成，请打包下载文案内容！");
+                }
                 break;
             default:
                 break;
@@ -1076,7 +1116,6 @@ class QZoneOperator {
                     continue;
                 }
                 let entry = await API.Utils.createFolder(API.Common.getRootFolder() + '/' + moduleRoot);
-                console.info('创建目录成功', entry);
             }
         }
 
@@ -1128,6 +1167,12 @@ class QZoneOperator {
                 // 修改继续重试按钮文本为【唤起迅雷】
                 $againDownloadBtn.text('唤起迅雷');
                 break;
+            case 'Thunder_Clipboard':
+                // 下载方式为迅雷下载时隐藏【迅雷下载】按钮
+                $thunderDownloadBtn.hide();
+                // 修改继续重试按钮文本为【唤起迅雷】
+                $againDownloadBtn.text('唤起迅雷');
+                break;
             case 'Thunder_Link':
                 // 隐藏重试按钮
                 $againDownloadBtn.hide();
@@ -1165,7 +1210,7 @@ class QZoneOperator {
                 $downloadBtn.attr('disabled', false);
                 $fileListBtn.attr('disabled', false);
                 $("#showFolder").show();
-                API.Utils.notification("QQ空间导出助手通知", "你的QQ空间数据下载完成！");
+                API.Utils.notification("QQ空间导出助手通知", "文案内容压缩包下载完成！");
             });
 
         });
@@ -1245,7 +1290,7 @@ class QZoneOperator {
         // 查看指定状态的数据
         $('#statusFilter').change(function() {
             const status = $(this).val();
-            if ('interrupted' === status || ('Thunder' === downloadType && 'all' === status)) {
+            if ('interrupted' === status || (['Thunder', 'Thunder_Clipboard'].indexOf(downloadType) > -1 && 'all' === status)) {
                 // 失败列表与迅雷下载全部列表时才展示【继续重试】按钮
                 $againDownloadBtn.show();
             } else {
@@ -1281,10 +1326,15 @@ class QZoneOperator {
                     await API.Common.downloadByAria2(tasks);
                     break;
                 case 'Thunder':
-                    // 下载方式为迅雷下载时
+                    // 下载方式为迅雷（助手唤醒）
                     const newThunderInfo = new ThunderInfo(API.Common.getRootFolderName(), QZone_Config.Common.downloadThread, tasks);
                     await API.Common.invokeThunder(newThunderInfo);
                     break;
+                case 'Thunder_Clipboard':
+                    // 下载方式为迅雷（剪切板唤醒）
+                    const copyNewThunderInfo = new ThunderInfo(API.Common.getRootFolderName(), QZone_Config.Common.downloadThread, tasks);
+                    await API.Common.copyThunderTasksToClipboard(copyNewThunderInfo);
+                    break;
                 default:
                     break;
             }
@@ -1571,6 +1621,10 @@ API.Utils.downloadAllFiles = async() => {
         case 'Thunder':
             await API.Common.invokeThunder(thunderInfo);
             break;
+        case 'Thunder_Clipboard':
+            // 复制迅雷下载任务到Clipboard
+            await API.Common.copyThunderTasksToClipboard(thunderInfo);
+            break;
         case 'Thunder_Link':
             // 写入迅雷任务到文件
             await API.Common.writeThunderTaskToFile(thunderInfo);
diff --git a/src/js/modules/blogs.js b/src/js/modules/blogs.js
index 4b09fea..947e892 100644
--- a/src/js/modules/blogs.js
+++ b/src/js/modules/blogs.js
@@ -7,17 +7,22 @@
  * 导出日志数据
  */
 API.Blogs.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Blogs_Row_Infos');
+    indicator.print();
+
     try {
         // 获取所有的日志数据
         let items = await API.Blogs.getAllList();
-        console.info('日志列表获取完成', items);
+        console.log('日志列表获取完成，共有日志%i篇', items.length);
 
         // 添加下载任务
         API.Blogs.handerListImages(items);
 
         // 获取日志内容
         items = await API.Blogs.getAllContents(items);
-        console.info('日志内容获取完成', items);
+        console.log('日志内容获取完成，共有日志%i篇', items.length);
 
         // 获取所有的日志评论
         items = await API.Blogs.getItemsAllCommentList(items);
@@ -31,11 +36,12 @@ API.Blogs.export = async() => {
         // 根据导出类型导出数据    
         await API.Blogs.exportAllListToFiles(items);
 
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Blogs);
     } catch (error) {
         console.error('日志导出异常', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 /**
@@ -88,7 +94,7 @@ API.Blogs.getAllContents = async(items) => {
                 await API.Blogs.handerMedias(item, $detailBlog.find("embed"));
 
                 // 更改自定义标题
-                item.custom_title = '《{0}》'.format(item.title);
+                item.custom_title = item.title;
                 // 添加自定义HTML
                 item.custom_html = API.Utils.utf8ToBase64($detailBlog.html());
                 // 添加点赞Key
@@ -171,7 +177,7 @@ API.Blogs.getAllList = async() => {
 
             // 合并数据
             QZone.Blogs.Data = API.Utils.unionItems(QZone.Blogs.Data, dataList);
-            if (API.Common.isPreBackupPos(dataList, CONFIG)) {
+            if (!_.isEmpty(QZone.Blogs.OLD_Data) && API.Common.isPreBackupPos(dataList, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Blogs.Data;
             }
@@ -364,7 +370,7 @@ API.Blogs.exportToHtml = async(items) => {
         }
 
     } catch (error) {
-        console.error('导出私密日记到HTML异常', error, boardInfo);
+        console.error('导出私密日记到HTML异常', error);
     }
 
     // 更新进度信息
@@ -542,7 +548,7 @@ API.Blogs.handerContentImages = async(item, images) => {
         return item;
     }
     // 导出类型
-    let exportType = QZone_Config.Blogs.exportType;
+    const exportType = QZone_Config.Blogs.exportType;
     for (let i = 0; i < images.length; i++) {
         const $img = $(images[i]);
         // 处理相对协议
@@ -586,7 +592,7 @@ API.Blogs.handerContentImages = async(item, images) => {
 }
 
 /**
- * 处理视频信息
+ * 处理视频信息（简单处理，没仔细研究）
  * @param {object} item 日志
  * @param {Array} embeds 图片元素列表
  */
@@ -595,34 +601,59 @@ API.Blogs.handerMedias = async(item, embeds) => {
         // 无图片不处理
         return item;
     }
+    // 导出类型
+    const exportType = QZone_Config.Blogs.exportType;
     for (let i = 0; i < embeds.length; i++) {
         const $embed = $(embeds[i]);
         const data_type = $embed.attr('data-type');
         let vid = $embed.attr('data-vid');
-        const height = $embed.attr('height') || '480px';
-        const width = $embed.attr('width') || '600px';
+        const height = $embed.attr('height') || 'auto';
+        const width = $embed.attr('width') || '100%';
         let iframe_url = $embed.attr('src');
+        const srcInfo = API.Utils.toParams(iframe_url);
         switch (data_type) {
             case '1':
                 // 相册视频
                 // MP4地址 
                 const mp4_url = $embed.attr('data-mp4');
-                if (!mp4_url || !vid) {
-                    // 历史数据或特殊数据跳过不处理
-                    console.warn('历史数据或特殊数据跳过不处理', $embed);
-                    return;
+                if (srcInfo.hasOwnProperty('vurl') || mp4_url) {
+                    // 视频下载地址
+                    let vurl = mp4_url || decodeURIComponent(API.Utils.toParams(iframe_url).vurl);
+
+                    // 添加下载任务
+                    if (!API.Common.isQzoneUrl()) {
+                        // 非QQ空间外链
+                        const uid = API.Utils.newSimpleUid(8, 16);
+                        const suffix = await API.Utils.autoFileSuffix(vurl);
+                        const custom_filename = uid + suffix;
+
+                        // 添加下载任务
+                        API.Utils.newDownloadTask('Blogs', vurl, 'Blogs/Images', custom_filename, item);
+
+                        // 新的图片离线地址
+                        vurl = 'MarkDown' === exportType ? '../Images/' + custom_filename : 'Images/' + custom_filename;
+                    }
+                    $embed.replaceWith('<video src="{0}" height="auto" width="100%" controls="controls" ></video>'.format(vurl));
+                } else {
+                    if (!vid) {
+                        // 未知数据，不处理
+                        console.warn('未知数据，不处理', $embed);
+                        return;
+                    }
+                    // iframe 播放地址
+                    iframe_url = 'https://h5.qzone.qq.com/video/index?vid=' + vid;
+                    $embed.replaceWith('<iframe src="{0}" height="auto" width="100%" allowfullscreen="true"></iframe>'.format(iframe_url));
                 }
-                // iframe 播放地址
-                iframe_url = 'https://h5.qzone.qq.com/video/index?vid=' + vid;
                 break;
             case '51':
                 // 外部视频
                 if (!vid) {
                     // 历史数据或特殊数据跳过不处理
-                    console.warn('历史数据或特殊数据跳过不处理', $embed);
+                    console.warn('未知数据，不处理', $embed);
                     return;
                 }
                 iframe_url = API.Videos.getTencentVideoUrl(vid);
+                $embed.replaceWith('<iframe src="{0}" height="auto" width="100%" allowfullscreen="true"></iframe>'.format(iframe_url));
                 break;
             default:
                 // 其他的
@@ -632,9 +663,9 @@ API.Blogs.handerMedias = async(item, embeds) => {
                     // 取到VID，默认当外部视频处理
                     iframe_url = API.Videos.getTencentVideoUrl(vid);
                 }
+                $embed.replaceWith('<iframe src="{0}" height="auto" width="100%" allowfullscreen="true"></iframe>'.format(iframe_url));
                 break;
         }
-        $embed.replaceWith('<iframe src="{0}" height="{1}" width="{2}" allowfullscreen="true"></iframe>'.format(iframe_url, height, width));
     }
     return item;
 }
diff --git a/src/js/modules/boards.js b/src/js/modules/boards.js
index 9fb1129..0a7bfae 100644
--- a/src/js/modules/boards.js
+++ b/src/js/modules/boards.js
@@ -7,6 +7,11 @@
  * 导出留言板
  */
 API.Boards.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Boards_Row_Infos');
+    indicator.print();
+
     try {
         // 获取所有的留言
         let boardInfo = await API.Boards.getAllList();
@@ -17,12 +22,12 @@ API.Boards.export = async() => {
         // 根据导出类型导出数据
         await API.Boards.exportAllToFiles(boardInfo);
 
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Boards);
-
     } catch (error) {
         console.error('留言导出异常', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 
@@ -93,7 +98,7 @@ API.Boards.getAllList = async() => {
 
             // 合并数据
             QZone.Boards.Data.items = API.Utils.unionItems(QZone.Boards.Data.items, dataList);
-            if (API.Common.isPreBackupPos(dataList, CONFIG)) {
+            if (!_.isEmpty(QZone.Boards.OLD_Data.items) && API.Common.isPreBackupPos(dataList, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Boards.Data;
             }
@@ -114,7 +119,7 @@ API.Boards.getAllList = async() => {
     QZone.Boards.Data.items = API.Common.unionBackedUpItems(CONFIG, QZone.Boards.OLD_Data.items, QZone.Boards.Data.items);
 
     // 发表时间倒序
-    QZone.Boards.Data.items = API.Utils.sort(QZone.Boards.Data.items, CONFIG.PreBackup.field, true);
+    QZone.Boards.Data.items = API.Utils.sort(QZone.Boards.Data.items, CONFIG.IncrementField, true);
 
     // 完成
     indicator.complete();
diff --git a/src/js/modules/common.js b/src/js/modules/common.js
index 8d57eae..524625b 100644
--- a/src/js/modules/common.js
+++ b/src/js/modules/common.js
@@ -7,85 +7,146 @@
  * 初始化用户信息
  */
 API.Common.initUserInfo = async() => {
+
+    if (API.Common.isOnlyFileExport()) {
+        // 仅文件导出，无需初始化
+        console.log('仅文件导出，无需初始化用户信息');
+        return;
+    }
+
+    // 状态更新器
+    const indicator = new StatusIndicator('Init_User_Info_Export');
+    indicator.print();
+
     try {
 
         // 获取所有的QQ好友
-        let userInfo = await API.Common.getUserInfos();
-        userInfo = API.Utils.toJson(userInfo, /^_Callback\(/);
-        if (userInfo.code < 0) {
-            // 获取异常
-            console.warn('初始化用户信息异常：', userInfo);
-        }
-        userInfo = userInfo.data || {};
+        await API.Common.getUserInfos().then((userInfo) => {
+            userInfo = API.Utils.toJson(userInfo, /^_Callback\(/);
+            console.info("获取用户信息完成", userInfo);
+
+            if (userInfo.code < 0) {
+                // 获取异常
+                console.warn('初始化用户信息异常：', userInfo);
+            }
+            userInfo = userInfo.data || {};
+
+            // 用户信息
+            userInfo = userInfo && Object.assign(QZone.Common.Target, userInfo);
+
+            // 添加目标头像下载任务
+            API.Common.downloadUserAvatars([QZone.Common.Target, QZone.Common.Owner, userInfo]);
+
+            // 更换用户图片
+            userInfo.avatar = API.Common.getUserLogoUrl(userInfo.uin);
+
+        }).catch((error) => {
+            console.error("获取用户信息异常", error);
+        });
+    } catch (error) {
+        console.error('初始化用户信息异常', error);
+    }
+
+    // 完成
+    indicator.complete();
+}
+
+/**
+ * 其它的导出
+ */
+API.Common.exportOthers = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Common_Row_Infos');
+    indicator.print();
 
-        // 用户信息
-        userInfo = Object.assign(QZone.Common.Target, userInfo);
+    try {
+
+        // 初始化用户信息
+        await API.Common.initUserInfo();
+
+        // 导出用户信息
+        await API.Common.exportUser();
 
         // 下载助手配置信息
         await API.Common.exportConfigToJson();
 
-        // 添加目标头像下载任务
-        API.Common.downloadUserAvatars([QZone.Common.Target, QZone.Common.Owner, userInfo]);
+        // 保存备份数据
+        const backupInfos = await API.Common.saveBackupItems();
+
+        // 导出备份数据到JSON
+        await API.Common.exportBackupItemsToJson(backupInfos);
+
+        // 下载文件
+        await API.Utils.downloadAllFiles();
 
-        // 更换用户图片
-        userInfo.avatar = API.Common.getUserLogoUrl(userInfo.uin);
     } catch (error) {
-        console.error('初始化用户信息异常', error);
+        console.error('导出其它信息失败', error);
     }
+
+    // 完成
+    indicator.complete();
+
 }
 
 /**
  * 导出用户个人档信息
  */
 API.Common.exportUser = async() => {
-    try {
-        let userInfo = QZone.Common.Target
-
-        // 添加统计信息到用户信息
-        userInfo.messages = QZone.Messages.Data.length;
-        userInfo.blogs = QZone.Blogs.Data.length;
-        userInfo.diaries = QZone.Diaries.Data.length;
-        let photos = [];
-        for (const album of QZone.Photos.Album.Data) {
-            photos = photos.concat(album.photoList || []);
-        }
-        userInfo.photos = photos.length;
-        userInfo.videos = QZone.Videos.Data.length;
-        userInfo.boards = QZone.Boards.Data.total;
-        userInfo.favorites = QZone.Favorites.Data.length;
-        userInfo.shares = QZone.Shares.Data.length;
-        userInfo.friends = QZone.Friends.Data.length;
-        userInfo.visitors = QZone.Visitors.Data.total;
 
-        // 根据导出类型导出数据
-        await API.Common.exportUserToJson(userInfo);
+    if (API.Common.isOnlyFileExport()) {
+        // 仅文件导出，无需生成首页文件
+        console.log('仅文件导出，无需生成首页文件');
+        return;
+    }
 
-        // 生成MarkDown
-        await API.Common.exportUserToMd(userInfo);
+    // 状态更新器
+    const indicator = new StatusIndicator('Init_User_Info_Export_Other');
+    indicator.print();
 
-        // 生成HTML
-        await API.Common.exportUserToHtml(userInfo);
+    let userInfo = QZone.Common.Target
 
-        // 保存配置项，主要是上次备份时间
-        chrome.storage.sync.set(QZone_Config);
-    } catch (error) {
-        console.error('导出用户个人档信息失败', error);
+    // 添加统计信息到用户信息
+    userInfo.messages = QZone.Messages.Data.length;
+    userInfo.blogs = QZone.Blogs.Data.length;
+    userInfo.diaries = QZone.Diaries.Data.length;
+    let photos = [];
+    for (const album of QZone.Photos.Album.Data) {
+        photos = photos.concat(album.photoList || []);
     }
+    userInfo.photos = photos.length;
+    userInfo.videos = QZone.Videos.Data.length;
+    userInfo.boards = QZone.Boards.Data.total;
+    userInfo.favorites = QZone.Favorites.Data.length;
+    userInfo.shares = QZone.Shares.Data.length;
+    userInfo.friends = QZone.Friends.Data.length;
+    userInfo.visitors = QZone.Visitors.Data.total;
+
+    // 根据导出类型导出数据
+    await API.Common.exportUserToJson(userInfo);
+
+    // 生成MarkDown
+    await API.Common.exportUserToMd(userInfo);
+
+    // 生成HTML
+    await API.Common.exportUserToHtml(userInfo);
+
+    // 完成
+    indicator.complete();
 }
 
 /**
  * 导出个人信息到JSON文件
  * @param {Array} friends 好友列表
  */
-API.Common.exportUserToJson = async(userInfo) => {
-    const json = JSON.stringify(userInfo);
+API.Common.exportUserToJson = async(jsonObj) => {
     const path = API.Common.getModuleRoot('Common') + '/json';
 
     // 创建JSON文件夹
     await API.Utils.createFolder(path);
 
     // 写入JOSN
-    await API.Utils.writeText(json, path + '/User.json').then((fileEntry) => {
+    await API.Utils.writeText(JSON.stringify(jsonObj), path + '/User.json').then((fileEntry) => {
         console.info("导出用户个人档信息完成", fileEntry);
     }).catch((error) => {
         console.error("导出用户个人档信息异常", error);
@@ -297,33 +358,6 @@ API.Common.addDownloadTask = (module, url, content) => {
     return custom_filename;
 }
 
-/**
- * 获取多媒体路径
- * @param {string} url 远程URL
- * @param {string} filepath 本地文件路径
- * @param {string} sourceType 来源类型
- */
-API.Common.getMediaPath = (url, filepath, sourceType) => {
-    if (!filepath) {
-        return url;
-    }
-    let res = filepath || url;
-    switch (sourceType) {
-        case 'Messages_HTML':
-            res = '../' + res;
-            break;
-        case 'Photos_HTML':
-            res = '../' + res;
-            break;
-        case 'Videos_HTML':
-            res = '../' + res;
-            break;
-        default:
-            break;
-    }
-    return res;
-}
-
 /**
  * 通过Ajax请求下载文件
  * @param {Array} tasks
@@ -372,7 +406,7 @@ API.Common.downloadsByBrowser = async(tasks) => {
     indicator.setTotal(tasks.length);
 
     // 开始下载
-    const _tasks = _.chunk(tasks, 10);
+    const _tasks = _.chunk(tasks, 100);
     for (let i = 0; i < _tasks.length; i++) {
         const list = _tasks[i];
         for (let j = 0; j < list.length; j++) {
@@ -394,7 +428,7 @@ API.Common.downloadsByBrowser = async(tasks) => {
             })
         }
         // 等待1秒再继续添加
-        await API.Utils.sleep(1000);
+        await API.Utils.sleep(500);
     }
     indicator.complete();
     return true;
@@ -470,13 +504,91 @@ API.Common.invokeThunder = async(thunderInfo) => {
         if (index < _tasks.length) {
             let sleep = QZone_Config.Common.thunderTaskSleep * 1;
             let interId = setInterval(function() {
-                    indicator.setNextTip(--sleep);
-                }, 1000)
-                // 等待指定秒再继续唤起，并给用户提示
+                indicator.setNextTip(--sleep);
+            }, 1000);
+
+            // 等待指定秒再继续唤起，并给用户提示
+            await API.Utils.sleep(sleep * 1000);
+            clearInterval(interId);
+        }
+    }
+
+    // 完成
+    indicator.complete();
+}
+
+/**
+ * 复制迅雷下载链接到剪切板
+ * @param {ThunderInfo} thunderInfo 迅雷下载信息
+ */
+API.Common.copyThunderTasksToClipboard = async(thunderInfo) => {
+    // 进度更新器
+    const indicator = new StatusIndicator('Common_Thunder_Clipboard');
+    indicator.setTotal(thunderInfo.tasks.length);
+    indicator.print();
+
+    // 处理迅雷下载信息
+    const _thunderInfo = API.Common.handerThunderInfo(thunderInfo);
+
+    // 通过迅雷任务数将任务分组，任务太大时无法唤起迅雷
+    const tasks = _thunderInfo.tasks || [];
+    const _tasks = _.chunk(tasks, QZone_Config.Common.thunderTaskNum);
+    for (let i = 0; i < _tasks.length; i++) {
+        const index = i + 1;
+        indicator.setIndex(index);
+
+        const list = _tasks[i];
+        let taskGroupName = _thunderInfo.taskGroupName;
+        if (_tasks.length > 1) {
+            taskGroupName = taskGroupName + "_" + index;
+        }
+
+        // 唤起迅雷下载
+        const groupTask = new ThunderInfo(taskGroupName, QZone_Config.Common.downloadThread, list)
+
+        // 下载任务信息
+        const copyTaskLinks = 'thunderx://' + JSON.stringify(groupTask);
+
+        // 复制下载链接到剪切板
+        navigator.clipboard.writeText(copyTaskLinks).catch((error) => {
+
+            console.error('异步复制失败', error);
+
+            // 创建text area
+            let textArea = document.createElement("textarea");
+            textArea.value = copyTaskLinks;
+            // 使text area不在viewport，同时设置不可见
+            textArea.style.position = "absolute";
+            textArea.style.opacity = 0;
+            textArea.style.left = "-999999px";
+            textArea.style.top = "-999999px";
+            document.body.appendChild(textArea);
+            textArea.focus();
+            textArea.select();
+            return new Promise((res, rej) => {
+                // 执行复制命令并移除文本框
+                document.execCommand('copy') ? res() : rej();
+                textArea.remove();
+            });
+        });
+
+        // 添加唤起数
+        indicator.addSuccess(list);
+
+        // 继续唤起
+        if (index < _tasks.length) {
+            let sleep = QZone_Config.Common.thunderTaskSleep * 1;
+            let interId = setInterval(function() {
+                indicator.setNextTip(--sleep);
+            }, 1000);
+
+            // 等待指定秒再继续唤起，并给用户提示
             await API.Utils.sleep(sleep * 1000);
             clearInterval(interId);
         }
     }
+
+    // 完成
     indicator.complete();
 }
 
@@ -541,51 +653,12 @@ API.Common.handerThunderInfo = (thunderInfo) => {
     return _thunderInfo;
 }
 
-/**
- * 设置模块备份信息
- * @param {object} moduleConfig 模块配置
- */
-API.Common.setBackupInfo = (moduleConfig) => {
-    if (!moduleConfig || !moduleConfig.PreBackup) {
-        return;
-    }
-    moduleConfig.PreBackup.uin = QZone.Common.Target.uin;
-    moduleConfig.PreBackup.downloadType = QZone_Config.Common.downloadType;
-    moduleConfig.PreBackup.time = new Date().format('yyyy-MM-dd hh:mm:ss');
-    // 同步更新配置项
-    if (moduleConfig.IncrementType === 'LastTime') {
-        // 增量类型为上次备份的才同步更新
-        moduleConfig.IncrementTime = moduleConfig.PreBackup.time;
-    }
-}
-
 /**
  * 是否全量备份
  * @param {Object} moduleConfig 模块配置
  */
 API.Common.isFullBackup = (moduleConfig) => {
-    const pre_backup = moduleConfig.PreBackup;
-    if (!pre_backup || moduleConfig.IncrementType === 'Full') {
-        // 不需要增量备份
-        return true;
-    }
-    if (QZone.Common.Target.uin !== pre_backup.uin && moduleConfig.IncrementType !== 'Custom') {
-        // 当前备份QQ与上次备份QQ不一致，且增量类型不为自定义
-        return true;
-    }
-    // if (API.Common.isQzoneUrl()) {
-    //     // QQ空间外链
-    //     return true;
-    // }
-    // if (QZone_Config.Common.exportType !== pre_backup.exportType) {
-    //     // 当前模块数据备份类型与上次备份类型不一致
-    //     return true;
-    // }
-    if (QZone_Config.Common.downloadType !== pre_backup.downloadType) {
-        // 当前备份文件下载方式与上次备份文件下载方式不一致
-        return true;
-    }
-    return false;
+    return moduleConfig.IncrementType === 'Full';
 }
 
 /**
@@ -594,23 +667,23 @@ API.Common.isFullBackup = (moduleConfig) => {
  * @param {Object} moduleConfig 模块配置
  */
 API.Common.isPreBackupPos = (new_items, moduleConfig) => {
-    if (API.Common.isFullBackup(moduleConfig)) {
+    if (new_items.length == 0) {
         return false;
     }
-    const preBackup = moduleConfig.PreBackup;
-    // 增量备份时间
-    const incrementTime = new Date(moduleConfig.IncrementTime).getTime();
-    if (new_items.length == 0) {
+    if (API.Common.isFullBackup(moduleConfig)) {
         return false;
     }
+
+    // 增量备份时间
+    const incrementTime = API.Utils.parseDate(moduleConfig.IncrementTime).getTime();
+    // 增备份字段
+    const field = moduleConfig.IncrementField;
+
     // 新获取到的第一条数据
-    let firstItem = new_items[0];
-    let firstTime = firstItem[preBackup.field];
-    firstTime = typeof firstTime === 'string' ? new Date(firstTime).getTime() : firstTime * 1000;
+    const firstTime = API.Utils.parseDate(_.first(new_items)[field]);
     // 新获取到的最后一条数据
-    let lastItem = new_items[new_items.length - 1];
-    let lastTime = lastItem[preBackup.field];
-    lastTime = typeof lastTime === 'string' ? new Date(lastTime).getTime() : lastTime * 1000;
+    const lastTime = API.Utils.parseDate(_.last(new_items)[field]);
+
     // 情况一、第一条是符合增量时间的
     // 情况二、最后一条是符合增量时间的
     // 情况三、不是第一也不是最后
@@ -635,16 +708,19 @@ API.Common.isNewItem = (item) => {
  */
 API.Common.removeOldItems = (old_items, moduleConfig) => {
     if (API.Common.isFullBackup(moduleConfig) || old_items === undefined) {
-        // 选择全量备份时，直接返回空数组，当初没有历史数据处理
+        // 选择全量备份时，直接返回空数组，当作没有历史数据处理
         return [];
     }
-    const preBackup = moduleConfig.PreBackup;
+
     // 增量备份时间
-    const incrementTime = new Date(moduleConfig.IncrementTime).getTime();
+    const incrementTime = API.Utils.parseDate(moduleConfig.IncrementTime).getTime();
+    // 增备份字段
+    const field = moduleConfig.IncrementField;
+
     // items中的数据是从新到旧的，直接倒序判断时间
     for (let i = old_items.length - 1; i >= 0; i--) {
         const item = old_items[i];
-        let time = item[preBackup.field] * 1000;
+        const time = API.Utils.parseDate(item[field]).getTime();
         if (time > incrementTime) {
             // 如果集合中的元素存在大于增量备份时间的，则移除
             old_items.splice(i, 1);
@@ -665,13 +741,15 @@ API.Common.removeNewItems = (new_items, moduleConfig) => {
     if (API.Common.isFullBackup(moduleConfig)) {
         return new_items;
     }
-    const preBackup = moduleConfig.PreBackup;
     // 增量备份时间
-    const incrementTime = new Date(moduleConfig.IncrementTime).getTime();
+    const incrementTime = API.Utils.parseDate(moduleConfig.IncrementTime).getTime();
+    // 增备份字段
+    const field = moduleConfig.IncrementField;
+
     // items中的数据是从新到旧的，直接倒序判断时间
     for (let i = new_items.length - 1; i >= 0; i--) {
         const item = new_items[i];
-        let time = item[preBackup.field] * 1000;
+        const time = API.Utils.parseDate(item[field]).getTime();
         if (time < incrementTime) {
             // 如果集合中的元素存在小于增量备份时间的，则移除
             new_items.splice(i, 1);
@@ -690,6 +768,10 @@ API.Common.removeNewItems = (new_items, moduleConfig) => {
  * @param {Array} new_items 新数据
  */
 API.Common.unionBackedUpItems = (moduleConfig, old_items, new_items) => {
+    if (_.isEmpty(old_items)) {
+        // 如果已备份数据为空，直接返回新数据
+        return new_items;
+    }
     // 移除已备份数据中不符合条件的数据
     old_items = API.Common.removeOldItems(old_items, moduleConfig);
 
@@ -704,69 +786,203 @@ API.Common.unionBackedUpItems = (moduleConfig, old_items, new_items) => {
  * 保存当前备份数据
  */
 API.Common.saveBackupItems = () => {
+
+    // 状态更新器
+    const indicator = new StatusIndicator('Backup_Save');
+    indicator.print();
+
     return new Promise(function(resolve, reject) {
-        const key = QZone.Common.Target.uin + "_" + QZone_Config.Common.downloadType;
-        const backups = {};
-        // 只存储需要的数据
-        backups[key] = {
-            Messages: {
-                Data: API.Common.isExport('Messages') ? QZone.Messages.Data : QZone.Messages.OLD_Data
-            },
-            Blogs: {
-                Data: API.Common.isExport('Blogs') ? QZone.Blogs.Data : QZone.Blogs.OLD_Data
-            },
-            Diaries: {
-                Data: API.Common.isExport('Diaries') ? QZone.Diaries.Data : QZone.Diaries.OLD_Data
-            },
-            Photos: {
-                Album: {
-                    Data: API.Common.isExport('Photos') ? QZone.Photos.Album.Data : QZone.Photos.Album.OLD_Data
-                }
-            },
-            Videos: {
-                Data: API.Common.isExport('Videos') ? QZone.Videos.Data : QZone.Videos.OLD_Data
-            },
-            Boards: {
-                Data: API.Common.isExport('Boards') ? QZone.Boards.Data : QZone.Boards.OLD_Data
-            },
-            Friends: {
-                Data: API.Common.isExport('Friends') ? QZone.Friends.Data : QZone.Friends.OLD_Data
-            },
-            Favorites: {
-                Data: API.Common.isExport('Favorites') ? QZone.Favorites.Data : QZone.Favorites.OLD_Data
-            },
-            Shares: {
-                Data: API.Common.isExport('Shares') ? QZone.Shares.Data : QZone.Shares.OLD_Data
-            },
-            Visitors: {
-                Data: API.Common.isExport('Visitors') ? QZone.Visitors.Data : QZone.Visitors.OLD_Data
-            }
+
+        // 需要保存的备份数据
+        const backupInfos = {
+            Backedup: window.Backedup || {}
         };
 
-        // 保存数据Storage TODO 保存大小是否受限？
-        chrome.storage.local.set(backups, function() {
-            console.info("保存当前备份数据到Storage完成", backups);
-            resolve(backups);
+        // 历史数据
+        const rows = backupInfos.Backedup[QZone.Common.Target.uin] || [];
+        const oldRowMaps = _.keyBy(rows, 'module');
+
+        // 清空数据
+        rows.length = 0;
+
+        for (const moduleName of MODULE_NAME_LIST) {
+
+            // 配置的备份时间，直接刷新为当前时间
+            QZone_Config[moduleName].IncrementTime = API.Utils.formatDate(Date.now() / 1000);
+
+            // 历史备份数据是否为空
+            const oldItems = API.Common.getOldModuleData(moduleName);
+
+            if (!API.Common.isExport(moduleName) && _.isEmpty(oldItems)) {
+                // 如果不导出，且旧数据为空，则不保存该模块
+                continue;
+            }
+
+            // 是否有新数据导出
+            const isNewExport = API.Common.isNewExport(moduleName);
+
+            // 需要保存的模块数据
+            const moduleInfo = oldRowMaps[moduleName] || {};
+            moduleInfo.module = moduleName;
+            moduleInfo.data = API.Common.getSaveModuleData(moduleName);
+            moduleInfo.time = isNewExport ? Date.now() : moduleInfo.time || Date.now();
+            rows.push(moduleInfo);
+        }
+
+        backupInfos.Backedup[QZone.Common.Target.uin] = rows;
+
+        // 保存配置项，主要是上次备份时间
+        chrome.storage.sync.set(QZone_Config);
+
+        // 保存数据到Storage
+        chrome.storage.local.set(backupInfos, function() {
+            console.info("保存当前备份数据到Storage完成");
+            indicator.complete();
+            resolve(backupInfos);
         });
 
     })
 }
 
+/**
+ * 获取模块旧数据
+ * @param {String} moduleName 模块名称
+ */
+API.Common.getOldModuleData = (moduleName) => {
+    // 新模块数据
+    const module = QZone[moduleName];
+
+    // 旧数据
+    let oldData = module.OLD_Data || [];
+
+    if (moduleName === 'Photos') {
+        // 相册
+        oldData = module.Album.OLD_Data || [];
+    }
+    if (['Boards', 'Visitors'].includes(moduleName)) {
+        // 留言板、访客
+        oldData = module.OLD_Data.items || [];
+    }
+    return oldData;
+}
+
+/**
+ * 获取模块新数据
+ * @param {String} moduleName 模块名称
+ */
+API.Common.getNewModuleData = (moduleName) => {
+    // 新模块数据
+    const module = QZone[moduleName];
+
+    // 旧数据
+    let oldData = module.Data || [];
+
+    if (moduleName === 'Photos') {
+        // 相册
+        oldData = module.Album.Data || [];
+    }
+    if (['Boards', 'Visitors'].includes(moduleName)) {
+        // 留言板、访客
+        oldData = module.Data.items || [];
+    }
+    return oldData;
+}
+
+/**
+ * 获取模块保存的数据
+ * @param {String} moduleName 模块名称
+ */
+API.Common.getSaveModuleData = (moduleName) => {
+    // 新模块数据
+    const module = QZone[moduleName];
+
+    // 数据
+    let data = API.Common.isExport(moduleName) ? module.Data : module.OLD_Data
+
+    if (moduleName === 'Photos') {
+        // 相册
+        data = API.Common.isExport(moduleName) ? module.Album.Data : module.Album.OLD_Data;
+    }
+    return data;
+}
+
+
+/**
+ * 是否新数据导出
+ * @param {String} moduleName 模块名称
+ */
+API.Common.isNewExport = (moduleName) => {
+    // 新模块数据
+    const module = QZone[moduleName];
+    const isExportModule = API.Common.isExport(moduleName);
+
+    // 旧数据
+    let oldData = module.OLD_Data || [];
+
+    // 保存的列表数据
+    let moduleItems = isExportModule ? module.Data : oldData;
+
+    if (moduleName === 'Photos') {
+        // 相册
+        oldData = module.Album.OLD_Data || [];
+        moduleItems = isExportModule ? module.Album.Data : oldData;
+    }
+    if (['Boards', 'Visitors'].includes(moduleName)) {
+        // 留言板、访客
+        oldData = module.OLD_Data.items || [];
+        moduleItems = isExportModule ? module.Data.items : oldData;
+    }
+    return _.isEmpty(oldData) || _.some(moduleItems, item => item.isNewItem || _.some(item.photoList || [], item => item.isNewItem));
+}
+
+/**
+ * 导入备份数据到JSON文件
+ * @param {Object} backupInfos 已备份数据
+ */
+API.Common.exportBackupItemsToJson = async(backupInfos) => {
+
+    // 状态更新器
+    const indicator = new StatusIndicator('Backup_Export');
+    indicator.print();
+
+    const path = API.Common.getModuleRoot('Common') + '/json';
+
+    // 创建JSON文件夹
+    await API.Utils.createFolder(path);
+
+    // 导出的数据
+    const exportData = {
+        Backedup: {}
+    };
+    // 仅导出备份QQ
+    exportData.Backedup[QZone.Common.Target.uin] = backupInfos.Backedup[QZone.Common.Target.uin];
+
+    // 写入JOSN
+    await API.Utils.writeText(JSON.stringify(exportData), path + '/助手备份数据_' + QZone.Common.Target.uin + '.json').then((fileEntry) => {
+        console.info("导出助手备份数据完成", fileEntry);
+    }).catch((error) => {
+        console.error("导出助手备份数据异常", error);
+    });
+
+    // 完成
+    indicator.complete();
+}
+
 /**
  * 是否存在增量备份需求的模块
  */
 API.Common.hasIncrementBackup = () => {
     let hasIncrementBackup = false;
-    for (let key in QZone_Config) {
-        let moduleCfg = QZone_Config[key];
-        if (!moduleCfg) {
+    for (const exportType of QZone.Common.ExportTypes) {
+        if (!QZone_Config.hasOwnProperty(exportType)) {
             continue;
         }
-        let incrCfg = moduleCfg['IncrementType'] || moduleCfg['isIncrement'];
+        const moduleCfg = QZone_Config[exportType];
+        const incrCfg = moduleCfg['IncrementType'] || moduleCfg['isIncrement'];
         if (!incrCfg) {
             continue;
         }
-        if (incrCfg === true || ['LastTime', 'Custom'].indexOf(incrCfg) != -1) {
+        if (incrCfg === true || ['LastTime', 'Custom'].includes(incrCfg)) {
             hasIncrementBackup = true;
             break;
         }
@@ -779,84 +995,66 @@ API.Common.hasIncrementBackup = () => {
  */
 API.Common.getBackupItems = () => {
     return new Promise(function(resolve, reject) {
-        const key = QZone.Common.Target.uin + "_" + QZone_Config.Common.downloadType;
-
-        // 保存数据Storage TODO 保存大小是否受限？
-        chrome.storage.local.get([key], function(data) {
-            console.info("基于Storage获取上次备份数据完成", data[key]);
-            resolve(data[key]);
+        chrome.storage.local.get('Backedup', function(data) {
+            window.Backedup = data || {};
+            resolve(window.Backedup);
         });
-
     })
 }
 
 /**
  * 重置QQ空间备份数据
  */
-API.Common.resetQzoneItems = () => {
-    // 重置说说模块数据
-    QZone.Messages.total = 0;
-    QZone.Messages.Data = [];
-    QZone.Messages.OLD_Data = [];
-
-    // 重置日志模块数据
-    QZone.Blogs.total = 0;
-    QZone.Blogs.Data = [];
-    QZone.Blogs.OLD_Data = [];
-
-    // 重置日记模块数据
-    QZone.Diaries.total = 0;
-    QZone.Diaries.Data = [];
-    QZone.Diaries.OLD_Data = [];
-
-    // 重置相册模块数据
-    QZone.Photos.Album.total = 0;
-    QZone.Photos.Album.Data = [];
-    QZone.Photos.Album.OLD_Data = [];
-
-    // 重置视频模块数据
-    QZone.Videos.total = 0;
-    QZone.Videos.Data = [];
-    QZone.Videos.OLD_Data = [];
-
-    // 重置留言模块数据
-    QZone.Boards.Data = {
-        items: [],
-        authorInfo: {
-            message: '',
-            sign: ''
-        },
-        total: 0
-    };
-    QZone.Boards.OLD_Data = {
-        items: [],
-        authorInfo: {
-            message: '',
-            sign: ''
-        },
-        total: 0
-    };
-
-    // 重置好友模块数据
-    QZone.Friends.total = 0;
-    QZone.Friends.Data = [];
-    QZone.Friends.OLD_Data = [];
-
-    // 重置收藏模块数据
-    QZone.Favorites.total = 0;
-    QZone.Favorites.Data = [];
-    QZone.Favorites.OLD_Data = [];
-
-    // 重置访客模块数据
-    QZone.Visitors.Data = {
-        items: [],
-        total: 0,
-        totalPage: 0
-    }
-    QZone.Visitors.OLD_Data = {
-        items: [],
-        total: 0,
-        totalPage: 0
+API.Common.resetQZoneBackupItems = () => {
+    // 遍历模块清单
+    for (const moduleName of MODULE_NAME_LIST) {
+        // 模块数据
+        const module = QZone[moduleName] || {};
+        switch (moduleName) {
+            case 'Photos':
+                // 相册
+                module.Album.total = 0;
+                module.Album.Data = [];
+                module.Album.OLD_Data = [];
+                break;
+            case 'Boards':
+                // 留言
+                module.Data = {
+                    items: [],
+                    authorInfo: {
+                        message: '',
+                        sign: ''
+                    },
+                    total: 0
+                };
+                module.OLD_Data = {
+                    items: [],
+                    authorInfo: {
+                        message: '',
+                        sign: ''
+                    },
+                    total: 0
+                };
+                break;
+            case 'Visitors':
+                // 访客
+                module.Data = {
+                    items: [],
+                    total: 0,
+                    totalPage: 0
+                }
+                module.OLD_Data = {
+                    items: [],
+                    total: 0,
+                    totalPage: 0
+                }
+                break;
+            default:
+                module.total = 0;
+                module.Data = [];
+                module.OLD_Data = [];
+                break;
+        }
     }
 }
 
@@ -872,43 +1070,89 @@ API.Common.initBackedUpItems = async() => {
     const indicator = new StatusIndicator('InitIncrement');
     indicator.print();
 
-    // 获取已备份数据
-    const Old_QZone = await API.Common.getBackupItems();
-    if (!Old_QZone || Object.keys(Old_QZone).length == 0) {
+    // 获取所有备份QQ的数据
+    window.Backedup = await API.Common.getBackupItems() || {};
+    window.Backedup = window.Backedup.Backedup || {}
+    if (!window.Backedup || Object.keys(window.Backedup).length == 0) {
         // 没有上次备份数据
+        indicator.complete();
         return;
     }
-    // 覆盖更新说说模块全局变量
-    QZone.Messages.OLD_Data = Old_QZone.Messages ? Old_QZone.Messages.Data : [];
-    // 覆盖更新日志模块全局变量
-    QZone.Blogs.OLD_Data = Old_QZone.Blogs ? Old_QZone.Blogs.Data : [];
-    // 覆盖更新私密日记模块全局变量
-    QZone.Diaries.OLD_Data = Old_QZone.Diaries ? Old_QZone.Diaries.Data : [];
-    // 覆盖更新相册模块全局变量
-    QZone.Photos.Album.OLD_Data = Old_QZone.Photos && Old_QZone.Photos.Album ? Old_QZone.Photos.Album.Data : [];
-    // 覆盖更新视频模块全局变量
-    QZone.Videos.OLD_Data = Old_QZone.Videos ? Old_QZone.Videos.Data : [];
-    // 覆盖更新留言板模块全局变量
-    QZone.Boards.OLD_Data = Old_QZone.Boards ? Old_QZone.Boards.Data : {
-        items: [],
-        authorInfo: {
-            message: '',
-            sign: ''
-        },
-        total: 0
-    };
-    // 覆盖更新好友模块全局变量
-    QZone.Friends.OLD_Data = Old_QZone.Friends ? Old_QZone.Friends.Data : [];
-    // 覆盖更新收藏夹模块全局变量
-    QZone.Favorites.OLD_Data = Old_QZone.Favorites ? Old_QZone.Favorites.Data : [];
-    // 覆盖更新分享模块全局变量
-    QZone.Shares.OLD_Data = Old_QZone.Shares ? Old_QZone.Shares.Data : [];
-    // 覆盖更新分享模块全局变量
-    QZone.Visitors.OLD_Data = Old_QZone.Visitors ? Old_QZone.Visitors.Data : {
-        items: [],
-        total: 0,
-        totalPage: 0
-    };
+
+    // 指定QQ号数据
+    const oldDatas = window.Backedup[QZone.Common.Target.uin] || [];
+    if (!oldDatas || oldDatas.length == 0) {
+        // 没有上次备份数据
+        indicator.complete();
+        return;
+    }
+
+    for (const moduleName of MODULE_NAME_LIST) {
+        // 模块数据
+        const module = QZone[moduleName] || {};
+
+        const oldModule = _.find(oldDatas, ['module', moduleName]) || {};
+
+        // 更新模块备份时间
+        if (QZone_Config[moduleName].IncrementType === 'LastTime') {
+            QZone_Config[moduleName].IncrementTime = oldModule.time ? API.Utils.formatDate(oldModule.time / 1000) : Default_IncrementTime;
+        }
+
+        switch (moduleName) {
+            case 'Photos':
+                // 相册
+                module.Album.OLD_Data = oldModule.data || [];
+                // 是否新数据标识
+                module.Album.OLD_Data.forEach(album => {
+                    // 相册标识
+                    album.isNewItem = false;
+
+                    // 相片标识
+                    album.photoList = album.photoList || [];
+                    album.photoList.forEach(photo => {
+                        photo.isNewItem = false;
+                    });
+                });
+                break;
+            case 'Boards':
+                // 留言
+                module.OLD_Data = oldModule.data || {
+                    items: [],
+                    authorInfo: {
+                        message: '',
+                        sign: ''
+                    },
+                    total: 0
+                };
+                // 是否新数据标识
+                module.OLD_Data.items.forEach(item => {
+                    item.isNewItem = false;
+                });
+                break;
+            case 'Visitors':
+                // 访客
+                module.OLD_Data = oldModule.data || {
+                    items: [],
+                    authorInfo: {
+                        message: '',
+                        sign: ''
+                    },
+                    total: 0
+                };
+                // 是否新数据标识
+                module.OLD_Data.items.forEach(item => {
+                    item.isNewItem = false;
+                });
+                break;
+            default:
+                module.OLD_Data = oldModule.data || [];
+                // 是否新数据标识
+                module.OLD_Data.forEach(item => {
+                    item.isNewItem = false;
+                });
+                break;
+        }
+    }
     indicator.complete();
 }
 
@@ -963,7 +1207,10 @@ API.Common.isExport = (moduleType) => {
 API.Common.setCompareFiledInfo = (items, sourceFiled, targetFiled) => {
     // 处理发布时间，兼容增量备份
     for (const item of items) {
-        item[targetFiled] = Math.floor(new Date(item[sourceFiled]).getTime() / 1000);
+        if (!item.hasOwnProperty(sourceFiled) || item.hasOwnProperty(targetFiled)) {
+            continue;
+        }
+        item[targetFiled] = Math.floor(API.Utils.parseDate(item[sourceFiled]).getTime() / 1000);
     }
     return items;
 }
@@ -1070,6 +1317,17 @@ API.Common.downloadUserAvatars = (users) => {
  * @param {Array} friends 好友列表
  */
 API.Common.exportConfigToJson = async() => {
+
+    if (API.Common.isOnlyFileExport()) {
+        // 仅文件导出，无需导出配置文件
+        console.log('仅文件导出，无需导出配置文件');
+        return;
+    }
+
+    // 状态更新器
+    const indicator = new StatusIndicator('User_Config_Infos');
+    indicator.print();
+
     const path = API.Common.getModuleRoot('Common') + '/json';
 
     console.info('生成助手配置JSON开始', QZone_Config);
@@ -1078,4 +1336,17 @@ API.Common.exportConfigToJson = async() => {
     // 写入JOSN
     const jsonFile = await API.Common.writeJsonToJs('QZone_Config', QZone_Config, API.Common.getModuleRoot('Common') + '/json/config.js');
     console.info('生成助手配置JSON结束', jsonFile, QZone_Config);
+
+    // 完成
+    indicator.complete();
+}
+
+/**
+ * 是否仅导出文件
+ */
+API.Common.isOnlyFileExport = () => {
+    // 相册导出类型为文件、视频导出类型为文件
+    const isFile = QZone_Config.Photos.exportType === 'File' && QZone_Config.Videos.exportType === 'File';
+    // 且下载工具不为下载链接
+    return isFile && QZone_Config.Common.downloadType !== 'Thunder_Link';
 }
\ No newline at end of file
diff --git a/src/js/modules/diaries.js b/src/js/modules/diaries.js
index eebc21b..5349b35 100644
--- a/src/js/modules/diaries.js
+++ b/src/js/modules/diaries.js
@@ -7,15 +7,20 @@
  * 导出私密日记数据
  */
 API.Diaries.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Diaries_Row_Infos');
+    indicator.print();
+
     try {
 
         // 获取所有的私密日记数据
         let items = await API.Diaries.getAllList();
-        console.info('私密日记列表获取完成', items);
+        console.log('私密日记列表获取完成，共有日志%i篇', items.length);
 
         // 获取私密日记内容
         items = await API.Diaries.getAllContents(items);
-        console.info('私密日记内容获取完成', items);
+        console.log('私密日记内容列表获取完成，共有日志%i篇', items.length);
 
         // 获取所有的私密日记评论，由普通日志转私密日记的，会保留评论
         items = await API.Diaries.getItemsAllCommentList(items);
@@ -29,11 +34,12 @@ API.Diaries.export = async() => {
         // 根据导出类型导出数据    
         await API.Diaries.exportAllListToFiles(items);
 
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Diaries);
     } catch (error) {
         console.error('私密日记导出异常', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 /**
@@ -80,7 +86,7 @@ API.Diaries.getAllContents = async(items) => {
             await API.Diaries.handerMedias(item, $detailBlog.find("embed"));
 
             // 更改自定义标题
-            item.custom_title = '《{0}》'.format(item.title);
+            item.custom_title = item.title;
             // 添加自定义HTML
             item.custom_html = API.Utils.utf8ToBase64($detailBlog.html());
             // 添加点赞Key
@@ -163,7 +169,7 @@ API.Diaries.getAllList = async() => {
 
             // 合并数据
             QZone.Diaries.Data = API.Utils.unionItems(QZone.Diaries.Data, dataList);
-            if (API.Common.isPreBackupPos(dataList, CONFIG)) {
+            if (!_.isEmpty(QZone.Diaries.OLD_Data) && API.Common.isPreBackupPos(dataList, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Diaries.Data;
             }
@@ -185,7 +191,7 @@ API.Diaries.getAllList = async() => {
     QZone.Diaries.Data = API.Common.unionBackedUpItems(CONFIG, QZone.Diaries.OLD_Data, QZone.Diaries.Data);
 
     // 发表时间倒序
-    QZone.Diaries.Data = API.Utils.sort(QZone.Diaries.Data, CONFIG.PreBackup.field, true);
+    QZone.Diaries.Data = API.Utils.sort(QZone.Diaries.Data, CONFIG.IncrementField, true);
 
     // 完成
     indicator.complete();
@@ -726,34 +732,60 @@ API.Diaries.handerMedias = async(item, embeds) => {
         // 无图片不处理
         return item;
     }
+    // 导出类型
+    const exportType = QZone_Config.Diaries.exportType;
     for (let i = 0; i < embeds.length; i++) {
         const $embed = $(embeds[i]);
         const data_type = $embed.attr('data-type');
         let vid = $embed.attr('data-vid');
-        const height = $embed.attr('height') || '480px';
-        const width = $embed.attr('height') || '600px';
+        const height = $embed.attr('height') || 'auto';
+        const width = $embed.attr('width') || '100%';
         let iframe_url = $embed.attr('src');
+        const srcInfo = API.Utils.toParams(iframe_url);
         switch (data_type) {
             case '1':
                 // 相册视频
                 // MP4地址 
                 const mp4_url = $embed.attr('data-mp4');
-                if (!mp4_url || !vid) {
-                    // 历史数据或特殊数据跳过不处理
-                    console.warn('历史数据或特殊数据跳过不处理', $embed);
-                    return;
+                if (srcInfo.hasOwnProperty('vurl') || mp4_url) {
+                    // 视频下载地址
+                    let vurl = mp4_url || decodeURIComponent(API.Utils.toParams(iframe_url).vurl);
+
+                    // 添加下载任务
+
+                    // 非QQ空间外链
+                    if (!API.Common.isQzoneUrl()) {
+                        const uid = API.Utils.newSimpleUid(8, 16);
+                        const suffix = await API.Utils.autoFileSuffix(vurl);
+                        const custom_filename = uid + suffix;
+
+                        // 添加下载任务
+                        API.Utils.newDownloadTask('Diaries', vurl, 'Diaries/Images', custom_filename, item);
+
+                        // 新的图片离线地址
+                        vurl = 'MarkDown' === exportType ? '../Images/' + custom_filename : 'Images/' + custom_filename;
+                    }
+                    $embed.replaceWith('<video src="{0}" height="auto" width="100%" controls="controls" ></video>'.format(vurl));
+                } else {
+                    if (!vid) {
+                        // 未知数据，不处理
+                        console.warn('未知数据，不处理', $embed);
+                        return;
+                    }
+                    // iframe 播放地址
+                    iframe_url = 'https://h5.qzone.qq.com/video/index?vid=' + vid;
+                    $embed.replaceWith('<iframe src="{0}" height="auto" width="100%" allowfullscreen="true"></iframe>'.format(iframe_url));
                 }
-                // iframe 播放地址
-                iframe_url = 'https://h5.qzone.qq.com/video/index?vid=' + vid;
                 break;
             case '51':
                 // 外部视频
                 if (!vid) {
                     // 历史数据或特殊数据跳过不处理
-                    console.warn('历史数据或特殊数据跳过不处理', $embed);
+                    console.warn('未知数据，不处理', $embed);
                     return;
                 }
                 iframe_url = API.Videos.getTencentVideoUrl(vid);
+                $embed.replaceWith('<iframe src="{0}" height="auto" width="100%" allowfullscreen="true"></iframe>'.format(iframe_url));
                 break;
             default:
                 // 其他的
@@ -763,9 +795,9 @@ API.Diaries.handerMedias = async(item, embeds) => {
                     // 取到VID，默认当外部视频处理
                     iframe_url = API.Videos.getTencentVideoUrl(vid);
                 }
+                $embed.replaceWith('<iframe src="{0}" height="auto" width="100%" allowfullscreen="true"></iframe>'.format(iframe_url));
                 break;
         }
-        $embed.replaceWith('<iframe src="{0}" height="{1}" width="{2}" allowfullscreen="true"></iframe>'.format(iframe_url, height, width));
     }
     return item;
 }
diff --git a/src/js/modules/favorites.js b/src/js/modules/favorites.js
index 34e9e3f..6f9f576 100644
--- a/src/js/modules/favorites.js
+++ b/src/js/modules/favorites.js
@@ -7,6 +7,11 @@
  * 导出收藏板
  */
 API.Favorites.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Favorites_Row_Infos');
+    indicator.print();
+
     try {
         // 获取所有的收藏列表
         let dataList = await API.Favorites.getAllList();
@@ -17,12 +22,12 @@ API.Favorites.export = async() => {
         // 根据导出类型导出数据
         await API.Favorites.exportAllToFiles(dataList);
 
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Favorites);
-
     } catch (error) {
         console.error('收藏导出异常', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 
@@ -83,7 +88,7 @@ API.Favorites.getAllList = async() => {
 
             // 合并数据
             QZone.Favorites.Data = API.Utils.unionItems(QZone.Favorites.Data, dataList);
-            if (API.Common.isPreBackupPos(dataList, CONFIG)) {
+            if (!_.isEmpty(QZone.Favorites.OLD_Data) && API.Common.isPreBackupPos(dataList, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Favorites.Data;
             }
@@ -104,7 +109,7 @@ API.Favorites.getAllList = async() => {
     QZone.Favorites.Data = API.Common.unionBackedUpItems(CONFIG, QZone.Favorites.OLD_Data, QZone.Favorites.Data);
 
     // 发表时间倒序
-    QZone.Favorites.Data = API.Utils.sort(QZone.Favorites.Data, CONFIG.PreBackup.field, true);
+    QZone.Favorites.Data = API.Utils.sort(QZone.Favorites.Data, CONFIG.IncrementField, true);
 
     // 完成
     indicator.complete();
@@ -443,7 +448,7 @@ API.Favorites.addMediaToTasks = async(dataList) => {
         }
 
         // 下载视频预览图及视频
-        API.Videos.addDownloadTasks('Favorites', item.custom_videos, module_dir, item, QZone.Favorites.FILE_URLS);
+        API.Videos.addDownloadTasks('Favorites', item.custom_videos, module_dir, item);
 
         // 下载音乐预览图
         for (const audio of item.custom_audios) {
diff --git a/src/js/modules/friends.js b/src/js/modules/friends.js
index b6c0f6c..0105ff9 100644
--- a/src/js/modules/friends.js
+++ b/src/js/modules/friends.js
@@ -7,16 +7,22 @@
  * 导出QQ空间好友
  */
 API.Friends.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Friends_Row_Infos');
+    indicator.print();
+
     try {
         // 获取所有的QQ好友
         let friends = await API.Friends.getAllList();
+        console.log('好友列表获取完成，共有好友%i个', friends.length);
 
         // 添加QQ好友的头像下载
-        API.Common.downloadUserAvatars(friends);
+        API.Common.downloadUserAvatars(_.filter(friends, API.Friends.isNewItem));
 
         // 根据分组名称（非分组ID）进行排序
         friends = API.Utils.sort(friends, 'groupName');
-        console.info('排序后', friends, QZone.Friends.Data)
+        console.log('好友列表排序完成');
 
         // 根据导出类型导出数据
         await API.Friends.exportAllToFiles(friends);
@@ -24,6 +30,9 @@ API.Friends.export = async() => {
     } catch (error) {
         console.error('QQ好友导出异常', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 /**
@@ -184,7 +193,7 @@ API.Friends.isNewItem = (item) => {
     if (!QZone_Config.Friends.isIncrement) {
         return true;
     }
-    return QZone.Friends.OLD_Data.getIndex(item.uin, 'uin') == -1;
+    return API.Common.isNewItem(item) || QZone.Friends.OLD_Data.getIndex(item.uin, 'uin') == -1;
 }
 
 /**
@@ -397,7 +406,7 @@ API.Friends.getZoneAccessList = async(friends) => {
 
     // 遍历
     for (const friend of friends) {
-        if (friend.isMe) {
+        if (friend.isMe || !API.Friends.isNewItem(friend)) {
             indicator.addSkip(friend);
             continue;
         }
@@ -407,7 +416,7 @@ API.Friends.getZoneAccessList = async(friends) => {
             data = API.Utils.toJson(data, /^_Callback\(/);
             if (data.code < 0) {
                 // 获取异常
-                console.warn('获取好友空间访问权限异常：', data);
+                console.warn('获取好友空间访问权限异常：', friend, data);
             }
 
             // 状态码慰-4009表示无权限
diff --git a/src/js/modules/messages.js b/src/js/modules/messages.js
index e3faeea..668f181 100644
--- a/src/js/modules/messages.js
+++ b/src/js/modules/messages.js
@@ -8,6 +8,10 @@
  */
 API.Messages.export = async() => {
 
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Messages_Row_Infos');
+    indicator.print();
+
     try {
 
         // 获取所有的说说数据
@@ -43,12 +47,12 @@ API.Messages.export = async() => {
         // 根据导出类型导出数据    
         await API.Messages.exportAllListToFiles(items);
 
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Messages);
-
     } catch (error) {
         console.error('说说导出异常', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 /**
@@ -109,7 +113,7 @@ API.Messages.getAllList = async() => {
         return await API.Messages.getList(pageIndex, indicator).then(async(dataList) => {
             // 合并数据
             QZone.Messages.Data = API.Utils.unionItems(QZone.Messages.Data, dataList);
-            if (API.Common.isPreBackupPos(dataList, CONFIG)) {
+            if (!_.isEmpty(QZone.Messages.OLD_Data) && API.Common.isPreBackupPos(dataList, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Messages.Data;
             }
@@ -131,7 +135,7 @@ API.Messages.getAllList = async() => {
     QZone.Messages.Data = API.Common.unionBackedUpItems(CONFIG, QZone.Messages.OLD_Data, QZone.Messages.Data);
 
     // 发表时间倒序
-    QZone.Messages.Data = API.Utils.sort(QZone.Messages.Data, CONFIG.PreBackup.field, true);
+    QZone.Messages.Data = API.Utils.sort(QZone.Messages.Data, CONFIG.IncrementField, true);
 
     // 完成
     indicator.complete();
@@ -393,7 +397,7 @@ API.Messages.exportToHtml = async(messages) => {
     } catch (error) {
         console.error('导出说说到HTML异常', error, messages);
     }
-    
+
     // 完成
     indicator.complete();
 
@@ -613,7 +617,7 @@ API.Messages.addMediaToTasks = async(dataList) => {
                     continue;
                 }
                 // 添加视频下载任务
-                API.Videos.addDownloadTasks('Messages', [video], module_dir, item, QZone.Messages.FILE_URLS);
+                API.Videos.addDownloadTasks('Messages', [video], module_dir, item);
             } else {
                 // 普通图片
                 let url = image.url2 || image.url1;
@@ -623,7 +627,7 @@ API.Messages.addMediaToTasks = async(dataList) => {
         }
 
         // 下载视频预览图及视频
-        API.Videos.addDownloadTasks('Messages', item.custom_videos, module_dir, item, QZone.Messages.FILE_URLS);
+        API.Videos.addDownloadTasks('Messages', item.custom_videos, module_dir, item);
         indicator.addSuccess(item.custom_videos);
 
         // 下载音乐预览图
@@ -1087,7 +1091,7 @@ API.Messages.dealLbs = function(items) {
             lbs.pos_y = lbs.pos_y / 1000000
         }
         // 科学计算法处理
-        lbs.pos_x = Number.parseFloat(lbs.pos_x).toString();
-        lbs.pos_y = Number.parseFloat(lbs.pos_y).toString();
+        lbs.pos_x = Number.parseFloat(lbs.pos_x).toString() * 1;
+        lbs.pos_y = Number.parseFloat(lbs.pos_y).toString() * 1;
     }
 }
\ No newline at end of file
diff --git a/src/js/modules/photos.js b/src/js/modules/photos.js
index bc70902..a902e60 100644
--- a/src/js/modules/photos.js
+++ b/src/js/modules/photos.js
@@ -8,6 +8,11 @@
  * 导出相册数据
  */
 API.Photos.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Photos_Row_Infos');
+    indicator.print();
+
     try {
         // 用户选择的备份相册列表
         const albumList = await API.Photos.initAlbums();
@@ -46,12 +51,12 @@ API.Photos.export = async() => {
         // 根据导出类型导出数据    
         await API.Photos.exportAllListToFiles(albumList);
 
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Photos);
-
     } catch (error) {
         console.error('相册导出异常', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 /**
@@ -248,6 +253,13 @@ API.Photos.getAlbumPageList = async(pageIndex, indicator) => {
         QZone.Photos.Album.total = data.albumsInUser || QZone.Photos.Album.total || 0;
         indicator.setTotal(QZone.Photos.Album.total);
 
+        // 更新相册分类信息
+        if (data.classList && data.classList.length > 0) {
+            for (const classItem of data.classList) {
+                QZone.Photos.Class[classItem.id] = classItem.name;
+            }
+        }
+
         let dataList = data.albumList || [];
 
         //  更新获取成功数据
@@ -278,7 +290,7 @@ API.Photos.getAllAlbumList = async() => {
             // 合并数据
             QZone.Photos.Album.Data = API.Utils.unionItems(QZone.Photos.Album.Data, dataList);
 
-            if (API.Common.isPreBackupPos(dataList, CONFIG)) {
+            if (!_.isEmpty(QZone.Photos.Album.OLD_Data) && API.Common.isPreBackupPos(dataList, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Photos.Album.Data;
             }
@@ -306,6 +318,9 @@ API.Photos.getAllAlbumList = async() => {
     // 完成
     indicator.complete();
 
+    // 重新排序
+    API.Photos.sortAlbums(QZone.Photos.Album.Data);
+
     return QZone.Photos.Album.Data;
 
 }
@@ -386,7 +401,7 @@ API.Photos.getAlbumImageAllList = async(album) => {
 
             // 合并数据
             QZone.Photos.Images[album.id].Data = API.Utils.unionItems(QZone.Photos.Images[album.id].Data, dataList);
-            if (API.Common.isPreBackupPos(dataList, ALBUM_CONFIG)) {
+            if (!_.isEmpty(QZone.Photos.Images[album.id].OLD_Data) && API.Common.isPreBackupPos(dataList, ALBUM_CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Photos.Images[album.id].Data;
             }
@@ -408,7 +423,7 @@ API.Photos.getAlbumImageAllList = async(album) => {
         QZone.Photos.Images[album.id].Data = API.Common.unionBackedUpItems(ALBUM_CONFIG, QZone.Photos.Images[album.id].OLD_Data, QZone.Photos.Images[album.id].Data);
 
         // 上传时间倒序
-        QZone.Photos.Images[album.id].Data = API.Utils.sort(QZone.Photos.Images[album.id].Data, ALBUM_CONFIG.PreBackup.field, true);
+        QZone.Photos.Images[album.id].Data = API.Utils.sort(QZone.Photos.Images[album.id].Data, ALBUM_CONFIG.IncrementField, true);
     }
 
     // 完成
@@ -443,16 +458,17 @@ API.Photos.getAlbumImageAllListByDetail = async(album) => {
         // 相片配置项
     const PHOTO_CONFIG = ALBUM_CONFIG.Images;
 
+    // 正在获取
+    indicator.addDownload(QZone_Config.Photos.Images.pageSize);
+
     // 需要先获取相册的第一页的相片列表，再基于第一页的第一个相片获取相片详情列表
     const firstPagePhotos = await API.Photos.getAlbumImagePageList(album, 0) || [];
     if (firstPagePhotos.length === 0) {
         // 如果第一页就获取失败，就当作整个相册没有相片，懒得再处理了
+        indicator.complete();
         return [];
     }
 
-    // 正在获取
-    indicator.addDownload(QZone_Config.Photos.Images.pageSize);
-
     // 下一页
     const nextPage = async function(albumId, picKey, indicator) {
         // 获取相片详情
@@ -478,7 +494,7 @@ API.Photos.getAlbumImageAllListByDetail = async(album) => {
             // 成功数量
             indicator.setSuccess(QZone.Photos.Images[albumId].Data);
 
-            if (API.Common.isPreBackupPos(dataList, ALBUM_CONFIG) || data.last === 1) {
+            if (!_.isEmpty(QZone.Photos.Images[albumId].OLD_Data) && API.Common.isPreBackupPos(dataList, ALBUM_CONFIG) || data.last === 1) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Photos.Images[albumId].Data;
             }
@@ -509,7 +525,7 @@ API.Photos.getAlbumImageAllListByDetail = async(album) => {
         QZone.Photos.Images[album.id].Data = API.Common.unionBackedUpItems(ALBUM_CONFIG, QZone.Photos.Images[album.id].OLD_Data, QZone.Photos.Images[album.id].Data);
 
         // 上传时间倒序
-        QZone.Photos.Images[album.id].Data = API.Utils.sort(QZone.Photos.Images[album.id].Data, ALBUM_CONFIG.PreBackup.field, true);
+        QZone.Photos.Images[album.id].Data = API.Utils.sort(QZone.Photos.Images[album.id].Data, ALBUM_CONFIG.IncrementField, true);
     }
 
     // 完成
@@ -524,6 +540,11 @@ API.Photos.getAlbumImageAllListByDetail = async(album) => {
  */
 API.Photos.getAllAlbumImageList = async(items) => {
     for (const item of items) {
+        if (!_.some(QZone.Photos.Album.Select, ['id', item.id])) {
+            // 不是用户选中的相册，暂不处理
+            console.log('不是用户选中的相册，暂不处理');
+            continue;
+        }
         if (item.allowAccess === 0) {
             // 没权限的跳过不获取
             console.warn("无权限访问该相册", item);
@@ -541,6 +562,11 @@ API.Photos.getAllAlbumImageList = async(items) => {
  */
 API.Photos.getAllAlbumImageListByDetail = async(items) => {
     for (const item of items) {
+        if (!_.some(QZone.Photos.Album.Select, ['id', item.id])) {
+            // 不是用户选中的相册，暂不处理
+            console.log('不是用户选中的相册，暂不处理');
+            continue;
+        }
         if (item.allowAccess === 0) {
             // 没权限的跳过不获取
             console.warn("无权限访问该相册", item);
@@ -595,7 +621,7 @@ API.Photos.getAlbumAllComments = async(item) => {
             // 合并数据
             item.comments = API.Utils.unionItems(item.comments, data.comments);
 
-            if (API.Common.isPreBackupPos(data.comments, CONFIG)) {
+            if (!_.isEmpty(QZone.Photos.Album.OLD_Data) && API.Common.isPreBackupPos(data.comments, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return item.comments;
             }
@@ -691,7 +717,7 @@ API.Photos.getImageAllComments = async(item, indicator) => {
             item.comments = API.Utils.unionItems(item.comments, data.comments);
             indicator.addSuccess(data.comments);
 
-            if (API.Common.isPreBackupPos(data.comments, CONFIG)) {
+            if (!_.isEmpty(QZone.Photos.Album.OLD_Data) && API.Common.isPreBackupPos(data.comments, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return item.comments;
             }
@@ -854,11 +880,15 @@ API.Photos.addPhotosDownloadTasks = async(album, photos) => {
         // 处理中
         indicator.addDownload(photo);
 
-        let orderNumber = API.Utils.prefixNumber(index + 1, photos.length.toString().length);
+        // 序号，便于排序
+        const orderNumber = API.Utils.prefixNumber(index + 1, photos.length.toString().length);
 
-        const albumClass = API.Utils.filenameValidate(album.className);
-        const albumName = API.Utils.filenameValidate(album.name);
-        const albumFolder = 'Albums/' + albumClass + '/' + albumName;
+        // 相册文件夹
+        const albumFolder = API.Photos.getAlbumFolderPath(album, QZone.Photos.Album.Data.length);
+
+        // 下载存放的文件夹
+        const categoryPath = API.Photos.getFileStructureFolderPath(photo);
+        const downloadFolder = categoryPath ? albumFolder + '/' + categoryPath : albumFolder;
 
         if (API.Common.isQzoneUrl()) {
             // QQ空间外链导出时，不需要添加下载任务，但是需要处理
@@ -879,45 +909,36 @@ API.Photos.addPhotosDownloadTasks = async(album, photos) => {
                 // 下载预览图
                 // 根据配置的清晰度匹配图片，默认高清
                 photo.custom_url = API.Photos.getDownloadUrl(photo, QZone_Config.Photos.Images.exifType);
-                // 获取图片类型
-                const suffix = API.Photos.getPhotoSuffix(photo);
-                photo.custom_pre_filename = filename + suffix;
-                photo.custom_pre_filepath = albumFolder + '/' + photo.custom_pre_filename;
-                // 添加下载任务
-                API.Utils.newDownloadTask('Photos', photo.custom_url, albumFolder, photo.custom_pre_filename, photo);
+
+                // 下载视频预览图
+                photo.custom_pre_filename = filename + API.Photos.getPhotoSuffix(photo);
+                photo.custom_pre_filepath = albumFolder + '/Images/' + photo.custom_pre_filename;
+                API.Utils.newDownloadTask('Photos', photo.custom_url, albumFolder + '/Images', photo.custom_pre_filename, photo);
 
                 // 下载视频
-                photo.custom_filename = QZone.Photos.FILE_URLS.get(photo.video_info.video_url);
-                if (!photo.custom_filename) {
-                    photo.custom_filename = filename + '.mp4';
-                    // 添加下载任务
-                    API.Utils.newDownloadTask('Photos', photo.video_info.video_url, albumFolder, photo.custom_filename, photo);
-                    QZone.Photos.FILE_URLS.set(photo.video_info.video_url, photo.custom_filename);
-                }
-                photo.custom_filepath = albumFolder + '/' + photo.custom_filename;
+                photo.custom_filename = filename + '.mp4';
+                API.Utils.newDownloadTask('Photos', photo.video_info.video_url, downloadFolder, photo.custom_filename, photo);
+                photo.custom_filepath = downloadFolder + '/' + photo.custom_filename;
+
             } else {
                 // 根据配置的清晰度匹配图片，默认高清
                 photo.custom_url = API.Photos.getDownloadUrl(photo, QZone_Config.Photos.Images.exifType);
-                // 预览图
-                photo.custom_pre_filepath = photo.pre;
-
-                photo.custom_filename = QZone.Photos.FILE_URLS.get(photo.custom_url);
-                if (!photo.custom_filename) {
-                    // 获取图片类型
-                    const suffix = API.Photos.getPhotoSuffix(photo);
-                    photo.custom_filename = API.Utils.filenameValidate(orderNumber + '_' + photo.name + '_' + API.Utils.newSimpleUid(8, 16));
-                    photo.custom_filename = photo.custom_filename + suffix;
-                    // 添加下载任务
-                    API.Utils.newDownloadTask('Photos', photo.custom_url, albumFolder, photo.custom_filename, photo);
-                    QZone.Photos.FILE_URLS.set(photo.custom_url, photo.custom_filename);
-                }
-                photo.custom_filepath = albumFolder + '/' + photo.custom_filename;
+
+                // 文件名称
+                photo.custom_filename = API.Utils.filenameValidate(orderNumber + '_' + photo.name + '_' + API.Utils.newSimpleUid(8, 16));
+                photo.custom_filename = photo.custom_filename + API.Photos.getPhotoSuffix(photo);
+
+                // 添加下载任务
+                API.Utils.newDownloadTask('Photos', photo.custom_url, downloadFolder, photo.custom_filename, photo);
+
+                // 文件完整路径
+                photo.custom_filepath = downloadFolder + '/' + photo.custom_filename;
 
                 // 添加预览图，默认使用原图
                 photo.custom_pre_filepath = photo.custom_filepath;
+
                 // 是否下载预览图
-                const isGetPreview = QZone_Config.Photos.Images.isGetPreview;
-                if (isGetPreview) {
+                if (QZone_Config.Photos.Images.isGetPreview) {
                     // 如果需要获取预览图
                     photo.custom_pre_filepath = albumFolder + '/Images/' + photo.custom_filename;
                     // 添加下载任务
@@ -1192,8 +1213,7 @@ API.Photos.exportPhotosToHtml = async(albums) => {
  */
 API.Photos.exportPhotosToMarkdown = async(albums) => {
     for (const album of albums) {
-        let categoryName = album.className || QZone.Photos.Class[album.classid] || '其他';
-        let albumName = API.Utils.filenameValidate(album.name);
+        // 相片列表
         const photos = album.photoList || [];
 
         // 每个相册的进度器
@@ -1202,7 +1222,8 @@ API.Photos.exportPhotosToMarkdown = async(albums) => {
         indicator.setTotal(photos.length);
         indicator.addDownload(photos);
 
-        const folderName = API.Common.getModuleRoot('Photos') + '/' + categoryName + '/' + albumName;
+        // 相册文件夹
+        const folderName = API.Common.getRootFolder() + '/' + API.Photos.getAlbumFolderPath(album, QZone.Photos.Album.Data.length);
         await API.Utils.createFolder(folderName);
 
         // 生成相片年份的MD文件
@@ -1214,7 +1235,9 @@ API.Photos.exportPhotosToMarkdown = async(albums) => {
 
         // 生成相册汇总的MD文件
         const album_content = API.Photos.getPhotosMarkdownContents(photos);
-        await API.Utils.writeText(album_content, folderName + "/" + albumName + '.md');
+        // 相册名称
+        const albumName = API.Utils.filenameValidate(album.name);
+        await API.Utils.writeText(album_content, folderName + '/' + albumName + '.md');
 
         indicator.addSuccess(photos);
         indicator.complete();
@@ -1235,12 +1258,13 @@ API.Photos.getPhotosMarkdownContents = (photos) => {
         contents.push('\r\n');
 
         // 相片
+        const custom_filepath = API.Common.getMediaPath(photo.custom_url || photo.url, photo.custom_filepath, "Photos_MarkDown");
         if (photo.is_video) {
             // 视频
-            contents.push('<video src="{0}" controls="controls" ></video>'.format(photo.custom_filename || photo.custom_url));
+            contents.push('<video height="400" src="{0}" controls="controls" ></video>'.format(custom_filepath));
         } else {
             // 图片
-            contents.push(API.Utils.getImagesMarkdown(photo.custom_filename || photo.custom_url || photo.url, photo.name));
+            contents.push(API.Utils.getImagesMarkdown(custom_filepath, photo.name));
         }
         contents.push('\r\n');
 
@@ -1301,16 +1325,23 @@ API.Photos.getPhotosMarkdownContents = (photos) => {
  * @param {Array} albums 相册列表
  */
 API.Photos.exportPhotosToJson = async(albums) => {
-    let indicator = new StatusIndicator('Photos_Images_Export_Other');
+    // 进度显示器
+    const indicator = new StatusIndicator('Photos_Images_Export_Other');
+
     for (const album of albums) {
-        const categoryName = album.className || QZone.Photos.Class[album.classid] || '其他';
-        const albumName = API.Utils.filenameValidate(album.name);
-        const photos = album.photoList || [];
-        const json = JSON.stringify(photos);
-        const folderName = API.Common.getModuleRoot('Photos') + '/' + categoryName + '/' + albumName;
+        // 相册文件夹
+        const folderName = API.Common.getRootFolder() + '/' + API.Photos.getAlbumFolderPath(album, QZone.Photos.Album.Data.length);
         await API.Utils.createFolder(folderName);
-        await API.Utils.writeText(json, folderName + "/" + albumName + '.json');
+
+        // 相册列表
+        const photos = album.photoList || [];
+
+        // 相册名称
+        const albumName = API.Utils.filenameValidate(album.name);
+        await API.Utils.writeText(JSON.stringify(photos), folderName + '/' + albumName + '.json');
     }
+
+    // 完成
     indicator.complete();
     return albums;
 }
@@ -1385,29 +1416,54 @@ API.Photos.isNewItem = (albumId, photo) => {
  * 初始化相册列表
  */
 API.Photos.initAlbums = async() => {
-    let albumList = QZone.Photos.Album.Data || [];
+    // 备份的相册清单
+    const albumList = QZone.Photos.Album.Data || [];
+    // 用户挑选的相册清单
     const selects = QZone.Photos.Album.Select || [];
     if (selects.length === 0) {
         // 用户没有选择时，默认获取所有相册列表
-        albumList = await API.Photos.getAllAlbumList();
+        albumList.push(...await API.Photos.getAllAlbumList());
     } else {
         // 如果用户选择了备份指定的相册
         // 合并数据
-        QZone.Photos.Album.Data = QZone.Photos.Album.Data.concat(selects);
-        albumList = QZone.Photos.Album.Data;
+        albumList.push(...selects);
     }
+
     // 处理增量相册
-    // 合并、过滤数据
-    QZone.Photos.Album.Data = API.Utils.unionItems(QZone.Photos.Album.OLD_Data, QZone.Photos.Album.Data);
-    let albumIds = [];
-    for (let i = QZone.Photos.Album.Data.length - 1; i >= 0; i--) {
-        const album = QZone.Photos.Album.Data[i];
-        if (albumIds.indexOf(album.id) > -1) {
-            QZone.Photos.Album.Data.splice(i, 1);
-            continue;
-        }
-        albumIds.push(album.id);
+    if (!API.Common.isFullBackup(QZone_Config.Photos)) {
+        // 已备份相册
+        const oldAlbumList = QZone.Photos.Album.OLD_Data || [];
+
+        // 需要拷贝的属性
+        const attrs = ['desc', 'createtime', 'modifytime', 'lastuploadtime', 'order', 'total', 'viewtype'];
+
+        // 最新相册中，移除已备份的相册
+        _.remove(albumList, newAlbum => {
+            // 找到历史备份相册
+            const oldIdx = _.findIndex(oldAlbumList, ['id', newAlbum.id]);
+            if (oldIdx === -1) {
+                return false;
+            }
+            const oldAlbum = oldAlbumList[oldIdx]
+            if (newAlbum.name != oldAlbum.name) {
+                // 如果相册改名，则重新备份，因为文件名都是按相册名归类的。
+                return false;
+            }
+
+            // 拷贝新相册的部分属性到旧相册
+            for (const attr of attrs) {
+                oldAlbum[attr] = newAlbum[attr]
+            }
+            return true;
+        })
+
+        // 合并
+        albumList.push(...oldAlbumList);
     }
+
+    // 重新排序
+    API.Photos.sortAlbums(albumList);
+
     for (const item of albumList) {
         // 添加点赞Key
         item.uniKey = API.Photos.getUniKey(item.id);
@@ -1639,4 +1695,70 @@ API.Photos.getAllVisitorList = async(items) => {
     indicator.complete();
 
     return items;
+}
+
+/**
+ * 获取相册的文件夹
+ * @param {Object} album 相册
+ * @param {Object} total 相册数
+ */
+API.Photos.getAlbumFolderPath = (album, total) => {
+
+    // 相册分类
+    album.className = album.className || QZone.Photos.Class[album.classid] || '其他';
+    const albumClass = API.Utils.filenameValidate(album.className);
+    // 相册名称
+    let albumName = API.Utils.filenameValidate(album.name);
+
+    if (QZone_Config.Photos.RenameType === 'Sort') {
+        // 使用序号命名方式
+        const orderNumber = API.Utils.prefixNumber(album.order + 1, total.toString().length);
+        albumName = orderNumber + '_' + albumName;
+    }
+
+    // 相册文件夹
+    return 'Albums/' + albumClass + '/' + albumName;
+}
+
+/**
+ * 重新排序
+ * @param {Array} albums 相册列表
+ */
+API.Photos.sortAlbums = albums => {
+
+    switch (QZone_Config.Photos.SortType) {
+        case '0':
+            // 最新创建在后
+            API.Utils.sort(albums, 'createtime', false);
+            break;
+        case '1':
+            // 最新创建在前
+            API.Utils.sort(albums, 'createtime', true);
+            break;
+        case '4':
+            // 最新上传在前
+            API.Utils.sort(albums, 'lastuploadtime', true);
+            break;
+        default:
+            // 自定义排序，也就是按序号排序
+            API.Utils.sort(albums, 'order', false);
+            break;
+    }
+
+    // 分类不支持排序，按空间默认顺序
+    API.Utils.sort(albums, 'classid', false);
+
+    // 根据相册索引位置，重新更新相册的排序号，避免相册order字段为0
+    API.Photos.resetAlbumOrderNumber(albums);
+}
+
+/**
+ * 重置相册排序号
+ * @param {Array} albums 相册列表
+ */
+API.Photos.resetAlbumOrderNumber = albums => {
+    for (let idx = 0; idx < albums.length; idx++) {
+        const album = albums[idx];
+        album.order = idx;
+    }
 }
\ No newline at end of file
diff --git a/src/js/modules/shares.js b/src/js/modules/shares.js
index d5a367f..c1a1346 100644
--- a/src/js/modules/shares.js
+++ b/src/js/modules/shares.js
@@ -4,13 +4,19 @@
  */
 
 API.Shares.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Shares_Row_Infos');
+    indicator.print();
+
     try {
         // 获取所有的分享列表
         let items = await API.Shares.getAllList();
-        console.info('分享列表获取完成', items);
+        console.log('分享列表获取完成，共有分享%i条', items.length);
 
         // 获取所有的分享评论
         items = await API.Shares.getItemsAllCommentList(items);
+        console.log('分享列表评论获取完成');
 
         // 添加多媒体下载任务
         items = await API.Shares.addMediaToTasks(items);
@@ -23,12 +29,13 @@ API.Shares.export = async() => {
 
         // 根据导出类型导出数据    
         await API.Shares.exportAllListToFiles(items);
-
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Shares);
+        
     } catch (error) {
         console.error('分享导出异常：', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 /**
@@ -67,7 +74,7 @@ API.Shares.getAllList = async() => {
 
             // 合并数据
             QZone.Shares.Data = API.Utils.unionItems(QZone.Shares.Data, dataList);
-            if (API.Common.isPreBackupPos(dataList, CONFIG)) {
+            if (!_.isEmpty(QZone.Shares.OLD_Data) && API.Common.isPreBackupPos(dataList, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Shares.Data;
             }
diff --git a/src/js/modules/statistics.js b/src/js/modules/statistics.js
index 01c1e5d..12f37f3 100644
--- a/src/js/modules/statistics.js
+++ b/src/js/modules/statistics.js
@@ -7,6 +7,135 @@
 /**
  * 获取空间数据所有的坐标信息
  */
-API.Statistics.getAllLbs() = function() {
+API.Statistics.getAllLbs = () => {
+    // 所有的坐标信息
+    const lbsItems = [];
 
-}
\ No newline at end of file
+    // 获取所有说说的坐标
+    const messageLbs = API.Messages.getAllLbs(messages);
+    console.log("所有说说坐标信息：", messageLbs);
+    lbsItems.push(...messageLbs);
+
+    return messageLbs;
+}
+
+/**
+ * 获取说说的坐标位置
+ */
+API.Messages.getAllLbs = items => {
+    // 所有的坐标信息
+    const allLbs = [];
+
+    items = items || [];
+
+    for (const item of items) {
+        const lbs = item.lbs;
+        if (!lbs || !lbs.pos_x || !lbs.pos_y) {
+            continue;
+        }
+        const newLbs = Object.assign({}, lbs);
+        newLbs.module = 'Messages';
+        newLbs.source = item;
+        allLbs.push(newLbs);
+    }
+    return allLbs;
+}
+
+
+
+$(function() {
+
+    const chart = echarts.init(document.getElementById('main'));
+
+    const data = API.Statistics.getAllLbs();
+
+    const toData = function(items) {
+        const res = [];
+        for (const item of items) {
+            res.push({
+                name: item.name || item.idname,
+                value: [item.pos_x, item.pos_y]
+            });
+        }
+        return res;
+    }
+
+    const option = {
+        title: {
+            text: 'QQ空间 - 我的打卡足迹',
+            link: 'https://qzone.qq.com',
+            subtext: '基于QQ空间导出助手',
+            sublink: 'https://github.com/ShunCai/QZoneExport',
+            left: 'center'
+        },
+        tooltip: {
+            trigger: 'item'
+        },
+        geo: [{
+            map: 'china',
+            roam: true,
+            center: [115.97, 29.71],
+            label: {
+                show: true
+            },
+            nameMap: {
+                '澳门特别行政区': '澳门',
+                '香港特别行政区': '香港'
+            }
+        }],
+        series: [{
+                type: 'scatter',
+                name: '我的足迹',
+                coordinateSystem: 'geo',
+                geoIndex: 0,
+                data: toData(data)
+            }, {
+                type: 'effectScatter',
+                name: '常驻城市',
+                coordinateSystem: 'geo',
+                geoIndex: 0,
+                data: []
+            },
+            {
+                // 省会  红色五角星
+                type: "scatter",
+                coordinateSystem: "geo",
+                zlevel: 2,
+                rippleEffect: {
+                    //涟漪特效
+                    period: 4,
+                    brushType: "stroke",
+                    scale: 4,
+                },
+                label: {
+                    normal: {
+                        show: true,
+                        position: "top",
+                        color: "#0f0",
+                        formatter: "{b}",
+                        textStyle: {
+                            color: "#0f0",
+                        },
+                    },
+                    emphasis: {
+                        show: true,
+                        color: "#f60",
+                    },
+                },
+                symbol: "image://http://going-global.oss-cn-beijing.aliyuncs.com/20201026/dff56578f2ba465cb967b2124dd17f62.png", //图片
+                symbolSize: 20, //图元的大小。
+                symbolOffset: [0, "-50%"],
+                color: "#000",
+                data: [{
+                    name: '广州市',
+                    value: [113.280637, 23.125178]
+                }],
+            }
+        ]
+    };
+    chart.setOption(option);
+    chart.on('click', function(params) {
+        console.info(params);
+    });
+
+});
\ No newline at end of file
diff --git a/src/js/modules/videos.js b/src/js/modules/videos.js
index 5b9092d..976985f 100644
--- a/src/js/modules/videos.js
+++ b/src/js/modules/videos.js
@@ -7,7 +7,13 @@
  * 导出视频数据
  */
 API.Videos.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Videos_Row_Infos');
+    indicator.print();
+
     try {
+
         // 获取所有的视频列表
         let videos = await API.Videos.getAllList();
 
@@ -21,17 +27,17 @@ API.Videos.export = async() => {
         await API.Videos.getAllLikeList(videos);
 
         // 添加视频下载任务
-        API.Videos.addDownloadTasks('Videos', videos);
+        API.Videos.addDownloadTasks('Videos', videos, 'Videos/Images');
 
         // 根据导出类型导出数据
         await API.Videos.exportAllToFiles(videos);
 
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Videos);
-
     } catch (error) {
         console.error('视频导出异常', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 
@@ -95,7 +101,7 @@ API.Videos.getAllList = async() => {
         return await API.Videos.getPageList(pageIndex, indicator).then(async(dataList) => {
             // 合并数据
             QZone.Videos.Data = API.Utils.unionItems(QZone.Videos.Data, dataList);
-            if (API.Common.isPreBackupPos(dataList, CONFIG)) {
+            if (!_.isEmpty(QZone.Videos.OLD_Data) && API.Common.isPreBackupPos(dataList, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Videos.Data;
             }
@@ -116,7 +122,7 @@ API.Videos.getAllList = async() => {
     QZone.Videos.Data = API.Common.unionBackedUpItems(CONFIG, QZone.Videos.OLD_Data, QZone.Videos.Data);
 
     // 发表时间倒序
-    QZone.Videos.Data = API.Utils.sort(QZone.Videos.Data, CONFIG.PreBackup.field, true);
+    QZone.Videos.Data = API.Utils.sort(QZone.Videos.Data, CONFIG.IncrementField, true);
 
     // 完成
     indicator.complete();
@@ -185,7 +191,7 @@ API.Videos.getAllComments = async(videos) => {
                 // 合并数据
                 video.comments = API.Utils.unionItems(video.comments, data.comments);
 
-                if (API.Common.isPreBackupPos(data.comments, CONFIG)) {
+                if (!_.isEmpty(QZone.Videos.OLD_Data) && API.Common.isPreBackupPos(data.comments, CONFIG)) {
                     // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                     return video.comments;
                 }
@@ -219,22 +225,27 @@ API.Videos.getAllComments = async(videos) => {
  * @param {Array} videos 视频列表
  * @param {string} module_dir 模块相对目录
  * @param {object} source 来源
- * @param {Map} FILE_URLS 模块已下载映射
  */
-API.Videos.addDownloadTasks = (module, videos, module_dir, source, FILE_URLS) => {
-    // 是否为其他模块添加视频下载任务
-    const isOther = module_dir ? true : false;
-    if (!videos || API.Common.isQzoneUrl() || (!isOther && QZone_Config.Videos.exportType == 'Link')) {
+API.Videos.addDownloadTasks = (module, videos, module_dir, source) => {
+    // 是否为视频
+    const isVideo = 'Videos' === module;
+
+    if (!videos || API.Common.isQzoneUrl() || (isVideo && QZone_Config.Videos.exportType == 'Link')) {
         // QQ空间外链、视频备份类型为下载链接、则不添加下载任务
         return;
     }
 
-    // 下载相对目录
-    FILE_URLS = FILE_URLS || QZone.Videos.FILE_URLS;
-    for (const video of videos) {
+    // 遍历
+    for (let idx = 0; idx < videos.length; idx++) {
+        // 视频
+        const video = videos[idx];
+
+        // 序号，便于排序
+        const orderNumber = API.Utils.prefixNumber(idx + 1, videos.length.toString().length);
 
-        if (!isOther && !API.Common.isNewItem(video)) {
+        if (isVideo && !API.Common.isNewItem(video)) {
             // 已备份数据跳过不处理
+            console.warn("已备份数据跳过不处理", video);
             continue;
         }
 
@@ -243,10 +254,11 @@ API.Videos.addDownloadTasks = (module, videos, module_dir, source, FILE_URLS) =>
         // 预览图直接写死后缀
         video.custom_pre_filename = API.Utils.newSimpleUid(8, 16) + '.jpeg';
         video.custom_pre_filepath = 'Images/' + video.custom_pre_filename;
-        API.Utils.newDownloadTask(module, video.custom_pre_url, isOther ? module_dir : 'Videos/Images', video.custom_pre_filename, video);
+        API.Utils.newDownloadTask(module, video.custom_pre_url, module_dir, video.custom_pre_filename, video);
 
         // 如果是外部视频，跳过不下载
         if (video.play_url) {
+            console.warn("外部视频，跳过", video);
             continue;
         }
 
@@ -254,19 +266,23 @@ API.Videos.addDownloadTasks = (module, videos, module_dir, source, FILE_URLS) =>
         video.custom_url = video.url || video.video_url || video.url3;
         if (!video.custom_url || API.Videos.isExternalVideo(video)) {
             // 外部视频跳过不下载
+            console.warn("外部视频，跳过", video);
             continue;
         }
-        let filename = FILE_URLS.get(video.custom_url);
-        if (!filename) {
-            filename = API.Videos.getFileName(video.custom_url);
-        }
-        video.custom_filename = filename;
-        video.custom_filepath = isOther ? 'Images/' + video.custom_filename : video.custom_filename;
-        if (!FILE_URLS.has(video.custom_url)) {
-            // 添加下载任务
-            API.Utils.newDownloadTask(module, video.custom_url, isOther ? module_dir : 'Videos', video.custom_filename, source || video);
-            FILE_URLS.set(video.custom_url, video.custom_filename);
+        video.custom_filename = API.Videos.getFileName(video.custom_url);
+        video.custom_filename = isVideo ? orderNumber + '_' + video.custom_filename : video.custom_filename;
+
+        // 添加下载任务
+        const categoryPath = API.Videos.getFileStructureFolderPath(video);
+        const downloadFolder = categoryPath ? 'Videos/' + categoryPath : 'Videos';
+
+        // 文件路径
+        video.custom_filepath = 'Images/' + video.custom_filename;
+        if (isVideo) {
+            video.custom_filepath = categoryPath ? categoryPath + '/' + video.custom_filename : video.custom_filename;
         }
+
+        API.Utils.newDownloadTask(module, video.custom_url, isVideo ? downloadFolder : module_dir, video.custom_filename, source || video);
     }
     return videos;
 }
@@ -317,13 +333,13 @@ API.Videos.exportToHtml = async(videos) => {
         await API.Common.writeJsonToJs('videos', videos, moduleFolder + '/json/videos.js');
 
         // 生成视频汇总列表HTML
-        await API.Common.writeHtmlofTpl('videos', null, moduleFolder + "/index.html");
+        await API.Common.writeHtmlofTpl('videos', { videos: videos, targetYear: 'ALL' }, moduleFolder + "/index.html");
 
         // 根据年份分组
         const year_maps = API.Utils.groupedByTime(videos, 'uploadTime', 'year');
         for (const [year, year_items] of year_maps) {
             // 生成视频年份列表HTML
-            await API.Common.writeHtmlofTpl('videos', { videos: year_items }, moduleFolder + "/" + year + ".html");
+            await API.Common.writeHtmlofTpl('videos', { videos: year_items, targetYear: year }, moduleFolder + "/" + year + ".html");
         }
 
     } catch (error) {
@@ -409,12 +425,12 @@ API.Videos.getMarkdowns = (videos) => {
         contents.push('\r\n');
 
         // 视频
-        contents.push('<video src="{0}" controls="controls" ></video>'.format(video.custom_filename || video.custom_url || video.url));
+        contents.push('<video height="400" src="{0}" controls="controls" ></video>'.format(video.custom_filepath || video.custom_url || video.url));
         contents.push('\r\n');
 
         // 视频评论 TODO 私密评论处理
         video.comments = video.comments || [];
-        contents.push('> 评论({0})'.format(video.cmtTotal));
+        contents.push('> 评论({0})'.format(video.cmtTotal || video.comments.length));
         contents.push('\r\n');
 
         for (const comment of video.comments) {
diff --git a/src/js/modules/visitors.js b/src/js/modules/visitors.js
index 7908683..d52898c 100644
--- a/src/js/modules/visitors.js
+++ b/src/js/modules/visitors.js
@@ -4,7 +4,13 @@
  */
 
 API.Visitors.export = async() => {
+
+    // 模块总进度更新器
+    const indicator = new StatusIndicator('Visitors_Row_Infos');
+    indicator.print();
+
     try {
+
         // 获取所有的访客列表
         const visitorInfo = await API.Visitors.getAllList();
         console.info('访客列表获取完成', visitorInfo);
@@ -14,12 +20,13 @@ API.Visitors.export = async() => {
 
         // 根据导出类型导出数据    
         await API.Visitors.exportAllListToFiles(visitorInfo);
-
-        // 设置备份时间
-        API.Common.setBackupInfo(QZone_Config.Visitors);
+        
     } catch (error) {
         console.error('访客导出异常：', error);
     }
+
+    // 完成
+    indicator.complete();
 }
 
 /**
@@ -53,7 +60,7 @@ API.Visitors.getAllList = async() => {
             data = API.Utils.toJson(data, /^_Callback\(/) || {};
             if (data.code < 0) {
                 // 获取异常
-                console.warn('获取一页的视频列表异常：', data);
+                console.warn('获取单页的访客列表异常：', nextPageIndex, data);
             }
             data = data.data || {};
             const items = data.items || [];
@@ -72,7 +79,7 @@ API.Visitors.getAllList = async() => {
 
             // 合并数据
             QZone.Visitors.Data.items = API.Utils.unionItems(QZone.Visitors.Data.items, items);
-            if (API.Common.isPreBackupPos(items, CONFIG)) {
+            if (!_.isEmpty(QZone.Visitors.OLD_Data.items) && API.Common.isPreBackupPos(items, CONFIG)) {
                 // 如果备份到已备份过的数据，则停止获取下一页，适用于增量备份
                 return QZone.Visitors.Data;
             }
@@ -266,7 +273,7 @@ API.Visitors.getMarkdown = (item) => {
     if (item.blogs.length > 0) {
         contents.push('{0} 查看了日志  '.format(user_name));
         for (const blog of item.blogs) {
-            contents.push('- 《{0}》  '.format(API.Common.formatContent(blog.name, 'MD')));
+            contents.push('- {0}  '.format(API.Common.formatContent(blog.name, 'MD')));
         }
         contents.push('\n  ');
     }
diff --git a/src/js/options.js b/src/js/options.js
index 691c65e..0b384c3 100644
--- a/src/js/options.js
+++ b/src/js/options.js
@@ -149,7 +149,7 @@
     // 初始化日期选择控件
     $('.increment_time').datetimepicker({
         locale: 'zh-cn',
-        defaultDate: "2005-06-06 00:00:00", // QQ空间正式发行日期？
+        defaultDate: Default_IncrementTime, // QQ空间正式发行日期？
         minDate: "2005-04-01 00:00:00", // QQ空间内测发行日期？
         format: 'YYYY-MM-DD HH:mm:ss',
         toolbarPlacement: 'top',
@@ -198,18 +198,15 @@
             case 'Full':
                 // 全量备份
                 $increment_time_row.hide();
-                $increment_time.val("2005-06-06 00:00:00");
+                $increment_time.val(Default_IncrementTime);
                 break;
             case 'LastTime':
                 // 上次备份
-                $increment_time_row.show();
-                $increment_time.val(target_module.PreBackup.time);
-                $increment_time.attr('readonly', true);
+                $increment_time_row.hide();
                 break;
             case 'Custom':
                 // 自定义
                 $increment_time_row.show();
-                $increment_time.attr('readonly', false);
                 $increment_time.val(target_module.IncrementTime);
                 break;
             default:
@@ -217,55 +214,6 @@
         }
     })
 
-    // 增量数据重置点击事件
-    $(".reset_increment").click(function() {
-        const $this = $(this);
-        const moduleName = $this.attr("data-module");
-        const module = QZone_Config[moduleName];
-        // 获取模块上次备份的信息
-        // 上次备份QQ号
-        const uin = module.PreBackup.uin;
-        if (!uin) {
-            tips('重置QQ：<span class="text-info">无</span><br>重置模块：<span class="text-info">{1}</span><br>上次备份：<span class="text-info">未备份</span><br>重置结果：<span class="text-info">无需重置</span>'.format(uin, moduleName));
-            return;
-        }
-        // 上次备份文件下载方式
-        const downloadType = module.PreBackup.downloadType || QZone_Config.Common.downloadType;
-        // 上次备份文件下载方式
-        const time = module.PreBackup.time;
-
-        // 重置上次备份时间
-        module.IncrementTime = '2005-06-06 00:00:00';
-
-        module.PreBackup.time = '2005-06-06 00:00:00';
-
-        // 重置配置
-        chrome.storage.sync.set(QZone_Config, function() {
-            // 覆盖配置
-            loadOptions(QZone_Config);
-
-            // 重置数据
-            // 获取指定模块的上次备份的数据
-            const key = uin + "_" + downloadType;
-
-            // 获取数据
-            chrome.storage.local.get([key], function(data) {
-                if (Object.keys(data).length === 0) {
-                    tips('重置QQ：<span class="text-info">{0}</span><br>重置模块：<span class="text-info">{1}</span><br>下载方式：<span class="text-info">{2}</span><br>上次备份：<span class="text-info">{3}</span><br>重置结果：<span class="text-info">未方式该备份数据</span>'.format(uin, moduleName, downloadType, time));
-                    return;
-                }
-                data[key][moduleName] = undefined;
-                // 保存数据
-                chrome.storage.local.set(data, function(data) {
-                    tips('重置QQ：<span class="text-info">{0}</span><br>重置模块：<span class="text-info">{1}</span><br>下载方式：<span class="text-info">{2}</span><br>上次备份：<span class="text-info">{3}</span><br>重置结果：<span class="text-info">重置成功</span>'.format(uin, moduleName, downloadType, time));
-                    return;
-                });
-            });
-        });
-
-
-    })
-
     // 监听个人中心菜单点击事件
     $('#v-pills-tab a').on('click', function(e) {
         e.preventDefault();
@@ -321,7 +269,7 @@
                 $file_suffix_row.show();
                 $suffix_timeout_row.show();
 
-                $download_type_help.html('不了解Aria2请忽略该项，仅在<span style="color:red">Aria2的1.35.0以上版本</span>测试通过，请确保Aria2服务处于<span style="color:red">启动中</span>，并<span style="color:red">启用RPC服务</span>，目前仅支持<span style="color:red">HTTP协议</span>！');
+                $download_type_help.html('老司机可用Aria2，小白建议用Motrix，请确保Aria2/Motrix服务处于启动中！');
                 break;
             case 'Thunder':
                 $download_status_row.hide();
@@ -335,21 +283,35 @@
                 $suffix_timeout_row.show();
                 $download_thread_row.show();
 
-                $download_type_help.html('仅在<span style="color:red">正版的安装版迅雷（不禁用迅雷基础服务）的10.1.3以上版本</span>测试通过，建议提前启动迅雷，禁用服务或其他版本建议切换迅雷（剪切板）');
+                $download_type_help.html('正版的<span class="text-danger">Windows版迅雷10+</span>以上版本测试通过，，建议先启动迅雷，若无法正常唤醒，可切换迅雷（剪切板唤醒）或Aria2等');
+                break;
+            case 'Thunder_Clipboard':
+                $download_status_row.hide();
+                // 隐藏Aria2配置
+                $common_aria2_rpc_row.hide();
+                $common_aria2_token_row.hide();
+
+                $task_count_row.show();
+                $task_sleep_row.show();
+                $file_suffix_row.show();
+                $suffix_timeout_row.show();
+                $download_thread_row.show();
+
+                $download_type_help.html('正版的<span class="text-danger">Windows版迅雷10+</span>以上版本测试通过，需要<span class="text-danger">先启动迅雷</span>，并<span class="text-danger">打开迅雷设置中的接管剪切板开关</span>');
                 break;
             case 'Thunder_Link':
-                $task_count_row.hide();
-                $task_sleep_row.hide();
                 $download_status_row.hide();
                 // 隐藏Aria2配置
                 $common_aria2_rpc_row.hide();
                 $common_aria2_token_row.hide();
 
+                $task_count_row.show();
+                $task_sleep_row.hide();
                 $file_suffix_row.show();
                 $suffix_timeout_row.show();
                 $download_thread_row.show();
 
-                $download_type_help.html('仅支持迅雷且打开剪切板监听，打开迅雷，复制ZIP包中【<span style="color:red">迅雷下载链接.txt</span>】文本内容自动新建下载任务');
+                $download_type_help.html('<span class="text-danger">打开迅雷设置中的接管剪切板开关</span>，然后复制ZIP包中【<span class="text-danger">迅雷下载链接.txt</span>】中的全部文字内容自动新建下载任务');
                 break;
             case 'Browser':
                 $task_count_row.hide();
@@ -368,7 +330,6 @@
             case 'QZone':
                 $task_count_row.hide();
                 $task_sleep_row.hide();
-                $download_status_row.hide();
                 $file_suffix_row.hide();
                 $suffix_timeout_row.hide();
                 $download_thread_row.hide();
@@ -523,7 +484,7 @@
         let isChecked = $(this).prop("checked");
         // 相片列表类型
         const listType = $('#photos_images_list_type').val();
-        if(listType === 'Detail'){
+        if (listType === 'Detail') {
             $('#photos_images_video').hide();
             return;
         }
@@ -724,12 +685,16 @@
         $("#photos_list_cost_min").val(options.Photos.randomSeconds.min);
         $("#photos_list_cost_max").val(options.Photos.randomSeconds.max);
         $("#photos_list_limit").val(options.Photos.pageSize);
+        $("#photos_albums_sort_type").val(options.Photos.SortType);
+        $("#photos_albums_folder_rename_type").val(options.Photos.RenameType);
         $("#photos_albums_comments_has").prop("checked", options.Photos.Comments.isGet).change();
         $("#photos_albums_comments_cost_min").val(options.Photos.Comments.randomSeconds.min);
         $("#photos_albums_comments_cost_max").val(options.Photos.Comments.randomSeconds.max);
         $("#photos_albums_comments_limit").val(options.Photos.Comments.pageSize);
         // 相片列表
         $("#photos_images_list_type").val(options.Photos.Images.listType).change();
+        // 文件夹结构类型
+        $("#photos_file_structure_type").val(options.Photos.Images.fileStructureType);
         $("#photos_images_cost_min").val(options.Photos.Images.randomSeconds.min);
         $("#photos_images_cost_max").val(options.Photos.Images.randomSeconds.max);
         $("#photos_images_limit").val(options.Photos.Images.pageSize);
@@ -755,6 +720,7 @@
 
         // 视频模块赋值
         $("#videos_exportFormat").val(options.Videos.exportType).change();
+        $("#videos_file_structure_type").val(options.Videos.fileStructureType);
         $("#videos_increment_type").val(options.Videos.IncrementType).change();
         $("#videos_increment_time").val(options.Videos.IncrementTime);
         $("#videos_list_cost_min").val(options.Videos.randomSeconds.min);
@@ -829,8 +795,8 @@
         $("#common_list_retry_count").val(options.Common.listRetryCount);
         $("#common_list_retry_sleep").val(options.Common.listRetrySleep);
         $("#common_download_type").val(options.Common.downloadType).change();
-        $('#common_download_status').prop("checked", options.Common.enabledShelf);
-        chrome.downloads.setShelfEnabled(options.Common.enabledShelf);
+        $('#common_download_status').prop("checked", options.Common.disabledShelf);
+        chrome.downloads.setShelfEnabled && chrome.downloads.setShelfEnabled(!options.Common.disabledShelf);
         $("#common_thunder_task_count").val(options.Common.thunderTaskNum);
         $("#common_thunder_task_sleep").val(options.Common.thunderTaskSleep);
         $("#common_download_thread").val(options.Common.downloadThread);
@@ -986,6 +952,8 @@
         QZone_Config.Photos.IncrementType = $("#photos_increment_type").val();
         QZone_Config.Photos.IncrementTime = $("#photos_increment_time").val();
         QZone_Config.Photos.pageSize = $("#photos_list_limit").val() * 1;
+        QZone_Config.Photos.SortType = $("#photos_albums_sort_type").val();
+        QZone_Config.Photos.RenameType = $("#photos_albums_folder_rename_type").val();
         QZone_Config.Photos.randomSeconds.min = $("#photos_list_cost_min").val() * 1;
         QZone_Config.Photos.randomSeconds.max = $("#photos_list_cost_max").val() * 1;
         QZone_Config.Photos.Comments.isGet = $("#photos_albums_comments_has").prop("checked");
@@ -994,6 +962,7 @@
         QZone_Config.Photos.Comments.pageSize = $("#photos_albums_comments_limit").val() * 1;
 
         QZone_Config.Photos.Images.listType = $("#photos_images_list_type").val();
+        QZone_Config.Photos.Images.fileStructureType = $("#photos_file_structure_type").val();
         QZone_Config.Photos.Images.randomSeconds.min = $("#photos_images_cost_min").val() * 1;
         QZone_Config.Photos.Images.randomSeconds.max = $("#photos_images_cost_max").val() * 1;
         QZone_Config.Photos.Images.pageSize = $("#photos_images_limit").val() * 1;
@@ -1020,6 +989,7 @@
 
         // 视频模块赋值
         QZone_Config.Videos.exportType = $("#videos_exportFormat").val();
+        QZone_Config.Videos.fileStructureType = $("#videos_file_structure_type").val();
         QZone_Config.Videos.IncrementType = $("#videos_increment_type").val();
         QZone_Config.Videos.IncrementTime = $("#videos_increment_time").val();
         QZone_Config.Videos.randomSeconds.min = $("#videos_list_cost_min").val() * 1;
@@ -1094,8 +1064,8 @@
         QZone_Config.Common.listRetryCount = $("#common_list_retry_count").val() * 1;
         QZone_Config.Common.listRetrySleep = $("#common_list_retry_sleep").val() * 1;
         QZone_Config.Common.downloadType = $('#common_download_type').val();
-        QZone_Config.Common.enabledShelf = $('#common_download_status').prop("checked");
-        chrome.downloads.setShelfEnabled(QZone_Config.Common.enabledShelf);
+        QZone_Config.Common.disabledShelf = !$('#common_download_status').prop("checked");
+        chrome.downloads.setShelfEnabled && chrome.downloads.setShelfEnabled(!QZone_Config.Common.disabledShelf);
         QZone_Config.Common.thunderTaskNum = $("#common_thunder_task_count").val() * 1;
         QZone_Config.Common.thunderTaskSleep = $("#common_thunder_task_sleep").val() * 1;
         QZone_Config.Common.downloadThread = $("#common_download_thread").val() * 1;
diff --git a/src/js/popup.js b/src/js/popup.js
index d92927d..8790826 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1,5 +1,9 @@
 (function() {
 
+    // 上次备份类型
+    let PreExportTypes = localStorage.getItem('PreExportTypes') || '[]';
+    PreExportTypes = JSON.parse(PreExportTypes);
+
     // 获取当前选项卡ID
     function getCurrentTabId(callback) {
         chrome.tabs.query({ active: true, currentWindow: true }, function(tabs) {
@@ -32,19 +36,32 @@
 
     const initOwnerOp = (data) => {
         // 是否为当前用户
-        let isOwner = data.Owner.uin == data.Target.uin;
+        const isOwner = data.Owner.uin == data.Target.uin;
 
         // 显示信息
         $("#loginUin").text(data.Owner.uin);
+        $("#loginUin").attr('title', '当前登录账户：' + data.Owner.nickname || data.Owner.name);
+
         $("#targetUin").text(data.Target.uin);
+        $("#targetUin").attr('title', '当前备份账户：' + data.Target.nickname || data.Target.name);
+
         $("#userType").text(isOwner ? '个人模式' : '他人模式');
+        $("#userType").attr('title', isOwner ? '个人模式：将备份自己的空间数据，访问他人空间自动切换他人模式' : '他人模式，将备份他人的空间数据，将会留下访客记录，当然，你有黄钻就当我没说，为什么？真羡慕你看不懂...');
 
-        $("#Diaries").attr("checked", isOwner);
-        $("#Diaries").attr("disabled", !isOwner);
-        $("#Friends").attr("checked", isOwner);
-        $("#Friends").attr("disabled", !isOwner);
-        $("#Favorites").attr("checked", isOwner);
-        $("#Favorites").attr("disabled", !isOwner);
+        // 私有模块
+        const privateTypeList = ['Diaries', 'Friends', 'Favorites'];
+        if (isOwner) {
+            // 个人模式，取消禁用
+            for (const privateType of privateTypeList) {
+                $("#" + privateType).attr("disabled", false);
+            }
+        } else {
+            // 他人模式，禁用模块
+            for (const privateType of privateTypeList) {
+                $("#" + privateType).prop("checked", false);
+                $("#" + privateType).attr("disabled", true);
+            }
+        }
     }
 
     // 初始化助手配置
@@ -60,7 +77,8 @@
                 'File': '助手内部',
                 'Browser': '浏览器',
                 'Aria2': 'Aria2',
-                'Thunder': '迅雷（自动唤起）',
+                'Thunder': '迅雷（助手唤醒）',
+                'Thunder_Clipboard': '迅雷（剪切板唤醒）',
                 'Thunder_Link': '迅雷（下载链接）',
                 'QZone': 'QQ空间外链',
             }
@@ -84,15 +102,19 @@
                     break;
                 case 'Aria2':
                     $download_help_reson.text('将调用Aria2服务下载文件');
-                    $download_help_suggestion.text('点击检查Aria2配置');
+                    $download_help_suggestion.text('点击这里检查Aria2配置');
                     break;
                 case 'Thunder':
                     $download_help_reson.text('将调用本地迅雷下载文件');
                     $download_help_suggestion.text('建议迅雷处于启动状态');
                     break;
+                case 'Thunder_Clipboard':
+                    $download_help_reson.text('将自动复制下载链接');
+                    $download_help_suggestion.text('迅雷需要打开接管剪切板的开关');
+                    break;
                 case 'Thunder_Link':
-                    $download_help_reson.text('将调用本地迅雷下载文件');
-                    $download_help_suggestion.text('建议迅雷处于启动状态');
+                    $download_help_reson.text('仅生成下载链接到备份压缩包中');
+                    $download_help_suggestion.text('需自行添加下载任务');
                     break;
                 case 'QZone':
                     $download_help_reson.text('不下载文件，直接使用QQ空间在线文件地址');
@@ -144,9 +166,9 @@
             }
             let contents = [];
             for (const [className, albums] of albumMap) {
-                contents.push('<optgroup label="' + className + '">');
+                contents.push(`<optgroup data-subtext="${albums.length}" label="${className}">`);
                 for (const album of albums) {
-                    contents.push('<option value="{0}" >{1}</option>'.format(album.id, album.name));
+                    contents.push(`<option data-subtext="${album.total}" value="${album.id}" >${album.name}</option>`);
                 }
                 contents.push('</optgroup>');
             }
@@ -230,10 +252,6 @@
         chrome.runtime.openOptionsPage();
     });
 
-    // 上次备份类型
-    let PreExportTypes = localStorage.getItem('PreExportTypes') || '[]';
-    PreExportTypes = JSON.parse(PreExportTypes);
-
     // 如果存在上次选中，则默认选中上次选择的类型
     if (PreExportTypes.length > 0) {
         // 取消全部选中
diff --git a/src/js/tools.js b/src/js/tools.js
index e7129cd..a11fd74 100644
--- a/src/js/tools.js
+++ b/src/js/tools.js
@@ -7,7 +7,8 @@
         placement: 'auto'
     });
 
-    let tableOptions = {
+    // 本地相册表格
+    $("#localAlbums").bootstrapTable('destroy').bootstrapTable({
         undefinedText: '',
         toggle: 'localAlbums',
         locale: 'zh-CN',
@@ -25,6 +26,12 @@
         toolbar: "#toolbar",
         toolbarAlign: "left",
         columns: [{
+            field: 'className',
+            title: '相册分类',
+            align: 'left',
+            width: "60",
+            sortable: true
+        }, {
             field: 'name',
             title: '相册名称',
             align: 'left',
@@ -37,7 +44,7 @@
             width: "150",
             sortable: true,
             formatter: (value, row, index, field) => {
-                return 'QQ空间备份/Albums/本地/' + value;
+                return rootFolder.name + '/Albums/' + row.className + '/' + value;
             }
         }, {
             field: 'photoList',
@@ -50,33 +57,22 @@
             }
         }],
         data: []
-    };
-
-    $("#localAlbums").bootstrapTable(tableOptions);
-
-    // 浏览器检测
-    if (!window.showDirectoryPicker) {
-        $('#localAlbums-tips').text('无法使用，要求Chromium内核版本86+');
-        $('#selectFolder').attr('disabled');
-        return;
-    }
-
-    const getFolder = async function(dirHandle, name) {
-        try {
-            return await dirHandle.getDirectoryHandle(name);
-        } catch (error) {
+    });
 
-        }
-        return undefined;
+    // 获取文件夹
+    const getFolder = async(dirHandle, name) => {
+        return await dirHandle.getDirectoryHandle(name).catch(() => {
+            return;
+        });
     }
 
-    // 获取所有的相册
-    const getAllPhotos = async function(dirHandle, parentPath) {
+    // 获取所有的相片
+    const getAllPhotos = async function(albumHandle, parentPath) {
         let photos = [];
 
-        parentPath = parentPath + '/' + dirHandle.name;
+        parentPath = parentPath + '/' + albumHandle.name;
 
-        for await (const handle of dirHandle.values()) {
+        for await (const handle of albumHandle.values()) {
             switch (handle.kind) {
                 case 'file':
                     photos.push({
@@ -85,7 +81,7 @@
                     });
                     break;
                 case 'directory':
-                    photos = photos.concat(await getAllPhotos(handle, parentPath + '/' + handle.name));
+                    photos.push(...await getAllPhotos(handle, parentPath))
                     break;
                 default:
                     break;
@@ -94,102 +90,158 @@
         return photos;
     }
 
-    // 打开本地相册
-    $('#selectFolder').click(async function() {
-        // 根目录
-        window.rootFolder = await window.showDirectoryPicker();
-        if (!window.rootFolder) {
-            $('#localAlbums-tips').text('请选择QQ空间备份文件夹！');
-            return;
-        }
-
-        $('#localAlbums-tips').text('正在读取本地相册...');
-
-        // 相册目录
-        let albumsFolder = await getFolder(window.rootFolder, 'Albums');
-        if (!albumsFolder) {
-            return;
+    // 读取相册分类文件夹
+    const readAlbumClassFolders = async folder => {
+        const albumsClassFolder = [];
+        for await (const handle of folder.values()) {
+            if ('file' === handle.kind) {
+                // 排除文件
+                continue;
+            }
+            // 排除指定文件夹，剩余的都算分类文件夹
+            if (['images', 'json', 'js'].indexOf(handle.name.toLowerCase()) > -1) {
+                continue;
+            }
+            albumsClassFolder.push(handle);
         }
+        return albumsClassFolder;
+    }
 
-        // 相册首页文件
-        window.albumIndexFile = await albumsFolder.getFileHandle('index.html');
-        if (!window.albumIndexFile) {
-            return;
+    // 文件是否为视频文件
+    const isVideoFile = (name) => {
+        // 常见的视频格式
+        const fileTypes = ['wmv', 'avi', 'mpeg',
+            'rm', 'rmvb', 'flv', 'mp4', '3gp', , 'mkv',
+            'f4v', 'm4v'
+        ]
+        if (name.indexOf('.') === -1) {
+            return false;
         }
+        return fileTypes.indexOf(name.substring(name.indexOf('.') + 1).toLowerCase()) > -1;
+    }
 
-        // 本地相册目录
-        let localAlbumsFolder = await getFolder(albumsFolder, '本地');
-        if (!localAlbumsFolder) {
-            // 取消按钮禁用
-            $('#generateAlbums').removeAttr("disabled");
-            $('#localAlbums-tips').text('没有读取到本地相册，点击生成按钮将清空本地相册');
-            return;
+    // 转换相册信息
+    const toAlbum = (classFolder, albumFolder, photoFiles) => {
+        // 相册信息
+        const album = {
+            isLocal: true,
+            id: API.Utils.newUid(),
+            name: albumFolder.name,
+            desc: albumFolder.name,
+            classid: API.Utils.newUid(),
+            className: classFolder.name,
+            photoList: photoFiles || []
         }
+        album.total = album.photoList.length
 
-        // 相册名称
-        window.localAlbumList = [];
-        for await (const handle of localAlbumsFolder.values()) {
-            if (!'directory' === handle.kind) {
-                continue;
-            }
-            let allPhotosFile = await getAllPhotos(handle, 'Albums/本地');
-            if (!allPhotosFile || allPhotosFile.length == 0) {
-                continue;
-            }
-            // 相册信息
-            let album = {
-                isLocal: true,
-                id: API.Utils.newUid(),
-                name: handle.name,
-                desc: handle.name,
-                classid: 0,
-                className: '本地',
-                photoList: allPhotosFile
-            }
-            for (const photo of allPhotosFile) {
+        // 相片清单
+        for (const photo of album.photoList) {
 
-                photo.isLocal = album.isLocal;
+            photo.isLocal = album.isLocal;
 
-                photo.albumId = album.id;
-                photo.albumClassId = album.classid;
-                photo.albumClassName = album.className;
-                photo.topicId = album.classid;
-                photo.topicName = album.className;
+            photo.albumId = album.id;
+            photo.albumClassId = album.classid;
+            photo.albumClassName = album.className;
+            photo.topicId = album.classid;
+            photo.topicName = album.className;
 
-                photo.desc = photo.path;
-                photo.name = photo.name;
+            photo.desc = photo.path;
+            photo.name = photo.name;
 
-                photo.pre = photo.path;
-                photo.custom_pre_filepath = photo.path;
+            photo.pre = photo.path;
+            photo.custom_pre_filepath = photo.path;
 
-                photo.raw = photo.path;
-                photo.custom_filepath = photo.path;
+            photo.raw = photo.path;
+            photo.custom_filepath = photo.path;
 
-                photo.url = photo.path;
-                photo.custom_url = photo.path;
+            photo.url = photo.path;
+            photo.custom_url = photo.path;
 
-                photo.is_video = photo.name.toLowerCase().endsWith('.mp4');
-                photo.picKey = API.Utils.newUid();
-                photo.uniKey = photo.picKey
-                if (photo.is_video) {
-                    photo.video_info = {
-                        vid: photo.picKey,
-                        video_url: photo.custom_filepath
-                    }
+            photo.is_video = isVideoFile(photo.name);
+            photo.picKey = API.Utils.newUid();
+            photo.uniKey = photo.picKey
+            if (photo.is_video) {
+                photo.video_info = {
+                    vid: photo.picKey,
+                    video_url: photo.custom_filepath
                 }
+            }
+
+            delete photo.path;
+        }
 
-                delete photo.path;
+        // 随机取一个相片文件当相册预览图
+        const _allPhotosFile = album.photoList.filter(function(item, index, arr) {
+            return item.is_video === undefined || item.is_video === false;
+        });
+        if (!_allPhotosFile || _allPhotosFile.length === 0) {
+            // 如果全是视频，就不搞预览图了
+            return album;
+        }
+        album.custom_filepath = '../' + _allPhotosFile[0].custom_filepath;
+        return album;
+    }
+
+    // 读取当个分类的相册清单
+    const readClassAlbums = async classFolder => {
+        const albums = [];
+        for await (const albumHandle of classFolder.values()) {
+            if ('file' === albumHandle.kind) {
+                // 分类文件夹下不是相册文件夹的，跳过
+                continue;
             }
-            // 相册预览图
-            let _allPhotosFile = allPhotosFile.filter(function(item, index, arr) {
-                return item.is_video === undefined || item.is_video === false;
-            });
-            album.custom_filepath = '../' + _allPhotosFile[0].custom_filepath;
-            album.total = album.photoList.length
+            const photoFiles = await getAllPhotos(albumHandle, 'Albums/' + classFolder.name);
+            // 相册
+            albums.push(toAlbum(classFolder, albumHandle, photoFiles));
+        }
+        return albums;
+    }
+
+    // 读取相册
+    const readAllClassAlbums = async classFolders => {
+        const albums = [];
+        // 相册名称
+        for (const folder of classFolders) {
+            albums.push(...await readClassAlbums(folder));
+        }
+        return albums;
+    }
 
-            window.localAlbumList.push(album);
+    // 读取本地相册
+    const readAlbums = async(rootFolder) => {
+        // 本地相册汇总
+        window.localAlbumList = [];
+
+        $('#localAlbums-tips').text('正在读取本地相册...');
+
+        // 读取相册文件夹
+        const albumsFolder = await getFolder(rootFolder, 'Albums');
+        if (!albumsFolder) {
+            $('#localAlbums-tips').text('选择的文件夹，没有发现Albums文件夹，请选择QQ空间备份文件夹');
+            return;
+        }
+
+        // 读取相册首页index.html文件
+        window.albumIndexFile = await albumsFolder.getFileHandle('index.html').catch(e => {
+            return;
+        });
+        if (!albumIndexFile) {
+            $('#localAlbums-tips').text('Albums文件夹下没有发现index.html文件，请先进行备份文件夹合并');
+            return;
         }
 
+        // 读取排除指定文件夹与非文件夹，得到分类文件夹
+        const classFolders = await readAlbumClassFolders(albumsFolder);
+        if (!classFolders || classFolders.length === 0) {
+            // 取消按钮禁用
+            $('#generateAlbums').removeAttr("disabled");
+            $('#localAlbums-tips').text('没有读取到本地相册，点击生成按钮将清空本地相册');
+            return;
+        }
+
+        // 读取所有相册
+        window.localAlbumList.push(...await readAllClassAlbums(classFolders));
+
         $("#localAlbums").bootstrapTable('load', window.localAlbumList);
         $("#localAlbums").bootstrapTable('resetView');
 
@@ -197,10 +249,32 @@
         $('#generateAlbums').removeAttr("disabled");
 
         $('#localAlbums-tips').text('读取本地相册完成，请点击生成按钮开始生成本地相册');
+    };
+
+    // 打开本地相册
+    $('#selectFolder').click(async function() {
+
+        // 浏览器检测
+        if (!window.showDirectoryPicker) {
+            $('#localAlbums-tips').text('无法使用，要求Chromium内核版本86+');
+            $('#selectFolder').attr('disabled');
+            return;
+        }
+
+        // 选择文件夹
+        showDirectoryPicker().then((folder) => {
+            // 全局变量
+            window.rootFolder = folder;
+
+            // 开始生成相册信息
+            readAlbums(folder);
+        }).catch((e) => {
+            console.warn('取消选择文件夹', e);
+        });
     });
 
     // 写入文件
-    async function writeFile(fileHandle, contents) {
+    const writeFile = async(fileHandle, contents) => {
         // Create a FileSystemWritableFileStream to write to.
         const writable = await fileHandle.createWritable();
         // Write the contents of the file to the stream.
@@ -208,19 +282,20 @@
         // Close the file and write the contents to disk.
         await writable.close();
     }
+
     // 写入相册
     $('#generateAlbums').click(async function() {
 
         $('#localAlbums-tips').text('本地相册生成中...');
 
-        // 公共目录
-        let commonFolder = await getFolder(window.rootFolder, 'Common');
-        if (!commonFolder) {
+        // 相册目录
+        let albumsFolder = await getFolder(window.rootFolder, 'Albums');
+        if (!albumsFolder) {
             return;
         }
 
         // JSON目录
-        let jsonFolder = await getFolder(commonFolder, 'json');
+        let jsonFolder = await getFolder(albumsFolder, 'json');
         if (!jsonFolder) {
             return;
         }
@@ -234,32 +309,394 @@
 
         // 执行JSON的JS文件
         let jsonStr = await jsonFile.text();
-        let albums = JSON.parse(jsonStr.replace('const albums = ', ''));
+        let albums = JSON.parse(jsonStr.replace('window.albums = ', ''));
 
         // 过来本地相册
         albums = albums.filter(function(item, index, arr) {
             return item.isLocal === undefined || item.isLocal === false;
         });
-        // 合并相册
-        albums = albums.concat(window.localAlbumList || []);
-        await writeFile(jsonFileHandle, 'const albums = ' + JSON.stringify(albums)).catch((e) => {
+
+        // 将本地相册合并到QQ空间相册
+        albums.push(...window.localAlbumList);
+
+        // 写入JSON文件
+        writeFile(jsonFileHandle, 'window.albums = ' + JSON.stringify(albums)).then(async() => {
+            // 修改相册首页，添加本地相册
+            // 重新生成相册首页
+            // 根据类别分组
+            const albumsMapping = API.Utils.groupedByField(albums, 'className');
+            const html = await API.Common.getHtmlTemplate('albums', {
+                albumsMapping: albumsMapping
+            });
+
+            writeFile(window.albumIndexFile, html).then(() => {
+                $('#localAlbums-tips').text('本地相册生成完成，请重新查看备份...');
+            }).catch((e) => {
+                console.error(e);
+                $('#localAlbums-tips').text('本地相册生成失败，请尝试关闭正在使用QQ空间备份文件夹的程序，如正在查看的网页...');
+            });
+
+        }).catch((e) => {
+            console.error(e);
             $('#localAlbums-tips').text('本地相册生成失败，请尝试关闭正在使用QQ空间备份文件夹的程序，如正在查看的网页...');
+            return;
         });
 
-        // 修改相册首页，添加本地相册
-        // 重新生成相册首页
-        // 根据类别分组
-        const albumsMapping = API.Utils.groupedByField(albums, 'className');
-        let html = await API.Common.getHtmlTemplate('albums', {
-            albumsMapping: albumsMapping
+    });
+
+    // 相册管理表格
+    const initAlbumManagerTable = data => {
+        $("#albumTable").bootstrapTable('destroy').bootstrapTable({
+            undefinedText: '-',
+            toggle: 'albumTable',
+            locale: 'zh-CN',
+            columns: [{
+                field: 'name',
+                title: '相册名称',
+                align: 'center',
+                sortable: true
+            }, {
+                field: 'photoList',
+                title: '相片数量',
+                align: 'center',
+                sortable: true,
+                formatter: (value, row, index, field) => {
+                    return row.photoList && row.photoList.length || 0;
+                }
+            }, {
+                field: 'operate',
+                title: '操作',
+                align: 'center',
+                clickToSelect: false,
+                events: {
+                    'click .removeAlbum': function(e, value, row, index) {
+                        // 移除选中相册
+                        $("#albumTable").bootstrapTable('remove', {
+                            field: 'id',
+                            values: [row.id]
+                        })
+
+                        // 移除全局变量中的相册
+
+                        // 目标QQ
+                        const targetUin = $('#backedup-uin').val();
+                        const rows = window.Backedup[targetUin];
+                        const photoModule = _.find(rows, ['module', 'Photos']);
+                        _.remove(photoModule.data, ['id', row.id]);
+
+                        chrome.storage.local.set({
+                            Backedup: window.Backedup
+                        }, function() {
+                            console.info("保存当前备份数据到Storage完成");
+
+                            // 刷新QQ号清单
+                            resetUinSelect(Object.keys(window.Backedup));
+
+                            // 触发选中事件
+                            $('#backedup-uin').change();
+                        });
+                    }
+                },
+                formatter: function(value, row, index) {
+                    return [
+                        '<a class="removeAlbum" href="javascript:void(0)" title="删除相册">',
+                        '<i class="fa fa-trash"></i>',
+                        '</a>'
+                    ].join('');
+                }
+            }],
+            data: data
+        })
+    }
+
+
+    // 备份管理表格
+    $("#backedupItems").bootstrapTable('destroy').bootstrapTable({
+        undefinedText: '',
+        toggle: 'backedupItems',
+        locale: 'zh-CN',
+        clickToSelect: true,
+        theadClasses: 'thead-light',
+        toolbar: "#backedup-toolbar",
+        toolbarAlign: "left",
+        columns: [{
+            field: 'operate',
+            align: 'center',
+            width: "80",
+            checkbox: true,
+            clickToSelect: true
+        }, {
+            field: 'module',
+            title: '模块',
+            align: 'left',
+            sortable: true,
+            formatter: (value, row, index, field) => {
+                return MODULE_NAME_MAPS[value];
+            }
+        }, {
+            field: 'total',
+            title: '已备份数量',
+            align: 'left',
+            sortable: true,
+            formatter: (value, row, index, field) => {
+                if (row.module === 'Boards' || row.module === 'Visitors') {
+                    // 留言/访客
+                    return row.data.total || 0
+                }
+                return row.data.length || 0
+            }
+        }, {
+            field: 'time',
+            title: '上次备份时间',
+            align: 'left',
+            sortable: true,
+            formatter: (value, row, index, field) => {
+                return new Date(value).format('yyyy-MM-dd hh:mm:ss');
+            }
+        }, {
+            field: 'other',
+            title: '更多',
+            align: 'center',
+            clickToSelect: false,
+            events: {
+                'click .managerAlbums': function(e, value, row, index) {
+                    // 显示相册管理表格
+                    initAlbumManagerTable(row.data);
+                }
+            },
+            formatter: function(value, row, index) {
+                if (row.module !== 'Photos') {
+                    return;
+                }
+                return [
+                    '<a class="managerAlbums" href="javascript:void(0)" title="管理相册" data-toggle="modal" data-target="#albumTableModal">',
+                    '<i class="fa fa-photo"></i>',
+                    '</a>  '
+                ].join('');
+            }
+        }],
+        data: []
+    });
+
+    // 刷新QQ号下拉
+    const resetUinSelect = (uins) => {
+        const uinSelect = document.getElementById('backedup-uin');
+        if (!uinSelect) {
+            return;
+        }
+        // 清空
+        uinSelect.options.length = 0;
+        for (const uin of uins) {
+            uinSelect.options.add(new Option(uin, uin));
+        }
+    }
+
+    // QQ号选择事件
+    $('#backedup-uin').change(function() {
+        const data = window.Backedup[this.value] || [];
+        console.log('指定QQ数据', this.value, data);
+        $("#backedupItems").bootstrapTable('load', data);
+        $("#backedupItems").bootstrapTable('resetView');
+    })
+
+    // 增量备份显示
+    $('#nav-backedup-tab').on('show.bs.tab', function(event) {
+
+        // 遮罩
+        $('#nav-backedup').mask();
+
+        // 读取已备份数据
+        API.Common.getBackupItems().then(data => {
+            console.log('已备份数据', data);
+            window.Backedup = data.Backedup || {};
+
+            // 刷新QQ号清单
+            resetUinSelect(Object.keys(window.Backedup));
+
+            // 触发选中事件
+            $('#backedup-uin').change();
+
+            // 解除遮罩
+            $('#nav-backedup').unmask();
+        }).catch(e => {
+            console.error('获取已备份数据错误', e)
+        })
+    })
+
+    // 增量备份显示
+    $('#nav-backedup-tab').on('hidden.bs.tab', function(event) {
+        window.Backedup = {};
+    })
+
+    // 导入备份数据
+    const importBackedupData = (importBackedup) => {
+        // 目标QQ
+        let targetUin = $('#backedup-uin').val();
+
+        // 导入数据不一致
+        if (!importBackedup.hasOwnProperty('Backedup')) {
+            alert('导入的非助手备份数据文件');
+            return;
+        }
+
+        // 是否导入其它QQ数据文件，若是，直接全量覆盖
+        const isOtherUin = !importBackedup.Backedup.hasOwnProperty(targetUin);
+        if (isOtherUin && !confirm('导入备份数据非当前QQ号，是否导入，确定导入将全量覆盖导入？')) {
+            return;
+        }
+
+        // 导入的QQ
+        targetUin = Object.keys(importBackedup.Backedup)[0];
+
+        // 开始导入
+        const items = $('#backedupItems').bootstrapTable('getSelections');
+        const modules = items.map(item => item.module);
+        const msg = isOtherUin || modules.length == 0 ? '确认全量导入？' : '确认导入选中行？';
+        if (confirm(msg)) {
+
+            const oldItems = window.Backedup[targetUin] || [];
+            const newItems = importBackedup.Backedup[targetUin] || [];
+            if (modules.length == 0) {
+                // 导入全量模块
+                oldItems.length = 0;
+                oldItems.push(...newItems);
+            } else {
+                // 导入指定模块
+                for (const moduleName of modules) {
+                    const oldTargetIdx = oldItems.getIndex(moduleName, 'module');
+                    const newTargetIdx = newItems.getIndex(moduleName, 'module');
+                    if (newTargetIdx == -1) {
+                        // 导入数据没有找到指定模块，不导入
+                        console.warn('导入数据没有找到指定模块，不导入', moduleName);
+                        continue;
+                    }
+                    if (oldTargetIdx == -1) {
+                        // 没有找到，直接新增
+                        oldItems.push(newItems[newTargetIdx]);
+                        console.log('导入前没有找到指定模块，直接新增', moduleName);
+                        continue;
+                    }
+                    // 存在相同的模块，更新
+                    oldItems[oldTargetIdx] = newItems[newTargetIdx];
+                }
+            }
+
+            window.Backedup[targetUin] = oldItems;
+
+            // 导入完成后，保存
+            chrome.storage.local.set({
+                Backedup: window.Backedup
+            }, function() {
+                console.info("保存当前备份数据到Storage完成");
+
+                // 刷新QQ号清单
+                resetUinSelect(Object.keys(window.Backedup));
+
+                // 触发选中事件
+                $('#backedup-uin').change();
+            });
+        }
+    }
+
+    // 导入按钮点击
+    $('#importBackedup').click(function() {
+
+        // 浏览器检测
+        if (!window.showOpenFilePicker) {
+            $('#backedup-tips').text('无法使用，要求Chromium内核版本86+');
+            return;
+        }
+
+        // 选择文件夹
+        showOpenFilePicker({
+            types: [{
+                description: '助手备份数据',
+                accept: {
+                    'application/json': ['.qzbackedup', '.json']
+                }
+            }],
+            excludeAcceptAllOption: true
+        }).then((files) => {
+            // 遮罩
+            $('#nav-backedup').mask();
+
+            return files[0].getFile();
+        }).then(jsonFile => {
+            return jsonFile.text();
+        }).then(jsonStr => {
+            // 导入的数据
+            const importBackedup = JSON.parse(jsonStr);
+            console.log('读取到的数据', importBackedup);
+
+            // 导入数据
+            importBackedupData(importBackedup);
+
+            // 解除遮罩
+            $('#nav-backedup').unmask();
+
+        }).catch((e) => {
+
+            // 遮罩
+            $('#nav-backedup').unmask();
+
+            console.error('未知异常', e);
         });
+    });
 
-        await writeFile(window.albumIndexFile, html).catch((e) => {
-            $('#localAlbums-tips').text('本地相册生成失败，请尝试关闭正在使用QQ空间备份文件夹的程序，如正在查看的网页...');
-        });;
+    $('#exportBackedup').click(function() {
+        // 遮罩
+        $('#nav-backedup').mask();
+
+        // 导出QQ
+        const targetUin = $('#backedup-uin').val();
+        // 下载数据
+        const downloadData = {
+            Backedup: {}
+        }
+        downloadData.Backedup[targetUin] = window.Backedup[targetUin];
+
+        const urlObject = window.URL || window.webkitURL || window;
+        const export_blob = new Blob([JSON.stringify(downloadData)], { type: "application/json" });
+        const save_link = document.createElement("a")
 
-        $('#localAlbums-tips').text('本地相册生成完成，请重新查看备份...');
+        save_link.href = urlObject.createObjectURL(export_blob);
+        save_link.download = '助手备份数据_' + targetUin + '.json';
+        save_link.click();
 
+        // 遮罩
+        $('#nav-backedup').unmask();
+    });
+
+    // 删除按钮点击
+    $('#resetBackedup').click(function() {
+
+        const items = $('#backedupItems').bootstrapTable('getSelections');
+        const modules = items.map(item => item.module);
+        const msg = modules.length == 0 ? '确认删除全部？' : '确认删除选中行？';
+        if (confirm(msg)) {
+
+            // 遮罩
+            $('#nav-backedup').mask();
+
+            if (modules.length == 0) {
+                // 移除全部
+                $('#backedupItems').bootstrapTable('removeAll');
+            } else {
+                // 移除指定模块
+                $('#backedupItems').bootstrapTable('remove', {
+                    field: 'module',
+                    values: modules
+                })
+            }
+
+            // 保存
+            chrome.storage.local.set({
+                Backedup: window.Backedup
+            }, function() {
+                // 遮罩
+                $('#nav-backedup').unmask();
+            });
+        }
     });
 
-})()
\ No newline at end of file
+})();
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index 44e7d2f..ed10eef 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "QQ空间导出助手",
     "description": "QQ空间导出助手，用于导出备份QQ空间的说说、日志、私密日记、相册、视频、留言板、QQ好友、收藏夹、分享、访客为文件，便于迁移与保存",
-    "version": "1.1.5",
+    "version": "1.1.6",
     "icons": {
         "128": "img/icon-128.png"
     },
@@ -25,7 +25,7 @@
                 "vendor/bootstrap/js/bootstrap-table.min.js",
                 "vendor/bootstrap/js/bootstrap-table-zh-CN.min.js",
                 "vendor/turndown/turndown.js",
-                "vendor/lodash/lodash.js",
+                "vendor/lodash/lodash.min.js",
                 "vendor/filer/filer.min.js",
                 "vendor/jszip/jszip.min.js",
                 "vendor/FileSaver/FileSaver.min.js",
@@ -78,6 +78,7 @@
         "downloads",
         "downloads.shelf",
         "declarativeContent",
+        "clipboardWrite",
         "<all_urls>"
     ]
 }
\ No newline at end of file
diff --git a/src/templates/albums.html b/src/templates/albums.html
index 39a3177..e105cb4 100644
--- a/src/templates/albums.html
+++ b/src/templates/albums.html
@@ -11,6 +11,9 @@
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
+
 	<script type="text/javascript" src="json/albums.js"></script>
 	<script type="text/javascript" src="../Common/js/common.js"></script>
 	<script type="text/javascript" src="../Common/js/sidebar.js"></script>
@@ -39,27 +42,32 @@
 			<div id="albums_html" class="container tz-gallery">
 				<%/* 遍历分类 */%>
 				<%for (const [className, items] of albumsMapping) {%>
-					<h1 class='text-primary'><%:=className%></h1>
+					<h1 class='text-primary' data-sidebar='<%:=className%><span class="badge badge-primary badge-pill itemSize"><%:=items.length%><span>'><%:=className%></h1>
 					<hr>
 					<div class="row">
 						<%/* 遍历相册 */%>
 						<%for (const album of items) {%>
 							<div class="col-md-3 mb-3">
 								<div class="card thumbnail mb-3 shadow-sm">
-									<span class="sidebar-h2" data-tag="h2" data-sidebar="<%:=album.name%>"></span>
+									<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=album.name%>'></span>
+									<span class="badge badge-success badge-pill album-photo-total cursor" title="相片数量"><%:=album.total%></span>
 									<a href="photos.html?albumId=<%:=album.id%>">
 										<img class="card-img" src="<%:=(album.custom_filepath || album.custom_url || album.url || album.pre)%>">
 									</a>
-									<div class="card-body">
-										<span class="card-title"><%:=album.name%></span>
+									<div class="card-body text-truncate">
+										<span class="card-title" data-toggle="tooltip" data-html="true" title="<%:=API.Utils.formatContent(album.name, 'HTML', false, false)%>"><%:=API.Utils.formatContent(album.name, "HTML", false, false)%></span>
+									</div>
+									<div class="pic-num-wrap d-flex justify-content-around">
+										<div class="align-self-end">
+											<span class="text-light fa fa-thumbs-o-up cursor viewlikes" title="查看点赞" data-field="id" data-target="<%:=album.id%>"><%:=album.likes ? album.likes.length : 0%></span>
+										</div>
+										<div class="align-self-end">
+											<span class="text-light fa fa-comments-o cursor viewcomments" title="查看评论" data-field="id" data-target="<%:=album.id%>"><%:=album.comments ? album.comments.length : 0%></span>
+										</div>
+										<div class="align-self-end">
+											<span class="text-light fa fa-eye cursor viewVisitors" title="最近访问" data-field="id" data-target="<%:=album.id%>"><%:=album.custom_visitor ? album.custom_visitor.viewCount : 0%></span>
+										</div>
 									</div>
-									<span class="pic-num-wrap">
-										<span class="text-light fa fa-thumbs-o-up cursor viewlikes" title="查看点赞" data-field="id" data-target="<%:=album.id%>"><%:=album.likes ? album.likes.length : 0%></span>
-										<span class="text-light fa fa-comments-o cursor viewcomments" title="查看评论" data-field="id" data-target="<%:=album.id%>"><%:=album.comments ? album.comments.length : 0%></span>
-										<span class="text-light fa fa-eye cursor viewVisitors" title="最近访问" data-field="id" data-target="<%:=album.id%>"><%:=album.custom_visitor ? album.custom_visitor.viewCount : 0%></span>
-																		
-										<span class="pic-num" title="相片数量"><%:=album.total%></span>
-									</span>
 								</div>
 							</div>
 						<%}%>
diff --git a/src/templates/bloginfo.html b/src/templates/bloginfo.html
index 0ffc0c2..46e810d 100644
--- a/src/templates/bloginfo.html
+++ b/src/templates/bloginfo.html
@@ -12,7 +12,8 @@
 	<link rel="stylesheet" type="text/css" href="../Common/css/common.css">
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
-    
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/video/lg-video.min.js" integrity="sha256-lkYYtHLEk1Rnr3TOXc/l1tfObPXEzvgKwePG49fZ1Rw=" crossorigin="anonymous"></script>
@@ -21,6 +22,7 @@
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/fullscreen/lg-fullscreen.min.js" integrity="sha256-7SXgJ9rT6uPHY7fse2NsZN7Yq96f+9I35bDtUwX8ZHc=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/comment/lg-comment.min.js" integrity="sha256-RszgszIiPRvEWMviw43SzoZwsvKZNbz2Djio7kUemrY=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/autoplay/lg-autoplay.min.js" integrity="sha256-XGqZJI2/fqI+ph7+msYWRIi9NLzsZ2PlhrhltWEUmOM=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
 	<script type="text/javascript" src="json/blogs.js"></script>
@@ -64,48 +66,81 @@ <h5 class="mt-3">评论
 						<span class="text-primary p-1 float-right fa fa-thumbs-up mr-2 cursor viewlikes" title="查看点赞" data-field="blogid" data-target="<%:=blog.blogid%>"><%:=blog.likeTotal || 0 %></span>
 						<span class="text-primary p-1 float-right fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="blogid" data-target="<%:=blog.blogid%>"><%:=blog.custom_visitor && blog.custom_visitor.viewCount || 0 %></span>
 					</h5>
-					<%/* 评论 */%>
-					<%/* 遍历评论 */%>
+					<!-- 日志评论 -->
 					<%if(blog.comments){%>
 						<%for (let index = 0; index < blog.comments.length; index++) {%>
 							<%const comment = blog.comments[index];%>
-							<div class="p-1 border-top comments mt-3">
-								<div class="container comment  m-1 p-0">
-									<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-										<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster.id)%>">
-									</a>
-									<div class="ml-4">
-										<%/* 评论 */%>
-										<div class="container ml-4">
-											<a class="author">
-												<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-													<span><%:=API.Common.formatContent(comment.poster.name)%></span>
-												</a>
-												<span class="text-muted small"><%:=API.Utils.formatDate(comment.postTime)%></span>
-												<span class="border-warning border rounded text-warning small p-1">#<%:=index + 1 %></span>
+							<hr>
+							<div class="comments mt-2">
+								<div class="comment">
+									<div class="d-flex justify-content-start ">
+										<div class="comment-avatar">
+											<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+												<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
 											</a>
 										</div>
-										<div class="messageText ml-4 container m-3">
-											<%:=API.Common.formatContent(comment.content)%>
+										<div class="comment-infos ml-2">
+											<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+												<span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
+											</a>
+											<%if(comment.private){%>
+												<span class="text-warning"> 私密评论 </span>
+											<%}%>
+											<span class="border-warning border rounded text-warning small p-1" title="当前楼层">#<%:=index + 1 %></span>
+											<div class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></div>
 										</div>
-										<%/* 评论回复 */%>
-										<%if(comment.replyNum > 0 && comment.replies){%>
-											<%for(let reply of comment.replies){%>
-												<div class="comments m-1">
-													<div class="container border-top comment p-1">
-														<a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-															<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster.id)%>">
+									</div>
+									<div class="comment-text">
+										<div class="messageText">
+											<p><%:=API.Common.formatContent(comment.content)%></p>
+											<%if(comment.pic){%>
+												<div class="comment-lightgallery">
+													<%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
+														<%const image = comment.pic[cmIdx];%>
+														<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
+															data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+															<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
 														</a>
-														<div class=" ml-4  ">
-															<div class="container ml-4">
-																<a class="author">
-																	<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-																		<span class="text-info"><%:=API.Common.formatContent(reply.poster.name)%></span>
-																	</a>
-																	<span class="text-muted small"><%:=API.Utils.formatDate(reply.postTime)%></span>
+													<%}%>
+												</div>
+											<%}%>
+										</div>
+										<% const replies = comment.replies || comment.list_3 || []%>
+										<%if(replies.length > 0){%>
+											<%for(const reply of replies){%>
+												<div class="comments">
+													<div class="comment">
+														<div class="d-flex justify-content-start">
+															<div class="comment-avatar">
+																<a class="avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																	<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																</a>
+															</div>
+															<div class="comment-infos ml-2">
+																<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																	<span><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
 																</a>
+																<%if(reply.private){%>
+																	<span class="text-warning"> 私密回复 </span>
+																<%}%>
+																<div class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></div>
+															</div>
+														</div>
+														<div class="comment-text">
+															<div class="messageText">
+																<p><%:=API.Common.formatContent(reply.content)%></p>
+																<%if(reply.pic){%>
+																	<div class="comment-lightgallery">
+																		<%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
+																			<%const image = reply.pic[cmIdx];%>
+																			<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
+																				data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+																				<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
+																			</a>
+																		<%}%>
+																	</div>
+																<%}%>
 															</div>
-															<div class="messageText ml-4 container m-1"><%:=API.Common.formatContent(reply.content)%></div>
 														</div>
 													</div>
 												</div>
diff --git a/src/templates/bloginfo_static.html b/src/templates/bloginfo_static.html
index 01be0b7..a8557cc 100644
--- a/src/templates/bloginfo_static.html
+++ b/src/templates/bloginfo_static.html
@@ -12,6 +12,7 @@
 	<link rel="stylesheet" type="text/css" href="../Common/css/common.css">
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
 	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
@@ -21,6 +22,7 @@
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/fullscreen/lg-fullscreen.min.js" integrity="sha256-7SXgJ9rT6uPHY7fse2NsZN7Yq96f+9I35bDtUwX8ZHc=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/comment/lg-comment.min.js" integrity="sha256-RszgszIiPRvEWMviw43SzoZwsvKZNbz2Djio7kUemrY=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/autoplay/lg-autoplay.min.js" integrity="sha256-XGqZJI2/fqI+ph7+msYWRIi9NLzsZ2PlhrhltWEUmOM=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 </head>
 
 <body>
@@ -55,51 +57,85 @@ <h2 id="blog_title" class="text-warning"><%:=blog.custom_title%></h2>
 			<div id="comments_html">
 				<h5 class="mt-3">评论
 					<span class="badge badge-primary badge-pill"><%:=blog.comments && blog.comments.length || 0%></span>
-					<span class="text-primary p-1 float-right fa fa-thumbs-up mr-2 cursor" title="查看点赞" data-field="blogid" data-target="<%:=blog.blogid%>"><%:=blog.likeTotal || 0 %></span>
-					<span class="text-primary p-1 float-right fa fa-eye mr-2 cursor" title="最近访问" data-field="blogid" data-target="<%:=blog.blogid%>"><%:=blog.custom_visitor && blog.custom_visitor.viewCount || 0 %></span>
+					<span class="text-primary p-1 float-right fa fa-thumbs-up mr-2 cursor" title="点赞数" data-field="blogid" data-target="<%:=blog.blogid%>"><%:=blog.likeTotal || 0 %></span>
+					<span class="text-primary p-1 float-right fa fa-eye mr-2 cursor" title="访问数" data-field="blogid" data-target="<%:=blog.blogid%>"><%:=blog.custom_visitor && blog.custom_visitor.viewCount || 0 %></span>
 				</h5>
 				<%/* 评论 */%>
 				<%/* 遍历评论 */%>
 				<%if(blog.comments){%>
 					<%for (let index = 0; index < blog.comments.length; index++) {%>
 						<%const comment = blog.comments[index];%>
-						<div class="p-1 border-top comments mt-3">
-							<div class="container comment  m-1 p-0">
-								<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-									<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster.id)%>">
-								</a>
-								<div class="ml-4">
-									<%/* 评论 */%>
-									<div class="container ml-4">
-										<a class="author">
-											<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-												<span><%:=API.Common.formatContent(comment.poster.name)%></span>
-											</a>
-											<span class="text-muted small"><%:=API.Utils.formatDate(comment.postTime)%></span>
-											<span class="border-warning border rounded text-warning small p-1">#<%:=index + 1 %></span>
+						<hr>
+						<div class="comments mt-2">
+							<div class="comment">
+								<div class="d-flex justify-content-start ">
+									<div class="comment-avatar">
+										<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+											<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
 										</a>
 									</div>
-									<div class="messageText ml-4 container m-3">
-										<%:=API.Common.formatContent(comment.content)%>
+									<div class="comment-infos ml-2">
+										<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+											<span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
+										</a>
+										<%if(comment.private){%>
+											<span class="text-warning"> 私密评论 </span>
+										<%}%>
+										<span class="border-warning border rounded text-warning small p-1" title="当前楼层">#<%:=index + 1 %></span>
+										<div class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></div>
 									</div>
-									<%/* 评论回复 */%>
-									<%if(comment.replyNum > 0 && comment.replies){%>
-										<%for(let reply of comment.replies){%>
-											<div class="comments m-1">
-												<div class="container border-top comment p-1">
-													<a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-														<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster.id)%>">
+								</div>
+								<div class="comment-text">
+									<div class="messageText">
+										<p><%:=API.Common.formatContent(comment.content)%></p>
+										<%if(comment.pic){%>
+											<div class="comment-lightgallery">
+												<%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
+													<%const image = comment.pic[cmIdx];%>
+													<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
+														data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+														<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
 													</a>
-													<div class=" ml-4  ">
-														<div class="container ml-4">
-															<a class="author">
-																<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-																	<span class="text-info"><%:=API.Common.formatContent(reply.poster.name)%></span>
-																</a>
-																<span class="text-muted small"><%:=API.Utils.formatDate(reply.postTime)%></span>
+												<%}%>
+											</div>
+										<%}%>
+									</div>
+									<% const replies = comment.replies || comment.list_3 || []%>
+									<%if(replies.length > 0){%>
+										<%for(const reply of replies){%>
+											<div class="comments">
+												<div class="comment">
+													<div class="d-flex justify-content-start">
+														<div class="comment-avatar">
+															<a class="avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
+															</a>
+														</div>
+														<div class="comment-infos ml-2">
+															<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																<span><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
 															</a>
+															<%if(reply.private){%>
+																<span class="text-warning"> 私密回复 </span>
+															<%}%>
+															<div class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></div>
+														</div>
+													</div>
+													<div class="comment-text">
+														<div class="messageText">
+															<p><%:=API.Common.formatContent(reply.content)%></p>
+															<%if(reply.pic){%>
+																<div class="comment-lightgallery">
+																	<%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
+																		<%const image = reply.pic[cmIdx];%>
+																		<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
+																			data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+																			<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
+																		</a>
+																	<%}%>
+																</div>
+															<%}%>
 														</div>
-														<div class="messageText ml-4 container m-1"><%:=API.Common.formatContent(reply.content)%></div>
 													</div>
 												</div>
 											</div>
diff --git a/src/templates/blogs.html b/src/templates/blogs.html
index 913b2dc..83500e5 100644
--- a/src/templates/blogs.html
+++ b/src/templates/blogs.html
@@ -14,6 +14,8 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/bootstrap-table.min.js" integrity="sha256-BqVxqb61C9Xd1gUXFZd13+wfPnmP/zj7EXriNQ3Jup0=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/locale/bootstrap-table-zh-CN.min.js" integrity="sha256-pE+tLWBaNzEJufpbligmXg6jcxEHGXrWjQe4rv3yUNY=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 	
 	<script src="json/blogs.js"></script>
     <script src="../Common/json/config.js"></script>
diff --git a/src/templates/boards.html b/src/templates/boards.html
index c249b31..c5cd990 100644
--- a/src/templates/boards.html
+++ b/src/templates/boards.html
@@ -5,6 +5,7 @@
 	<link rel="icon" href="https://qzonestyle.gtimg.cn/aoi/img/logo/favicon.ico">
 	<meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 	<title>QQ空间备份-留言板</title>
+	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous">
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/css/lightgallery.css" integrity="sha256-u/8xxXqgHmqInTUqModtj8UvjfzppMhunF8mGI5gpAM=" crossorigin="anonymous">
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/css/lightgallery-bundle.min.css" integrity="sha256-S8sL5U5HwTa3JmR1y0ASCyQH111hgvPpKOkYXZHa4sA=" crossorigin="anonymous">
@@ -12,6 +13,7 @@
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.js"></script>
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
 	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
@@ -21,6 +23,8 @@
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/autoplay/lg-autoplay.min.js" integrity="sha256-XGqZJI2/fqI+ph7+msYWRIi9NLzsZ2PlhrhltWEUmOM=" crossorigin="anonymous"></script>
 	
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
+	
 	<script type="text/javascript" src="../Common/json/config.js"></script>
 	<script type="text/javascript" src="json/boards.js"></script>
 	<script type="text/javascript" src="../Common/js/common.js"></script>
@@ -50,62 +54,63 @@
 			<h4 class="sidebar-h1 mt-1 boards-slogan" data-tag="h1" data-sidebar="主人寄语">主人寄语</h4>
 			<div class="card border p-2 mt-1">
 				<div class="card-body">
-					<%:=authorInfo.message%>
+					<%:=authorInfo.message || '说些寄语，欢迎您的空间访客吧'%>
 				</div>
 			</div>
 			<h4 class="sidebar-h1 mt-3 boards-items" data-tag="h1" data-sidebar="留言板">留言板(<%:=total%>)</h4>
 			<%for (const [year, yearMap] of boardMaps) {%>
 				<span class="sidebar-h1" data-tag="h1" data-sidebar='<%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=API.Utils.sumYearItemSize(yearMap)%><span>'></span>
 				<%for (const [month, monthItems] of yearMap) {%>
-					<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-primary badge-pill itemSize"><%:=monthItems.length%><span>'></span>
+					<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-secondary badge-pill itemSize"><%:=monthItems.length%><span>'></span>
 					<%for (let index = 0; index < monthItems.length; index++) {%>
 						<%const board = monthItems[index]%>
 						<%total = total -1%>
-						<div class="card border p-2 mt-1">
+						<div class="card border mt-1">
 							<div class="card-body">
-								<div class="p-1 comments">
-									<div class="container comment  m-1 p-0">
-										<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(board.uin)%>">
-											<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(board.uin)%>">
-										</a>
-										<div class="ml-4">
-											<div class="container ml-4">
-												<a class="author">
-													<a target="_blank" href="<%:=API.Common.getUserUrl(board.uin)%>">
-														<span><%:=API.Common.formatContent(board.nickname)%></span>
-													</a>
-													<span class="border-warning border rounded text-warning small p-1" title="当前楼层">#<%:=total + 1 %></span>
-													<br>
-													<span class="text-muted small"><%:=API.Utils.formatDate(board.pubtime)%></span>
+								<div class="comments">
+									<div class="comment p-0">
+										<div class="d-flex justify-content-start ">
+											<div class="comment-avatar">
+												<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(board.uin)%>">
+													<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(board.uin)%>" >
 												</a>
 											</div>
-											<div class="messageText ml-4 container m-2">
-												<%:=API.Common.formatContent(board.htmlContent,'HTML', false, true)%>
+											<div class="comment-infos ml-2">
+												<a target="_blank" href="<%:=API.Common.getUserUrl(board.uin)%>">
+													<span><%:=API.Common.formatContent(board.nickname)%></span>
+												</a>
+												<span class="border-warning border rounded text-warning small p-1" title="当前楼层">#<%:=total + 1 %></span>
+												<div class="text-muted small mt-1"><%:=API.Utils.formatDate(board.pubtime)%></div>
 											</div>
-											<%if(board.replyList){%>
-												<div class="p-1 comments m-3">
-													<%for (var reply of board.replyList) {%>
-														<div class="container comment  m-3 p-0">
-															<a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.uin)%>">
-																<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.uin)%>">
-															</a>
-															<div class=" ml-4  ">
-																<div class="container ml-4">
-																	<a class="author">
-																		<a target="_blank" href="<%:=API.Common.getUserUrl(reply.uin)%>">
-																			<span class="text-info"><%:=API.Common.formatContent(reply.nick)%></span>
-																		</a>
-																		<br>
-																		<span class="text-muted small"><%:=API.Utils.formatDate(reply.time)%></span>
-																	</a>
-																</div>
-																<div class="messageText ml-4 container m-2"><%:=API.Common.formatContent(reply.content)%></div>
+										</div>
+										<div class="messageText ml-5">
+											<%:=API.Common.formatContent(board.htmlContent,'HTML', false, true)%>
+										</div>
+										<%if(board.replyList && board.replyList.length > 0){%>
+											<hr>
+											<div class="comments m-3">
+												<%for (const reply of board.replyList) {%>
+													<div class="comment p-0 mt-2">
+														<div class="d-flex justify-content-start ">
+															<div class="comment-avatar">
+																<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(reply.uin)%>">
+																	<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.uin)%>" >
+																</a>
+															</div>
+															<div class="comment-infos ml-2">
+																<a target="_blank" href="<%:=API.Common.getUserUrl(reply.uin)%>">
+																	<span><%:=API.Common.formatContent(reply.nick)%></span>
+																</a>
+																<div class="text-muted small"><%:=API.Utils.formatDate(reply.time)%></div>
 															</div>
 														</div>
-													<%}%>
-												</div>
-											<%}%>
-										</div>
+														<div class="messageText ml-5">
+															<%:=API.Common.formatContent(reply.content)%>
+														</div>
+													</div>
+												<%}%>
+											</div>
+										<%}%>
 									</div>
 								</div>
 							</div>
diff --git a/src/templates/diaries.html b/src/templates/diaries.html
index 113ef84..eae4a27 100644
--- a/src/templates/diaries.html
+++ b/src/templates/diaries.html
@@ -14,6 +14,8 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/bootstrap-table.min.js" integrity="sha256-BqVxqb61C9Xd1gUXFZd13+wfPnmP/zj7EXriNQ3Jup0=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/locale/bootstrap-table-zh-CN.min.js" integrity="sha256-pE+tLWBaNzEJufpbligmXg6jcxEHGXrWjQe4rv3yUNY=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 
     <script type="text/javascript" src="json/diaries.js"></script>
     <script type="text/javascript" src="../Common/json/config.js"></script>
diff --git a/src/templates/diaryinfo.html b/src/templates/diaryinfo.html
index e74a70c..5df27ea 100644
--- a/src/templates/diaryinfo.html
+++ b/src/templates/diaryinfo.html
@@ -12,7 +12,8 @@
 	<link rel="stylesheet" type="text/css" href="../Common/css/common.css">
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
-    
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/video/lg-video.min.js" integrity="sha256-lkYYtHLEk1Rnr3TOXc/l1tfObPXEzvgKwePG49fZ1Rw=" crossorigin="anonymous"></script>
@@ -23,6 +24,8 @@
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/autoplay/lg-autoplay.min.js" integrity="sha256-XGqZJI2/fqI+ph7+msYWRIi9NLzsZ2PlhrhltWEUmOM=" crossorigin="anonymous"></script>
 	
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
+	
 	<script type="text/javascript" src="json/diaries.js"></script>
 	<script type="text/javascript" src="../Common/js/common.js"></script>
 	<script type="text/javascript" src="js/diaryinfo.js"></script>
@@ -69,43 +72,77 @@ <h5 class="mt-3">评论
 					<%if(blog.comments){%>
 						<%for (let index = 0; index < blog.comments.length; index++) {%>
 							<%const comment = blog.comments[index];%>
-							<div class="p-1 border-top comments mt-3">
-								<div class="container comment  m-1 p-0">
-									<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-										<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster.id)%>">
-									</a>
-									<div class="ml-4">
-										<%/* 评论 */%>
-										<div class="container ml-4">
-											<a class="author">
-												<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-													<span><%:=API.Common.formatContent(comment.poster.name)%></span>
-												</a>
-												<span class="text-muted small"><%:=API.Utils.formatDate(comment.postTime)%></span>
-												<span class="border-warning border rounded text-warning small p-1">#<%:=index + 1 %></span>
+							<hr>
+							<div class="comments mt-2">
+								<div class="comment">
+									<div class="d-flex justify-content-start ">
+										<div class="comment-avatar">
+											<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+												<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
 											</a>
 										</div>
-										<div class="messageText ml-4 container m-3">
-											<%:=API.Common.formatContent(comment.content)%>
+										<div class="comment-infos ml-2">
+											<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+												<span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
+											</a>
+											<%if(comment.private){%>
+												<span class="text-warning"> 私密评论 </span>
+											<%}%>
+											<span class="border-warning border rounded text-warning small p-1" title="当前楼层">#<%:=index + 1 %></span>
+											<div class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></div>
 										</div>
-										<%/* 评论回复 */%>
-										<%if(comment.replyNum > 0 && comment.replies){%>
-											<%for(let reply of comment.replies){%>
-												<div class="comments m-1">
-													<div class="container border-top comment p-1">
-														<a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-															<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster.id)%>">
+									</div>
+									<div class="comment-text">
+										<div class="messageText">
+											<p><%:=API.Common.formatContent(comment.content)%></p>
+											<%if(comment.pic){%>
+												<div class="comment-lightgallery">
+													<%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
+														<%const image = comment.pic[cmIdx];%>
+														<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
+															data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+															<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
 														</a>
-														<div class=" ml-4  ">
-															<div class="container ml-4">
-																<a class="author">
-																	<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-																		<span class="text-info"><%:=API.Common.formatContent(reply.poster.name)%></span>
-																	</a>
-																	<span class="text-muted small"><%:=API.Utils.formatDate(reply.postTime)%></span>
+													<%}%>
+												</div>
+											<%}%>
+										</div>
+										<% const replies = comment.replies || comment.list_3 || []%>
+										<%if(replies.length > 0){%>
+											<%for(const reply of replies){%>
+												<div class="comments">
+													<div class="comment">
+														<div class="d-flex justify-content-start">
+															<div class="comment-avatar">
+																<a class="avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																	<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																</a>
+															</div>
+															<div class="comment-infos ml-2">
+																<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																	<span><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
 																</a>
+																<%if(reply.private){%>
+																	<span class="text-warning"> 私密回复 </span>
+																<%}%>
+																<div class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></div>
+															</div>
+														</div>
+														<div class="comment-text">
+															<div class="messageText">
+																<p><%:=API.Common.formatContent(reply.content)%></p>
+																<%if(reply.pic){%>
+																	<div class="comment-lightgallery">
+																		<%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
+																			<%const image = reply.pic[cmIdx];%>
+																			<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
+																				data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+																				<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
+																			</a>
+																		<%}%>
+																	</div>
+																<%}%>
 															</div>
-															<div class="messageText ml-4 container m-1"><%:=API.Common.formatContent(reply.content)%></div>
 														</div>
 													</div>
 												</div>
diff --git a/src/templates/diaryinfo_static.html b/src/templates/diaryinfo_static.html
index e63674e..26e81f7 100644
--- a/src/templates/diaryinfo_static.html
+++ b/src/templates/diaryinfo_static.html
@@ -12,7 +12,8 @@
 	<link rel="stylesheet" type="text/css" href="../Common/css/common.css">
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
-
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/video/lg-video.min.js" integrity="sha256-lkYYtHLEk1Rnr3TOXc/l1tfObPXEzvgKwePG49fZ1Rw=" crossorigin="anonymous"></script>
@@ -21,6 +22,7 @@
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/fullscreen/lg-fullscreen.min.js" integrity="sha256-7SXgJ9rT6uPHY7fse2NsZN7Yq96f+9I35bDtUwX8ZHc=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/comment/lg-comment.min.js" integrity="sha256-RszgszIiPRvEWMviw43SzoZwsvKZNbz2Djio7kUemrY=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/autoplay/lg-autoplay.min.js" integrity="sha256-XGqZJI2/fqI+ph7+msYWRIi9NLzsZ2PlhrhltWEUmOM=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 </head>
 
 <body>
@@ -63,43 +65,77 @@ <h5 class="mt-3">评论
 				<%if(blog.comments){%>
 					<%for (let index = 0; index < blog.comments.length; index++) {%>
 						<%const comment = blog.comments[index];%>
-						<div class="p-1 border-top comments mt-3">
-							<div class="container comment  m-1 p-0">
-								<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-									<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster.id)%>">
-								</a>
-								<div class="ml-4">
-									<%/* 评论 */%>
-									<div class="container ml-4">
-										<a class="author">
-											<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-												<span><%:=API.Common.formatContent(comment.poster.name)%></span>
-											</a>
-											<span class="text-muted small"><%:=API.Utils.formatDate(comment.postTime)%></span>
-											<span class="border-warning border rounded text-warning small p-1">#<%:=index + 1 %></span>
+						<hr>
+						<div class="comments mt-2">
+							<div class="comment">
+								<div class="d-flex justify-content-start ">
+									<div class="comment-avatar">
+										<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+											<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
 										</a>
 									</div>
-									<div class="messageText ml-4 container m-3">
-										<%:=API.Common.formatContent(comment.content)%>
+									<div class="comment-infos ml-2">
+										<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+											<span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
+										</a>
+										<%if(comment.private){%>
+											<span class="text-warning"> 私密评论 </span>
+										<%}%>
+										<span class="border-warning border rounded text-warning small p-1" title="当前楼层">#<%:=index + 1 %></span>
+										<div class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></div>
 									</div>
-									<%/* 评论回复 */%>
-									<%if(comment.replyNum > 0 && comment.replies){%>
-										<%for(let reply of comment.replies){%>
-											<div class="comments m-1">
-												<div class="container border-top comment p-1">
-													<a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-														<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster.id)%>">
+								</div>
+								<div class="comment-text">
+									<div class="messageText">
+										<p><%:=API.Common.formatContent(comment.content)%></p>
+										<%if(comment.pic){%>
+											<div class="comment-lightgallery">
+												<%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
+													<%const image = comment.pic[cmIdx];%>
+													<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
+														data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+														<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
 													</a>
-													<div class=" ml-4  ">
-														<div class="container ml-4">
-															<a class="author">
-																<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-																	<span class="text-info"><%:=API.Common.formatContent(reply.poster.name)%></span>
-																</a>
-																<span class="text-muted small"><%:=API.Utils.formatDate(reply.postTime)%></span>
+												<%}%>
+											</div>
+										<%}%>
+									</div>
+									<% const replies = comment.replies || comment.list_3 || []%>
+									<%if(replies.length > 0){%>
+										<%for(const reply of replies){%>
+											<div class="comments">
+												<div class="comment">
+													<div class="d-flex justify-content-start">
+														<div class="comment-avatar">
+															<a class="avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
+															</a>
+														</div>
+														<div class="comment-infos ml-2">
+															<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																<span><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
 															</a>
+															<%if(reply.private){%>
+																<span class="text-warning"> 私密回复 </span>
+															<%}%>
+															<div class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></div>
+														</div>
+													</div>
+													<div class="comment-text">
+														<div class="messageText">
+															<p><%:=API.Common.formatContent(reply.content)%></p>
+															<%if(reply.pic){%>
+																<div class="comment-lightgallery">
+																	<%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
+																		<%const image = reply.pic[cmIdx];%>
+																		<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
+																			data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+																			<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
+																		</a>
+																	<%}%>
+																</div>
+															<%}%>
 														</div>
-														<div class="messageText ml-4 container m-1"><%:=API.Common.formatContent(reply.content)%></div>
 													</div>
 												</div>
 											</div>
diff --git a/src/templates/favorites.html b/src/templates/favorites.html
index b8761b3..f5085e7 100644
--- a/src/templates/favorites.html
+++ b/src/templates/favorites.html
@@ -15,7 +15,8 @@
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/jquery-mousewheel@3.1.13/jquery.mousewheel.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
-   
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/video/lg-video.min.js" integrity="sha256-lkYYtHLEk1Rnr3TOXc/l1tfObPXEzvgKwePG49fZ1Rw=" crossorigin="anonymous"></script>
@@ -26,6 +27,7 @@
 
 	<script src="https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 
 	<script type="text/javascript" src="../Common/js/common.js"></script>
 	<script type="text/javascript" src="../Common/js/sidebar.js"></script>
@@ -55,114 +57,115 @@
 			<%for (const [year, yearMap] of dataMaps) {%>
 				<span class="sidebar-h1" data-tag="h1" data-sidebar='<%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=API.Utils.sumYearItemSize(yearMap)%><span>'></span>
 				<%for (const [month, monthItems] of yearMap) {%>
-					<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-primary badge-pill itemSize"><%:=monthItems.length%><span>'></span>
+					<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-secondary badge-pill itemSize"><%:=monthItems.length%><span>'></span>
 					<%for (let index = 0; index < monthItems.length; index++) {%>
 						<%const favorite = monthItems[index]%>
 						<%favorite.uid = 'QZFAV-' + API.Utils.newSimpleUid(16)%>
 						<%total = total -1%>
 						<div class="card w-70 mt-3 border">
 							<div class="card-body">
-								<div class="p-1 comments">
-									<div class="container comment  m-1 p-0">
-										<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(API.Favorites.getFavoriteOwner(favorite).uin)%>">
-											<img class="w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(API.Favorites.getFavoriteOwner(favorite).uin)%>">
-										</a>
-										<div class="ml-4">
-											<div class="container ml-4">
-												<a class="author">
-													<a target="_blank" href="<%:=API.Common.getUserUrl(API.Favorites.getFavoriteOwner(favorite).uin)%>">
-														<span><%:=API.Common.formatContent(API.Favorites.getFavoriteOwner(favorite).name)%></span>
-													</a>
-													<span class="border-warning border rounded text-warning small p-1"><%:=API.Favorites.getType(favorite.type)%></span>
+								<div class="comments">
+									<div class="comment p-0">
+										<div class="d-flex justify-content-start ">
+											<div class="comment-avatar">
+												<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(API.Favorites.getFavoriteOwner(favorite).uin)%>">
+													<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(API.Favorites.getFavoriteOwner(favorite).uin)%>" >
+												</a>
+											</div>
+											<div class="comment-infos ml-2">
+												<a target="_blank" href="<%:=API.Common.getUserUrl(API.Favorites.getFavoriteOwner(favorite).uin)%>">
+													<span><%:=API.Common.formatContent(API.Favorites.getFavoriteOwner(favorite).name)%></span>
 												</a>
+												<span class="border-warning border rounded text-warning small p-1"><%:=API.Favorites.getType(favorite.type)%></span>
+												<div class="text-muted small mt-1"><%:=API.Common.formatContent(favorite.custom_create_time)%></div>
 											</div>
-											<div class="messageText ml-4 container m-2">
-												<%if(favorite.shuoshuo_info && favorite.shuoshuo_info.reason){%>
-													<pre><%:=API.Common.formatContent(favorite.shuoshuo_info.reason,'HTML', false, true)%></pre>
-													<hr>
+										</div>
+										<div class="messageText mt-2">
+											<%if(favorite.shuoshuo_info && favorite.shuoshuo_info.reason  && favorite.shuoshuo_info.reason.trim() !== ''){%>
+												<pre><%:=API.Common.formatContent(favorite.shuoshuo_info.reason,'HTML', false, true)%></pre>
+												<hr>
+											<%}%>
+											<%if(favorite.share_info && favorite.share_info.reason  && favorite.share_info.reason.trim() !== ''){%>
+												<pre><%:=API.Common.formatContent(favorite.share_info.reason,'HTML', false, true)%></pre>
+												<hr>
+											<%}%>
+											<%if(favorite.type === 5){%>
+												<%/* 说说 */%>
+												<%if(favorite.shuoshuo_info && favorite.shuoshuo_info.detail_shuoshuo_info && favorite.shuoshuo_info.detail_shuoshuo_info.content){%>
+													<pre><%:=API.Common.formatContent(favorite.shuoshuo_info.detail_shuoshuo_info.content,'HTML', false, false)%></pre>
+												<%}else{%>
+													<pre><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, false)%></pre>
 												<%}%>
-												<%if(favorite.share_info && favorite.share_info.reason){%>
-													<pre><%:=API.Common.formatContent(favorite.share_info.reason,'HTML', false, true)%></pre>
-													<hr>
+											<%}else if(favorite.type === 7){%>
+												<%/* 分享 */%>
+												<%if(favorite.title && favorite.title.trim() !== ''){%>
+													<pre><a target="_blank" href="<%:=API.Favorites.getShareUrl(favorite.share_info)%>"><%:=favorite.title%></a></pre>
 												<%}%>
-												<%if(favorite.type === 5){%>
-													<%/* 说说 */%>
-													<%if(favorite.shuoshuo_info && favorite.shuoshuo_info.detail_shuoshuo_info && favorite.shuoshuo_info.detail_shuoshuo_info.content){%>
-														<pre><%:=API.Common.formatContent(favorite.shuoshuo_info.detail_shuoshuo_info.content,'HTML', false, false)%></pre>
-													<%}else{%>
-														<pre><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, false)%></pre>
-													<%}%>
-												<%}else if(favorite.type === 7){%>
-													<%/* 分享 */%>
-													<%if(favorite.title){%>
-														<pre><a target="_blank" href="<%:=API.Favorites.getShareUrl(favorite.share_info)%>"><%:=favorite.title%></a></pre>
-													<%}%>
-													<%if(favorite.abstract){%>
-														<pre><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%></pre>
-													<%}%>
-												<%}else if(favorite.type === 3){%>
-													<%/* 日志 */%>
-													<%if(favorite.title){%>
-														<pre><a target="_blank" href="http://user.qzone.qq.com/<%:=favorite.blog_info.owner_uin%>/blog/<%:=favorite.blog_info.id%>">《<%:=favorite.title%>》</a></pre>
-													<%}%>
-													<%if(favorite.abstract){%>
-														<pre><%:=API.Common.formatContent(favorite.abstract,'HTML', false, true)%></pre>
-													<%}%>
-												<%}else{%>
+												<%if(favorite.abstract && favorite.abstract.trim() !== ''){%>
 													<pre><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%></pre>
 												<%}%>
-											</div>
+											<%}else if(favorite.type === 3){%>
+												<%/* 日志 */%>
+												<%if(favorite.title && favorite.title.trim() !== ''){%>
+													<pre><a target="_blank" href="http://user.qzone.qq.com/<%:=favorite.blog_info.owner_uin%>/blog/<%:=favorite.blog_info.id%>"><%:=favorite.title%></a></pre>
+												<%}%>
+												<%if(favorite.abstract && favorite.abstract.trim() !== ''){%>
+													<pre><%:=API.Common.formatContent(favorite.abstract,'HTML', false, true)%></pre>
+												<%}%>
+											<%}else{%>
+												<pre><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%></pre>
+											<%}%>
 										</div>
 									</div>
 								</div>
 								<div id="<%:=favorite.uid%>" class='photo-detail' style="display:none">
 									<div class="container">
 										<div class="row">
-											<div class="col-sm text-white-50 text-left">
+											<div class="col text-white-50 text-left">
 												<p>
 													<i title="收藏时间" class="fa fa-clock-o text-primary"><%:=favorite.custom_create_time%></i>
 												</p>
 											</div>
-											<div class="col-sm text-white">
-												<%if(favorite.shuoshuo_info && favorite.shuoshuo_info.reason){%>
-													<pre class="text-white"><%:=API.Common.formatContent(favorite.shuoshuo_info.reason,'HTML', false, true)%></pre>
+											<div class="col text-white text-truncate">
+												<%if(favorite.shuoshuo_info && favorite.shuoshuo_info.reason && favorite.shuoshuo_info.reason.trim() !== ''){%>
+													<pre class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(favorite.shuoshuo_info.reason,'HTML', false, true)%>"><%:=API.Common.formatContent(favorite.shuoshuo_info.reason,'HTML', false, true)%></pre>
 												<%}%>
-												<%if(favorite.share_info && favorite.share_info.reason){%>
-													<pre class="text-white"><%:=API.Common.formatContent(favorite.share_info.reason,'HTML', false, true)%></pre>
+												<%if(favorite.share_info && favorite.share_info.reason && favorite.share_info.reason.trim() !== ''){%>
+													<pre class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(favorite.share_info.reason,'HTML', false, true)%>"><%:=API.Common.formatContent(favorite.share_info.reason,'HTML', false, true)%></pre>
 												<%}%>
 												<%if(favorite.type === 5){%>
 													<%/* 说说 */%>
 													<%if(favorite.shuoshuo_info && favorite.shuoshuo_info.detail_shuoshuo_info && favorite.shuoshuo_info.detail_shuoshuo_info.content){%>
-														<pre class="text-white"><%:=API.Common.formatContent(favorite.shuoshuo_info.detail_shuoshuo_info.content,'HTML', false, false)%></pre>
+														<pre class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(favorite.shuoshuo_info.detail_shuoshuo_info.content,'HTML', false, false)%>"><%:=API.Common.formatContent(favorite.shuoshuo_info.detail_shuoshuo_info.content,'HTML', false, false)%></pre>
 													<%}else{%>
-														<pre class="text-white"><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, false)%></pre>
+														<pre class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, false)%>"><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, false)%></pre>
 													<%}%>
 												<%}else if(favorite.type === 7){%>
 													<%/* 分享 */%>
-													<%if(favorite.title){%>
-														<pre class="text-white"><a target="_blank" href="<%:=API.Favorites.getShareUrl(favorite.share_info)%>"><%:=favorite.title%></a></pre>
+													<%if(favorite.title && favorite.title.trim() !== ''){%>
+														<pre class="text-white" data-toggle="tooltip" data-html="true"><a target="_blank" href="<%:=API.Favorites.getShareUrl(favorite.share_info)%>"><%:=favorite.title%></a></pre>
 													<%}%>
-													<%if(favorite.abstract){%>
-														<pre class="text-white"><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%></pre>
+													<%if(favorite.abstract && favorite.abstract.trim() !== ''){%>
+														<pre class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%>"><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%></pre>
 													<%}%>
 												<%}else if(favorite.type === 3){%>
 													<%/* 日志 */%>
 													<%if(favorite.title){%>
-														<pre class="text-white"><a target="_blank" href="http://user.qzone.qq.com/<%:=favorite.blog_info.owner_uin%>/blog/<%:=favorite.blog_info.id%>">《<%:=favorite.title%>》</a></pre>
+														<pre class="text-white" data-toggle="tooltip" data-html="true" title="<%:=favorite.title%>"><a target="_blank" href="http://user.qzone.qq.com/<%:=favorite.blog_info.owner_uin%>/blog/<%:=favorite.blog_info.id%>"><%:=favorite.title%></a></pre>
 													<%}%>
-													<%if(favorite.abstract){%>
-														<pre class="text-white"><%:=API.Common.formatContent(favorite.abstract,'HTML', false, true)%></pre>
+													<%if(favorite.abstract && favorite.abstract.trim() !== ''){%>
+														<pre class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(favorite.abstract,'HTML', false, true)%>"><%:=API.Common.formatContent(favorite.abstract,'HTML', false, true)%></pre>
 													<%}%>
 												<%}else{%>
-													<pre class="text-white"><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%></pre>
+													<pre class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%>"><%:=API.Common.formatContent(favorite.abstract || favorite.desp,'HTML', false, true)%></pre>
 												<%}%>
 											</div>
-											<div class="col-sm"></div>
+											<div class="col"></div>
 										</div>
 									</div>
 								</div>
 								<%/* 多媒体内容 */%>
-								<div class="medias row p-3 ml-5 lightgallery <%:=API.Common.getImgClassType(favorite)%>">
+								<div class="medias row p-3 lightgallery <%:=API.Common.getImgClassType(favorite)%>">
 									<%/* 视频内容 */%>
 									<%if(favorite.custom_videos){%>
 										<%let imgIdex = 0%>
@@ -213,7 +216,6 @@
 								<%}%>
 							</div>
 							<div class="card-footer text-muted">
-								<%:=API.Common.formatContent(favorite.custom_create_time)%>
 								<span class="border-primary border rounded text-primary small p-1 float-right" title="当前楼层">#<%:=total + 1 %></span>
 							</div>
 						</div>
diff --git a/src/templates/friends.html b/src/templates/friends.html
index f646a44..f076629 100644
--- a/src/templates/friends.html
+++ b/src/templates/friends.html
@@ -16,7 +16,8 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/bootstrap-table.min.js" integrity="sha256-BqVxqb61C9Xd1gUXFZd13+wfPnmP/zj7EXriNQ3Jup0=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap-table@1.19.1/dist/locale/bootstrap-table-zh-CN.min.js" integrity="sha256-pE+tLWBaNzEJufpbligmXg6jcxEHGXrWjQe4rv3yUNY=" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
-
+    <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 
     <script src="json/friends.js"></script>
     <script src="../Common/json/config.js"></script>
diff --git a/src/templates/index.html b/src/templates/index.html
index fb94e4b..f812c35 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -9,6 +9,8 @@
 	<link rel="stylesheet" type="text/css" href="Common/css/common.css">
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 </head>
 
 <body>
diff --git a/src/templates/messages.html b/src/templates/messages.html
index f8b9218..6b772bf 100644
--- a/src/templates/messages.html
+++ b/src/templates/messages.html
@@ -13,6 +13,7 @@
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/jquery-mousewheel@3.1.13/jquery.mousewheel.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
 	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
@@ -25,6 +26,8 @@
 	
 	<script src="https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
+	
 	<script type="text/javascript" src="../Common/json/config.js"></script>
 	<script type="text/javascript" src="json/messages.js"></script>
 	<script type="text/javascript" src="../Common/js/common.js"></script>
@@ -54,259 +57,268 @@
 			<%for (const [year, yearMap] of messageMaps) {%>
 				<span class="sidebar-h1" data-tag="h1" data-sidebar='<%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=API.Utils.sumYearItemSize(yearMap)%><span>'></span>
 				<%for (const [month, monthItems] of yearMap) {%>
-					<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-primary badge-pill itemSize"><%:=monthItems.length%><span>'></span>
+					<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-secondary badge-pill itemSize"><%:=monthItems.length%><span>'></span>
 					<%for (let index = 0; index < monthItems.length; index++) {%>
 						<%const message = monthItems[index]%>
 						<%total = total -1%>
-						<div class="card w-70 mt-3 border">
+						<div class="card w-70 mt-2 border">
 							<div class="card-body">
-								<div class="p-1 comments">
-									<div class="container comment  m-1 p-0">
-										<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(message.uin)%>">
+								<div class="d-flex justify-content-start message-infos">
+									<div class="message-avatar-img">
+										<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(message.uin)%>">
 											<img class="w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(message.uin)%>">
 										</a>
-										<div class="ml-4">
-											<div class="messageText ml-4 container m-2">
-												<%/* 说说内容 */%>
-												<%/* 说说全文 */%>
-												<pre class="card-text content <%:=message.has_more_con ? 'hasMore' : ''%> <%:=config.Messages.isShowMore ? 'more' : ''%> "><%:=API.Common.formatContent(message, "HTML", false, false)%></pre>
-												<%if(message.has_more_con){%>
-													<span class="fa fa-2x <%:=config.Messages.isShowMore ? 'fa-angle-up' : 'fa-angle-down'%> cursor <%:=config.Messages.isShowMore ? 'more' : ''%> readMore" title="<%:=config.Messages.isShowMore ? '收起全文' : '展开全文'%>"></span>
+									</div>
+									<div class="message-info ml-2">
+										<a class="message-avatar-name" target="_blank" href="<%:=API.Common.getUserUrl(message.uin)%>">
+											<%:=API.Common.formatContent(message.name)%>
+										</a>
+    									<div class="message-time text-muted small"><%:=API.Common.formatContent(message.custom_create_time)%></div>
+									</div>
+								</div>
+								<div class="messageText mt-3">
+									<!-- 说说内容 -->
+									<pre class="card-text content <%:=message.has_more_con ? 'hasMore' : ''%> <%:=config.Messages.isShowMore ? 'more' : ''%> "><%:=API.Common.formatContent(message, "HTML", false, false)%></pre>
+									<!-- 说说全文 -->
+									<%if(message.has_more_con){%>
+										<span class="fa fa-2x <%:=config.Messages.isShowMore ? 'fa-angle-up' : 'fa-angle-down'%> cursor <%:=config.Messages.isShowMore ? 'more' : ''%> readMore" title="<%:=config.Messages.isShowMore ? '收起全文' : '展开全文'%>"></span>
+									<%}%>
+									<!-- 语音内容 -->
+									<%if(message.custom_voices){%>
+										<%for (const voice of message.custom_voices) {%>
+											<audio controls src="<%:=(voice.custom_filepath || voice.custom_url)%>"></audio>
+										<%}%>
+									<%}%>
+									<!-- 转发内容 -->
+									<%if(message.rt_tid){%>
+										<blockquote class="source">
+											<a class="float-left" target="_blank" href="<%:=API.Common.getUserUrl(message.rt_uin)%>">
+												<span class="text-info"><%:=API.Common.formatContent(message.rt_uinname)%>：</span>
+											</a>
+											<!-- 转发全文 -->
+											<pre class="card-text content <%:=message.has_more_con ? 'hasMore' : ''%> <%:=config.Messages.isShowMore ? 'more' : ''%> "><%:=API.Common.formatContent(message, "HTML", true, false)%></pre>
+											<%if(message.rt_has_more_con && message.rt_con){%>
+												<span class="fa fa-2x <%:=config.Messages.isShowMore ? 'fa-angle-up' : 'fa-angle-down'%> cursor readMore" title="<%:=config.Messages.isShowMore ? '收起全文' : '展开全文'%>"></span>
+											<%}%>
+										</blockquote>
+									<%}%>
+									<!-- 查看大图 -->
+									<div id="<%:= 'QZIMG-'+ message.tid%>" class='photo-detail' style="display:none">
+										<div class="container">
+											<div class="row">
+												<div class="col text-white-50 text-left">
+													<p>
+														<i title="发表时间" class="fa fa-clock-o text-primary"><%:=API.Utils.formatDate(message.created_time)%></i>
+													</p>
+													<p>
+														<%if(!(!message.story_info || !message.story_info.time || !message.story_info.lbs)){%>
+															<a class="fa fa-map-marker text-primary" target="_blank" href="<%:=API.Messages.getMapUrl(message.story_info.lbs)%>" class="card-link"><%:=message.story_info.lbs.idname || message.story_info.lbs.name%></a> 
+															<span class="fa fa-camera text-muted">拍摄于 <%:=API.Utils.formatDate(message.story_info.time)%> </span>
+														<%}else{%>
+															<%if(message.lbs && message.lbs.pos_x && message.lbs.pos_y){%>
+																<a title="上传地点" class="text-primary" href="<%:=API.Messages.getMapUrl(message.lbs)%>" target="_blank"><i class="fa fa-map-marker"></i><%:=message.lbs.idname || message.lbs.name%></a>
+															<%}%>
+														<%}%>
+													</p>
+												</div>
+												<div class="col text-truncate">
+													<p class="text-white" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(message, "HTML", false, false)%></p>">
+														<%:=API.Common.formatContent(message, "HTML", false, false)%>
+													</p>
+												</div>
+												<div class="col"></div>
+											</div>
+										</div>
+									</div>
+									<!-- 原创/转发多媒体内容 -->
+									<div id="<%:= 'QZ-'+ message.tid%>" class="medias row pl-3 lightgallery <%:=API.Common.getImgClassType(message)%>">
+										<!-- 视频内容（一般为单视频） -->
+										<%if(message.custom_videos){%>
+											<%let imgIdx = 0%>
+											<%for(let video of message.custom_videos){%>
+												<%if (API.Videos.isExternalVideo(video)) {%>
+													<!-- 外部视频 -->
+													<a class="medias-item border message-lightbox-external" href="<%:=API.Videos.getVideoUrl(video)%>" target="_blank">
+														<span class="message-video"></span>
+														<img class="lazyload loading w-100 h-100" src="../Common/Images/loading.gif" data-src="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>">
+													</a>
+												<%}else{%>
+													<!-- 空间视频 -->
+													<a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-video='{"source": [{"src":"<%:=(video.custom_filepath || video.custom_url || video.url3)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}'
+														data-poster="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
+														<span class="message-video"></span>
+														<img class="lazyload loading w-100 h-100" data-id="<%:=video.video_id%>" src="../Common/Images/loading.gif"  data-src="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>" />
+													</a>
+													<%imgIdx++%>
 												<%}%>
-												<%/* 语音内容 */%>
-												<%if(message.custom_voices){%>
-													<%for (const voice of message.custom_voices) {%>
-														<audio controls src="<%:=(voice.custom_filepath || voice.custom_url)%>"></audio>
+											<%}%>
+										<%}%>
+										<!-- 图片内容(含视频，即同时存在图片与视频) -->
+										<%if(message.custom_images){%>
+											<%let imgIdx = 0%>
+											<%for(let image of message.custom_images){%>
+												<%if(image.is_video && image.video_info){%>
+													<%if (API.Videos.isExternalVideo(image.video_info)) {%>
+														<!-- 外部视频 -->
+														<a class="medias-item border message-lightbox-external" href="<%:=API.Videos.getVideoUrl(image.video_info)%>" target="_blank">
+															<span class="message-video"></span>
+															<img class="lazyload loading w-100 h-100" src="../Common/Images/loading.gif" data-src="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>">
+														</a>
+													<%}else{%>
+														<!-- 空间视频 -->
+														<a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-video='{"source": [{"src":"<%:=(image.video_info.custom_filepath || image.video_info.custom_url || image.video_info.url3)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}'
+															data-poster="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
+															<span class="message-video"></span>
+															<img class="lazyload loading w-100 h-100" data-id="<%:=image.video_info.video_id%>" src="../Common/Images/loading.gif" data-src="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>" />
+														</a>
+														<%imgIdx++%>
 													<%}%>
-												<%}%>
-												<%/* 转发内容 */%>
-												<%if(message.rt_tid){%>
-													<hr>
-													<a class="float-left" target="_blank" href="<%:=API.Common.getUserUrl(message.rt_uin)%>">
-														<span class="text-info"><%:=API.Common.formatContent(message.rt_uinname)%>：</span>
+												<%}else{%>
+													<a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
+														<img class="lazyload loading w-100 h-100" data-id="<%:=image.pic_id%>" src="../Common/Images/loading.gif" src="../Common/Images/loading.gif" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
 													</a>
-													<%/* 转发全文 */%>
-													<pre class="card-text content <%:=message.has_more_con ? 'hasMore' : ''%> <%:=config.Messages.isShowMore ? 'more' : ''%> "><%:=API.Common.formatContent(message, "HTML", true, false)%></pre>
-													<%if(message.rt_has_more_con && message.rt_con){%>
-														<span class="fa fa-2x <%:=config.Messages.isShowMore ? 'fa-angle-up' : 'fa-angle-down'%> cursor readMore" title="<%:=config.Messages.isShowMore ? '收起全文' : '展开全文'%>"></span>
-													<%}%>
+													<%imgIdx++%>
 												<%}%>
-												<%/* 查看大图的详情 */%>
-												<div id="<%:= 'QZIMG-'+ message.tid%>" class='photo-detail' style="display:none">
-													<div class="container">
-														<div class="row">
-															<div class="col-sm text-white-50 text-left">
-																<p>
-																	<i title="发表时间" class="fa fa-clock-o text-primary"><%:=API.Utils.formatDate(message.created_time)%></i>
-																</p>
-																<p>
-																	<%if(!(!message.story_info || !message.story_info.time || !message.story_info.lbs)){%>
-																		<a class="fa fa-map-marker text-primary" target="_blank" href="<%:=API.Messages.getMapUrl(message.story_info.lbs)%>" class="card-link"><%:=message.story_info.lbs.idname || message.story_info.lbs.name%></a> 
-																		<span class="fa fa-camera text-muted">拍摄于 <%:=API.Utils.formatDate(message.story_info.time)%> </span>
-																	<%}else{%>
-																		<%if(message.lbs && message.lbs.pos_x && message.lbs.pos_y){%>
-																			<a title="上传地点" class="text-primary" href="<%:=API.Messages.getMapUrl(message.lbs)%>" target="_blank"><i class="fa fa-map-marker"></i><%:=message.lbs.idname || message.lbs.name%></a>
-																		<%}%>
-																	<%}%>
-																</p>
-															</div>
-															<div class="col-sm">
-																<p class="text-white">
-																	<%:=API.Common.formatContent(message, "HTML", false, false)%>
-																</p>
-															</div>
-															<div class="col-sm"></div>
+											<%}%>
+										<%}%>
+										<!-- 动画表情内容（目前只支持一个） -->
+										<%if(message.custom_magics){%>
+											<%for(let image of message.custom_magics){%>
+												<a class="medias-item border" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
+													<img class="lazyload loading w-100 h-100" data-src='<%:=(image.custom_filepath || image.custom_url)%>'>
+												</a>
+												<hr>
+											<%}%>
+										<%}%>
+									</div>
+									<!-- 音乐内容（目前已无法正常播放，直接显示专辑图片与歌曲信息） -->
+									<%if(message.custom_audios && message.audiototal > 0){%>
+										<div class="medias row p-3">
+											<ul class="list-unstyled w-100">
+												<%for(let music of message.custom_audios){%>
+													<li class="border">
+														<a class="medias-item text-center" data-src="<%:=(music.custom_filepath || music.image)%>" href="<%:=music.playurl%>">
+															<img class="lazyload loading border" data-src="<%:=(music.custom_filepath || music.image)%>">
+															<span><%:=music.name%></span>
+														</a>
+													</li>
+												<%}%>
+											</ul>
+										</div>
+									<%}%>
+									<!-- 投票内容（待定），功能下线了，找不到历史数据，暂不实现 -->
+									<!-- 说说评论 -->
+									<%if(message.custom_comments && message.custom_comments.length > 0){%>
+										<%for(let comment of message.custom_comments){%>
+											<hr>
+											<div class="comments mt-2">
+												<div class="comment">
+													<div class="d-flex justify-content-start ">
+														<div class="comment-avatar">
+															<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+																<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
+															</a>
 														</div>
-													</div>
-												</div>
-												<%/* 多媒体内容 */%>
-												<div id="<%:= 'QZ-'+ message.tid%>" class="medias row p-3 lightgallery <%:=API.Common.getImgClassType(message)%>">
-													<%/* 视频内容（一般为单视频） */%>
-													<%if(message.custom_videos){%>
-														<%let imgIdx = 0%>
-														<%for(let video of message.custom_videos){%>
-															<%if (API.Videos.isExternalVideo(video)) {%>
-																<a class="medias-item border message-lightbox-external" href="<%:=API.Videos.getVideoUrl(video)%>" target="_blank">
-																	<span class="message-video"></span>
-																	<img class="lazyload loading w-100 h-100" src="../Common/Images/loading.gif" data-src="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>">
-																</a>
-															<%}else{%>
-																<%/* 空间视频 */%>
-																<a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-video='{"source": [{"src":"<%:=(video.custom_filepath || video.custom_url || video.url3)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}'
-																	data-poster="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
-																	<span class="message-video"></span>
-																	<img class="lazyload loading w-100 h-100" data-id="<%:=video.video_id%>" src="../Common/Images/loading.gif"  data-src="<%:=video.custom_pre_filepath || video.custom_pre_url || video.url1%>" />
-																</a>
-																<%imgIdx++%>
-															<%}%>
-														<%}%>
-													<%}%>
-													<%/*  图片内容(含视频，即同时存在图片与视频) */%>
-													<%if(message.custom_images){%>
-														<%let imgIdx = 0%>
-														<%for(let image of message.custom_images){%>
-															<%if(image.is_video && image.video_info){%>
-																<%if (API.Videos.isExternalVideo(image.video_info)) {%>
-																	<a class="medias-item border message-lightbox-external" href="<%:=API.Videos.getVideoUrl(image.video_info)%>" target="_blank">
-																		<span class="message-video"></span>
-																		<img class="lazyload loading w-100 h-100" src="../Common/Images/loading.gif" data-src="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>">
-																	</a>
-																<%}else{%>
-																	<%/* 空间视频 */%>
-																	<a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-video='{"source": [{"src":"<%:=(image.video_info.custom_filepath || image.video_info.custom_url || image.video_info.url3)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}'
-																		data-poster="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
-																		<span class="message-video"></span>
-																		<img class="lazyload loading w-100 h-100" data-id="<%:=image.video_info.video_id%>" src="../Common/Images/loading.gif" data-src="<%:=image.video_info.custom_pre_filepath || image.video_info.custom_pre_url || image.video_info.url1%>" />
-																	</a>
-																	<%imgIdx++%>
-																<%}%>
-															<%}else{%>
-																<a class="medias-item border message-lightbox" data-idx="<%:=imgIdx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>" data-sub-html="#<%:= 'QZIMG-'+ message.tid%>">
-																	<img class="lazyload loading w-100 h-100" data-id="<%:=image.pic_id%>" src="../Common/Images/loading.gif" src="../Common/Images/loading.gif" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
-																</a>
-																<%imgIdx++%>
-															<%}%>
-														<%}%>
-													<%}%>
-													<%/* 动画表情内容（目前只支持一个） */%>
-													<%if(message.custom_magics){%>
-														<%for(let image of message.custom_magics){%>
-															<a class="medias-item border" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
-																<img class="lazyload loading w-100 h-100" data-src='<%:=(image.custom_filepath || image.custom_url)%>'>
+														<div class="comment-infos ml-2">
+															<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+																<span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
 															</a>
-															<hr>
-														<%}%>
-													<%}%>
-												</div>
-												<%/* 音乐内容（目前已无法正常播放，直接显示专辑图片与歌曲信息） */%>
-												<%if(message.custom_audios && message.audiototal > 0){%>
-													<div class="medias row p-3">
-														<ul class="list-unstyled w-100">
-															<%for(let music of message.custom_audios){%>
-																<li class="border">
-																	<a class="medias-item text-center" data-src="<%:=(music.custom_filepath || music.image)%>" href="<%:=music.playurl%>">
-																		<img class="lazyload loading border" data-src="<%:=(music.custom_filepath || music.image)%>">
-																		<span><%:=music.name%></span>
-																	</a>
-																</li>
+															<%if(comment.private){%>
+																<span class="text-warning"> 私密评论 </span>
 															<%}%>
-														</ul>
+															<div class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></div>
+														</div>
 													</div>
-												<%}%>
-												<%/* 投票内容（待定） */%>
-												<%/* 说说评论 */%>
-												<%if(message.custom_comments && message.custom_comments.length > 0){%>
-													<%/* 遍历评论 */%>
-													<%for(let comment of message.custom_comments){%>
-														<div class="border-bottom comments mt-3">
-															<div class="container comment">
-																<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
-																	<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
-																</a>
-																<div class="ml-5">
-																	<div class="container">
-																		<a class="author">
-																			<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
-																				<span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
-																			</a>
-																			<%if(comment.private){%>
-																				<span class="text-info"> 私密评论 </span>
-																			<%}%>
-																			<br>
-																			<span class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></span>
+													<div class="comment-text">
+														<div class="messageText">
+															<p><%:=API.Common.formatContent(comment.content)%></p>
+															<%if(comment.pic){%>
+																<div class="comment-lightgallery">
+																	<%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
+																		<%const image = comment.pic[cmIdx];%>
+																		<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
+																			data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+																			<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
 																		</a>
-																	</div>
-																	<div class="messageText container">
-																		<p><%:=API.Common.formatContent(comment.content)%></p>
-																		<%if(comment.pic){%>
-																			<div class="comment-lightgallery">
-																				<%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
-																					<%const image = comment.pic[cmIdx];%>
-																					<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
-																						data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
-																						<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
-																					</a>
+																	<%}%>
+																</div>
+															<%}%>
+														</div>
+														<% const replies = comment.replies || comment.list_3 || []%>
+														<%if(replies.length > 0){%>
+															<%for(const reply of replies){%>
+																<div class="comments">
+																	<div class="comment">
+																		<div class="d-flex justify-content-start">
+																			<div class="comment-avatar">
+																				<a class="avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																					<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																				</a>
+																			</div>
+																			<div class="comment-infos ml-2">
+																				<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																					<span><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
+																				</a>
+																				<%if(reply.private){%>
+																					<span class="text-warning"> 私密回复 </span>
 																				<%}%>
+																				<div class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></div>
 																			</div>
-																		<%}%>
-																	</div>
-																	<% const replies = comment.replies || comment.list_3 || []%>
-																	<%if(replies.length > 0){%>
-																		<%for(const reply of replies){%>
-																			<div class="comments">
-																				<div class="container comment p-0">
-																					<a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
-																						<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
-																					</a>
-																					<div class="ml-5">
-																						<div class="container">
-																							<a class="author">
-																								<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
-																									<span class="text-info"><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
-																								</a>
-																								<%if(reply.private){%>
-																									<span class="text-info"> 私密回复 </span>
-																								<%}%>
-																								<br>
-																								<span class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></span>
+																		</div>
+																		<div class="comment-text">
+																			<div class="messageText">
+																				<p><%:=API.Common.formatContent(reply.content)%></p>
+																				<%if(reply.pic){%>
+																					<div class="comment-lightgallery">
+																						<%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
+																							<%const image = reply.pic[cmIdx];%>
+																							<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
+																								data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+																								<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
 																							</a>
-																						</div>
-																						<div class="messageText container">
-																							<p><%:=API.Common.formatContent(reply.content)%></p>
-																							<%if(reply.pic){%>
-																								<div class="comment-lightgallery">
-																									<%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
-																										<%const image = reply.pic[cmIdx];%>
-																										<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
-																											data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
-																											<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
-																										</a>
-																									<%}%>
-																								</div>
-																							<%}%>
-																						</div>
+																						<%}%>
 																					</div>
-																				</div>
+																				<%}%>
 																			</div>
-																		<%}%>
-																	<%}%>
+																		</div>
+																	</div>
 																</div>
-															</div>
-														</div>
-													<%}%>
-												<%}%>
-											</div>
-											<ul class="message-infos list-group list-group-flush ml-4">
-												<%if(message.lbs && message.lbs.pos_x && message.lbs.pos_y){%>
-													<li class="list-group-item">
-														<a class="fa fa-map-marker" target="_blank" href="<%:=API.Messages.getMapUrl(message.lbs)%>" class="card-link"> <%:=message.lbs.idname || message.lbs.name%></a>
-													</li>
-												<%}%>
-												<%if(!(!message.story_info || !message.story_info.time || !message.story_info.lbs)){%>
-													<li class="list-group-item">
-														<a class="fa fa-map-marker" target="_blank" href="<%:=API.Messages.getMapUrl(message.story_info.lbs)%>" class="card-link"><%:=message.story_info.lbs.idname || message.story_info.lbs.name%></a> 
-														<span class="fa fa-camera text-muted">拍摄于 <%:=API.Utils.formatDate(message.story_info.time)%> </span>
-													</li>
-												<%}%>
-												<%if(message.source_name){%>
-													<li class="list-group-item">
-														<%if(message.source_url){%>
-															<span class="text-info"><a target="_blank" href="<%:=message.source_url%>"><%:=API.Common.formatContent(message.source_name)%></a></span>
-														<%}else{%>
-															<span class="text-info fa fa-mobile-phone"> <%:=API.Common.formatContent(message.source_name)%></span>
+															<%}%>
 														<%}%>
-													</li>	
-												<%}%>
-											</ul>
-										</div>
-									</div>
+													</div>
+												</div>
+											</div>
+										<%}%>
+									<%}%>
 								</div>
+								<!-- 说说额外信息 -->
+								<ul class="message-infos small list-group list-group-flush">
+									<%if(message.lbs && message.lbs.pos_x && message.lbs.pos_y){%>
+										<li class="list-group-item pl-0">
+											<a class="fa fa-map-marker" target="_blank" href="<%:=API.Messages.getMapUrl(message.lbs)%>" class="card-link"> <%:=message.lbs.idname || message.lbs.name%></a>
+										</li>
+									<%}%>
+									<%if(!(!message.story_info || !message.story_info.time || !message.story_info.lbs)){%>
+										<li class="list-group-item pl-0">
+											<a class="fa fa-map-marker" target="_blank" href="<%:=API.Messages.getMapUrl(message.story_info.lbs)%>" class="card-link"><%:=message.story_info.lbs.idname || message.story_info.lbs.name%></a> 
+											<span class="fa fa-camera text-muted">拍摄于 <%:=API.Utils.formatDate(message.story_info.time)%> </span>
+										</li>
+									<%}%>
+									<%if(message.source_name){%>
+										<li class="list-group-item pl-0">
+											<%if(message.source_url){%>
+												<span class="text-info"><a target="_blank" href="<%:=message.source_url%>"><%:=API.Common.formatContent(message.source_name)%></a></span>
+											<%}else{%>
+												<span class="text-info fa fa-mobile-phone"> <%:=API.Common.formatContent(message.source_name)%></span>
+											<%}%>
+										</li>	
+									<%}%>
+								</ul>
 							</div>
 							<div class="card-footer text-muted">
-								<%:=API.Common.formatContent(message.custom_create_time)%>
+								<span class="text-primary p-1 fa fa-thumbs-up mr-2 cursor viewlikes" title="点赞列表" data-field="tid" data-target="<%:=message.tid%>"><%:=message.likeTotal || 0 %></span>
+								<span class="text-primary p-1 fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="tid" data-target="<%:=message.tid%>"><%:=message.custom_visitor && message.custom_visitor.viewCount || 0 %></span>
 								<span class="border-primary border rounded text-primary small p-1 float-right" title="当前楼层">#<%:=total + 1 %></span>
-								<span class="text-primary p-1 float-right fa fa-thumbs-up mr-2 cursor viewlikes" title="点赞列表" data-field="tid" data-target="<%:=message.tid%>"><%:=message.likeTotal || 0 %></span>
-								<span class="text-primary p-1 float-right fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="tid" data-target="<%:=message.tid%>"><%:=message.custom_visitor && message.custom_visitor.viewCount || 0 %></span>
 							</div>
 						</div>
 					<%}%>
diff --git a/src/templates/photos.html b/src/templates/photos.html
index c5b7f27..90c2880 100644
--- a/src/templates/photos.html
+++ b/src/templates/photos.html
@@ -13,6 +13,7 @@
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/jquery-mousewheel@3.1.13/jquery.mousewheel.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
 	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
@@ -26,8 +27,9 @@
 
 	<script src="https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 
-	<script type="text/javascript" src="../Albums/Json/albums.js"></script>
+	<script type="text/javascript" src="../Albums/json/albums.js"></script>
 </head>
 
 <body>
@@ -75,12 +77,12 @@
 														<%}%>
 													</p>
 												</div>
-												<div class="col text-center">
+												<div class="col text-center text-truncate">
 													<%if(photo.name){%>
-														<h6><%:=API.Common.formatContent(photo.name, "HTML", false, false)%></h6>
+														<h6 data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(photo.name, 'HTML', false, false)%>"><%:=API.Common.formatContent(photo.name, "HTML", false, false)%></h6>
 													<%}%>
 													<%if(photo.desc){%>
-														<span class="text-white-50"><%:=API.Common.formatContent(photo.desc, "HTML", false, false)%></span>
+														<span class="text-white-50" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(photo.desc, 'HTML', false, false)%>"><%:=API.Common.formatContent(photo.desc, "HTML", false, false)%></span>
 													<%}%>
 												</div>
 												<div class="col"></div>
@@ -89,7 +91,7 @@ <h6><%:=API.Common.formatContent(photo.name, "HTML", false, false)%></h6>
 									<%}%>
 									<%if(photo.is_video && photo.video_info){%>
 										<a class="lightbox" data-video='{"source": [{"src":"<%:=API.Common.getMediaPath(photo.video_info.video_url, photo.custom_filepath, "Photos_HTML")%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}' 
-											data-poster="<%:=API.Common.getMediaPath(photo.custom_url, photo.custom_pre_filepath, 'Photos_HTML')%>" title="<%:=photo.desc || photo.name%>" data-sub-html="#<%:=photo.uid%>">
+											data-poster="<%:=API.Common.getMediaPath(photo.custom_url, photo.custom_pre_filepath, 'Photos_HTML')%>" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(photo.desc || photo.name, 'HTML', false, false)%>" data-sub-html="#<%:=photo.uid%>">
 											<span class="photo-video"></span>
 											<%if(photo.isLocal){%>
 												<img class="lazyload loading" />
@@ -97,24 +99,32 @@ <h6><%:=API.Common.formatContent(photo.name, "HTML", false, false)%></h6>
 												<img class="lazyload loading" src="../Common/Images/loading.gif" data-src="<%:=API.Common.getMediaPath(photo.custom_url, photo.custom_pre_filepath,'Photos_HTML')%>" />
 											<%}%>
 										</a>
-										<div class="card-body">
-											<span class="card-title"><%:=(photo.name || API.Utils.formatDate(photo.uploadtime || photo.uploadTime))%></span>
+										<div class="card-body text-truncate">
+											<span class="card-title" data-toggle="tooltip" data-html="true" title="<%:=(API.Common.formatContent(photo.name, 'HTML', false, false) || API.Utils.formatDate(photo.uploadtime || photo.uploadTime))%>"><%:=(API.Common.formatContent(photo.name, 'HTML', false, false) || API.Utils.formatDate(photo.uploadtime || photo.uploadTime))%></span>
+										</div>
+										<div class="pic-num-wrap d-flex justify-content-around">
+											<div class="align-self-end">
+												<span class="text-light fa fa-thumbs-o-up cursor viewlikes" title="查看点赞" data-field="uniKey" data-target="<%:=photo.uniKey%>"><%:=photo.likes ? photo.likes.length : 0%></span>
+											</div>
+											<div class="align-self-end">
+												<span class="text-light fa fa-comments-o cursor viewcomments" title="查看评论" data-field="uniKey" data-target="<%:=photo.uniKey%>"><%:=photo.comments ? photo.comments.length : 0%></span>
+											</div>
 										</div>
-										<span class="pic-num-wrap">
-											<span class="text-light fa fa-thumbs-o-up cursor viewlikes" title="查看点赞" data-field="uniKey" data-target="<%:=photo.uniKey%>"><%:=photo.likes ? photo.likes.length : 0%></span>
-											<span class="text-light fa fa-comments-o cursor viewcomments" title="查看评论" data-field="uniKey" data-target="<%:=photo.uniKey%>"><%:=photo.comments ? photo.comments.length : 0%></span>
-										</span>
 									<%}else{%>
-										<a class="lightbox" href="<%:=API.Common.getMediaPath(photo.custom_url, photo.custom_filepath, 'Photos_HTML')%>" title="<%:=photo.desc || photo.name%>" data-sub-html="#<%:=photo.uid%>">
+										<a class="lightbox" href="<%:=API.Common.getMediaPath(photo.custom_url, photo.custom_filepath, 'Photos_HTML')%>" data-toggle="tooltip" data-html="true" title="<%:=photo.desc || photo.name%>" data-sub-html="#<%:=photo.uid%>">
 											<img class="lazyload loading card-img" height="225px" src="../Common/Images/loading.gif" data-src="<%:=API.Common.getMediaPath(photo.custom_url, photo.custom_pre_filepath || photo.custom_filepath, 'Photos_HTML')%>">
 										</a>
-										<div class="card-body">
-											<span class="card-title"><%:=(photo.name || API.Utils.formatDate(photo.uploadtime || photo.uploadTime))%></span>
+										<div class="card-body  text-truncate">
+											<span class="card-title" data-toggle="tooltip" data-html="true" title="<%:=(API.Common.formatContent(photo.name, 'HTML', false, false) || API.Utils.formatDate(photo.uploadtime || photo.uploadTime))%>"><%:=(API.Common.formatContent(photo.name, 'HTML', false, false) || API.Utils.formatDate(photo.uploadtime || photo.uploadTime))%></span>
+										</div>
+										<div class="pic-num-wrap d-flex justify-content-around">
+											<div class="align-self-end">
+												<span class="text-light fa fa-thumbs-o-up cursor viewlikes" title="查看点赞" data-field="uniKey" data-target="<%:=photo.uniKey%>"><%:=photo.likes ? photo.likes.length : 0%></span>
+											</div>
+											<div class="align-self-end">
+												<span class="text-light fa fa-comments-o cursor viewcomments" title="查看评论" data-field="uniKey" data-target="<%:=photo.uniKey%>"><%:=photo.comments ? photo.comments.length : 0%></span>
+											</div>
 										</div>
-										<span class="pic-num-wrap">
-											<span class="text-light fa fa-thumbs-o-up cursor viewlikes" title="查看点赞" data-field="uniKey" data-target="<%:=photo.uniKey%>"><%:=photo.likes ? photo.likes.length : 0%></span>
-											<span class="text-light fa fa-comments-o cursor viewcomments" title="查看评论" data-field="uniKey" data-target="<%:=photo.uniKey%>"><%:=photo.comments ? photo.comments.length : 0%></span>
-										</span>
 									<%}%>
 								</div>
 							</div>
diff --git a/src/templates/shares.html b/src/templates/shares.html
index 66ba7ca..b51d7cc 100644
--- a/src/templates/shares.html
+++ b/src/templates/shares.html
@@ -12,7 +12,8 @@
 	<link rel="stylesheet" type="text/css" href="../Common/css/common.css">
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
-    
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/video/lg-video.min.js" integrity="sha256-lkYYtHLEk1Rnr3TOXc/l1tfObPXEzvgKwePG49fZ1Rw=" crossorigin="anonymous"></script>
@@ -25,6 +26,8 @@
 	<script src="https://cdn.jsdelivr.net/npm/jquery-mousewheel@3.1.13/jquery.mousewheel.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
+	
 	<script type="text/javascript" src="../Common/json/config.js"></script>
 	<script type="text/javascript" src="json/shares.js"></script>
 	<script type="text/javascript" src="../Common/js/common.js"></script>
@@ -54,149 +57,165 @@
 			<%for (const [year, yearMap] of sharesMaps) {%>
 				<span class="sidebar-h1" data-tag="h1" data-sidebar='<%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=API.Utils.sumYearItemSize(yearMap)%><span>'></span>
 				<%for (const [month, monthItems] of yearMap) {%>
-					<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-primary badge-pill itemSize"><%:=monthItems.length%><span>'></span>
+					<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-secondary badge-pill itemSize"><%:=monthItems.length%><span>'></span>
 					<%for (let index = 0; index < monthItems.length; index++) {%>
 						<%const share = monthItems[index]%>
 						<%total = total -1%>
-						<div class="card w-70 mt-3 border">
+						<div id="<%:='share-' + share.id%>" class="card w-70 mt-3 border share-row">
 							<div class="card-body">
-								<div class="p-1 comments">
-									<div class="container comment  m-1 p-0">
-										<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(share.uin)%>">
-											<img class="w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(share.uin)%>">
-										</a>
-										<div class="ml-4">
-											<div class="messageText ml-4 container m-2">
-												<%/* 分享描述 */%>
-												<p id="<%:='Shares-Desc-' + share.id%>"><a target="_blank" href="<%:=API.Common.getUserUrl(share.uin)%>"><%:=API.Common.formatContent(share.nickname)%></a> <span class="text-secondary">分享<span class="border-warning border rounded text-warning small p-1"><%:=API.Shares.getDisplayType(share.type)%></span>：</span><%:=API.Common.formatContent(share.desc, "HTML", false, false)%></p>
-												<%/* 分享源标题 */%>
-												<%if(share.source && share.source.title){%>
-													<p>《<a target="_blank" href="<%:=share.source.url%>"><%:=share.source.title%></a>》</p>
-												<%}%>
-												<%/* 分享源描述 */%>
-												<%if(share.source && share.source.desc){%>
-													<p><%:=API.Common.formatContent(share.source.desc, "HTML", false, false)%></p>
+								<div class="comments">
+									<div class="comment p-0">
+										<div class="d-flex justify-content-start ">
+											<div class="comment-avatar">
+												<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(share.uin)%>">
+													<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(share.uin)%>" >
+												</a>
+											</div>
+											<div class="comment-infos ml-2">
+												<a target="_blank" href="<%:=API.Common.getUserUrl(share.uin)%>">
+													<span><%:=API.Common.formatContent(share.nickname)%></span>
+												</a>
+												分享<span class="border-warning border rounded text-warning small p-1"><%:=API.Shares.getDisplayType(share.type)%></span>
+												<div class="text-muted small mt-1"><%:=API.Utils.formatDate(share.shareTime)%></div>
+											</div>
+										</div>
+										<div class="messageText mt-2">
+											<!-- 分享描述 -->
+											<%if(share && share.desc){%>
+												<p id="<%:='share-desc-' + share.id%>"><%:=API.Common.formatContent(share.desc, "HTML", false, false)%></p>
+											<%}%>
+											<blockquote class="source">
+												<!-- 分享源标题 -->
+												<%if(share.source && Object.keys(share.source).length > 0 ){%>
+													<%if(share.source.title){%>
+														<p><a target="_blank" href="<%:=share.source.url%>"><%:=share.source.title%></a></p>
+													<%}%>
+													<!-- 分享源描述 -->
+													<%if(share.source.desc){%>
+														<p id="<%:='share-source-desc-' + share.id%>"><%:=API.Common.formatContent(share.source.desc, "HTML", false, false)%></p>
+													<%}%>
 												<%}%>
-												<%/* 分享内容 */%>
-												<%/* 多媒体内容 */%>
-												<div id="<%:='Shares-LG-' + share.id%>" class="medias row p-3 lightgallery <%:=API.Common.getImgClassType(share,true)%>">
-													<%/*  分享源图片 */%>
-													<%if(share.source.images){%>
+												<!-- 分享内容 -->
+												<!-- 多媒体内容 -->
+												<!-- 分享源图片 -->
+												<%if(share.source.images && share.source.images.length > 0){%>
+													<div id="<%:='share-medias-' + share.id%>" class="medias row pl-3 lightgallery <%:=API.Common.getImgClassType(share,true)%>">
 														<%for (let idx = 0; idx < share.source.images.length; idx++) {%>
 															<%const image = share.source.images[idx];%>
-															<a class="medias-item border message-lightbox" data-idx="<%:=idx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>" data-sub-html="#<%:='Shares-Desc-' + share.id%>">
+															<a class="medias-item border message-lightbox" data-idx="<%:=idx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>" data-sub-html="#<%:='share-source-desc-' + share.id%>">
 																<img class="lazyload loading w-100 h-100" data-idx="<%:=idx%>" data-src="<%:=(image.custom_filepath || image.custom_url)%>">
 															</a>
 														<%}%>
-													<%}%>
-												</div>
-												<%/* 分享评论 */%>
-												<%if(share.comments && share.comments.length > 0){%>
-													<%/* 遍历评论 */%>
-													<%for(let comment of share.comments){%>
-														<div class="p-1 border-top comments mt-3">
-															<div class="container comment  m-1 p-0">
-																<a class="me-a avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-																	<img class="lazyload loading w-100 h-100 border rounded-circle" data-src="<%:=API.Common.getUserLogoUrl(comment.poster.id)%>" >
-																</a>
-																<div class="ml-4">
-																	<%/* 评论 */%>
-																	<div class="container ml-4">
-																		<a class="author">
-																			<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster.id)%>">
-																				<span><%:=API.Common.formatContent(comment.poster.name)%></span>
-																			</a>
-																			<%if(comment.private){%>
-																				<span class="text-info"> 私密评论 </span>
+													</div>
+												<%}%>
+											</blockquote>
+											<!-- 分享评论 -->
+											<%if(share.comments && share.comments.length > 0){%>
+												<%for(let comment of share.comments){%>
+													<hr>
+													<div class="comments">
+														<div class="comment">
+															<div class="d-flex justify-content-start ">
+																<div class="comment-avatar">
+																	<a class="avatar p-0 m-0" target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+																		<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(comment.poster && comment.poster.id || comment.uin)%>" >
+																	</a>
+																</div>
+																<div class="comment-infos ml-2">
+																	<a target="_blank" href="<%:=API.Common.getUserUrl(comment.poster && comment.poster.id || comment.uin)%>">
+																		<span><%:=API.Common.formatContent(comment.poster && comment.poster.name || comment.name)%></span>
+																	</a>
+																	<%if(comment.private){%>
+																		<span class="text-warning"> 私密评论 </span>
+																	<%}%>
+																	<div class="text-muted small"><%:=API.Utils.formatDate(comment.postTime || comment.create_time)%></div>
+																</div>
+															</div>
+															<div class="comment-text">
+																<!-- 评论 -->
+																<div class="messageText">
+																	<!-- 评论内容 -->
+																	<p><%:=API.Common.formatContent(comment.content)%></p>
+																	<!-- 评论图片 -->
+																	<%if(comment.pic && comment.pic.length > 0){%>
+																		<div class="comment-lightgallery">
+																			<%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
+																				<%const image = comment.pic[cmIdx];%>
+																				<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
+																					data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+																					<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
+																				</a>
 																			<%}%>
-																			<br>
-																			<span class="text-muted small"><%:=API.Utils.formatDate(comment.postTime)%></span>
-																		</a>
-																	</div>
-																	<div class="messageText ml-4 container m-1">
-																		<%/* 评论内容 */%>
-																		<p><%:=API.Common.formatContent(comment.content)%></p>
-																		<%/* 评论图片 */%>
-																		<%if(comment.pic){%>
-																			<div class="comment-lightgallery">
-																				<%for (let cmIdx = 0; cmIdx < comment.pic.length; cmIdx++) {%>
-																					<%const image = comment.pic[cmIdx];%>
-																					<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>"
-																						data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
-																						<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
-																					</a>
-																				<%}%>
-																			</div>
-																		<%}%>
-																	</div>
-																	<%/* 评论回复 */%>
-																	<%if(comment.replies){%>
-																		<%for(let reply of comment.replies){%>
-																			<div class="comments m-1">
-																				<div class="container comment  m-3 p-0">
-																					<a class="me-a avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-																						<img class="lazyload loading w-100 h-100 border rounded-circle" data-src="<%:=API.Common.getUserLogoUrl(reply.poster.id)%>">
-																					</a>
-																					<div class=" ml-4  ">
-																						<div class="container ml-4">
-																							<a class="author">
-																								<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster.id)%>">
-																									<span class="text-info"><%:=API.Common.formatContent(reply.poster.name)%></span>
-																								</a>
-																								<%if(reply.private){%>
-																									<span class="text-info"> 私密回复 </span>
+																		</div>
+																	<%}%>
+																</div>
+																<!-- 评论回复 -->
+																<%if(comment.replies){%>
+																	<%for(let reply of comment.replies){%>
+																		<div class="comments m-1">
+																			<div class="comment">
+																				<div class="d-flex justify-content-start">
+																					<div class="comment-avatar">
+																						<a class="avatar p-0 m-0 " target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																							<img class="lazyload loading w-100 h-100 border rounded-circle" src="<%:=API.Common.getUserLogoUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																						</a>
+																					</div>
+																					<div class="comment-infos ml-2">
+																						<a target="_blank" href="<%:=API.Common.getUserUrl(reply.poster && reply.poster.id || reply.uin)%>">
+																							<span><%:=API.Common.formatContent(reply.poster && reply.poster.name || reply.name)%></span>
+																						</a>
+																						<%if(reply.private){%>
+																							<span class="text-warning"> 私密回复 </span>
+																						<%}%>
+																						<div class="text-muted small"><%:=API.Utils.formatDate(reply.postTime || reply.create_time)%></div>
+																					</div>
+																				</div>
+																				<div class="comment-text">
+																					<div class="messageText">
+																						<!-- 回复内容 -->
+																						<p><%:=API.Common.formatContent(reply.content)%></p>
+																						<!-- 回复图片 -->
+																						<%if(reply.pic){%>
+																							<div class="comment-lightgallery">
+																								<%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
+																									<%const image = reply.pic[cmIdx];%>
+																									<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
+																										data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
+																										<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
+																									</a>
 																								<%}%>
-																								<br>
-																								<span class="text-muted small"><%:=API.Utils.formatDate(reply.postTime)%></span>
-																							</a>
-																						</div>
-																						<div class="messageText ml-4 container m-1">
-																							<%/* 回复内容 */%>
-																							<p><%:=API.Common.formatContent(reply.content)%></p>
-																							<%/* 回复图片 */%>
-																							<%if(reply.pic){%>
-																								<div class="comment-lightgallery">
-																									<%for (let cmIdx = 0; cmIdx < reply.pic.length; cmIdx++) {%>
-																										<%const image = reply.pic[cmIdx];%>
-																										<a class="comment-img-lightbox" data-idx="<%:=cmIdx%>" data-sub-html="<%:=API.Common.formatContent(comment.content)%>" 
-																											data-src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>">
-																											<img src="<%:=(image.custom_filepath || image.custom_url || image.o_url || image.hd_url || image.b_url || image.s_url || image.url)%>" class="comment-img img-thumbnail">
-																										</a>
-																									<%}%>
-																								</div>
-																							<%}%>
-																						</div>
+																							</div>
+																						<%}%>
 																					</div>
 																				</div>
 																			</div>
-																		<%}%>
+																		</div>
 																	<%}%>
-																</div>
+																<%}%>
 															</div>
 														</div>
-													<%}%>
+													</div>
 												<%}%>
-											</div>
-											<%/* 分享源来源 */%>
-											<%if(share.source && share.source.from){%>
-												<ul class="list-group list-group-flush ml-3">
-													<li class="list-group-item">
-														<%if(share.source.from.name){%>
-															<span class="text-secondary">来自<a target="_blank" href="<%:=share.source.from.url%>"><%:=share.source.from.name%></a> </span>
-														<%}%>
-														<span class="text-secondary">共分享<%:=share.source.count%>次</span>
-													</li>
-												</ul>
 											<%}%>
 										</div>
+										<!-- 分享源来源 -->
+										<%if(share.source && share.source.from){%>
+											<ul class="list-group list-group-flush">
+												<li class="list-group-item pl-0">
+													<%if(share.source.from.name){%>
+														<span class="text-secondary">来自<a target="_blank" href="<%:=share.source.from.url%>"><%:=share.source.from.name%></a> </span>
+													<%}%>
+													<span class="text-secondary">共分享<%:=share.source.count%>次</span>
+												</li>
+											</ul>
+										<%}%>
 									</div>
 								</div>
 							</div>
 							<div class="card-footer text-muted">
-								<%:=API.Utils.formatDate(share.shareTime)%>
+								<span class="text-primary p-1 fa fa-thumbs-up mr-2 cursor viewlikes" title="点赞列表" data-field="id" data-target="<%:=share.id%>"><%:=share.likeTotal || 0 %></span>
+								<span class="text-primary p-1 fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="id" data-target="<%:=share.id%>"><%:=share.custom_visitor && share.custom_visitor.viewCount || 0 %></span>
 								<span class="border-primary border rounded text-primary small p-1 float-right" title="当前楼层">#<%:=total + 1 %></span>
-								<span class="text-primary p-1 float-right fa fa-thumbs-up mr-2 cursor viewlikes" title="点赞列表" data-field="id" data-target="<%:=share.id%>"><%:=share.likeTotal || 0 %></span>
-								<span class="text-primary p-1 float-right fa fa-eye mr-2 cursor viewVisitors" title="最近访问" data-field="id" data-target="<%:=share.id%>"><%:=share.custom_visitor && share.custom_visitor.viewCount || 0 %></span>
 							</div>
 						</div>
 					<%}%>
diff --git a/src/templates/videos.html b/src/templates/videos.html
index 3baa783..b0ace0c 100644
--- a/src/templates/videos.html
+++ b/src/templates/videos.html
@@ -13,6 +13,7 @@
 	<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/jquery-mousewheel@3.1.13/jquery.mousewheel.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
 	
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/lightgallery.min.js" integrity="sha256-dkTk5cgrLUjjQiGNZsoDnjhCI+UuhTffLnyrN7qLutw=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/zoom/lg-zoom.min.js" integrity="sha256-6Ny31P8WSBcY1SFaWxg4zgDzZJNNIJ4BchV+RxFiDR0=" crossorigin="anonymous"></script>
@@ -23,6 +24,7 @@
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/fullscreen/lg-fullscreen.min.js" integrity="sha256-7SXgJ9rT6uPHY7fse2NsZN7Yq96f+9I35bDtUwX8ZHc=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/comment/lg-comment.min.js" integrity="sha256-RszgszIiPRvEWMviw43SzoZwsvKZNbz2Djio7kUemrY=" crossorigin="anonymous"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lightgallery@2.3.0/plugins/autoplay/lg-autoplay.min.js" integrity="sha256-XGqZJI2/fqI+ph7+msYWRIi9NLzsZ2PlhrhltWEUmOM=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
 
 	<script src="https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
@@ -50,65 +52,57 @@
 	<main role="main">
 		<div class="albums py-5 bg-light" style="padding-top: 4rem!important;">
 			<div class="container-fluid tz-gallery">
-				<div id="lightgallery" class="row">
-					<script id="videos_tpl" type="text/html">
-						<%/* 遍历视频 */%>
-						<%for (const video of videos) {%>
-							<%video.uid = 'QZ-' + API.Utils.newSimpleUid(16)%>
-							<div class="col-md-2 mb-2">
-								<div class="card thumbnail mb-2 shadow-sm">
-									<div id="<%:=video.uid%>" class='photo-detail' style="display:none">
-										<div class="container">
-											<div class="row">
-												<div class="col-sm text-white-50 text-left">
-													<p>
-														<i title="拍摄/上传时间" class="fa fa-camera text-primary"><%:=video.shootTime ? API.Utils.formatDate(video.shootTime) : API.Utils.formatDate(video.uploadTime)%></i>
-														<i title="相片类型" class="ml-2">MP4</i>
-													</p>
-												</div>
-												<div class="col-sm">
-													<h6><%:=video.name ? API.Common.formatContent(video.name) : API.Utils.formatDate(video.uploadTime)%></h6>
-													<%if(video.desc){%>
-														<span class="text-white-50"><%:=API.Common.formatContent(video.desc, "HTML", false, false)%></span>
-													<%}%>
-												</div>
-												<div class="col-sm"></div>
+				<div id="lightgallery" class="row videos">
+					<%/* 遍历视频 */%>
+					<%for (const video of videos) {%>
+						<%video.uid = 'QZ-' + API.Utils.newSimpleUid(16)%>
+						<div class="col-md-2 mb-2">
+							<div class="card thumbnail mb-2 shadow-sm">
+								<div id="<%:=video.uid%>" class='photo-detail' style="display:none">
+									<div class="container">
+										<div class="row">
+											<div class="col text-white-50 text-left">
+												<p>
+													<i title="拍摄/上传时间" class="fa fa-camera text-primary"><%:=video.shootTime ? API.Utils.formatDate(video.shootTime) : API.Utils.formatDate(video.uploadTime)%></i>
+													<i title="相片类型" class="ml-2">MP4</i>
+												</p>
 											</div>
+											<div class="col text-center text-truncate">
+												<h6 data-toggle="tooltip" data-html="true" title='<%:=API.Common.formatContent(video.name || API.Utils.formatDate(video.uploadTime))%>'><%:=API.Common.formatContent(video.name || API.Utils.formatDate(video.uploadTime))%></h6>
+												<%if(video.desc){%>
+													<span class="text-white-50" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(video.desc, 'HTML', false, false)%>"><%:=API.Common.formatContent(video.desc, "HTML", false, false)%></span>
+												<%}%>
+											</div>
+											<div class="col"></div>
 										</div>
 									</div>
-									<a class="lightbox" data-video='{"source": [{"src":"<%:=(video.custom_filepath || video.custom_url || video.url)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}' 
-										data-poster="<%:=API.Common.getMediaPath(video.pre || video.custom_pre_url, video.custom_pre_filepath)%>" title="<%:=video.desc || video.name%>" data-sub-html="#<%:=video.uid%>">
-										<span class="photo-video"></span>
-										<img class="lazyload loading" src="../Common/Images/loading.gif" data-src="<%:=API.Common.getMediaPath(video.pre || video.custom_pre_url, video.custom_pre_filepath)%>" />
-									</a>
-									<div class="card-body">
-										<h5 class="card-title"><%:=video.desc ? API.Common.formatContent(video.desc) : API.Utils.formatDate(video.uploadTime)%></h5>
+								</div>
+								<a class="lightbox" data-video='{"source": [{"src":"<%:=(video.custom_filepath || video.custom_url || video.url)%>", "type":"video/mp4"}],"attributes": {"preload": false, "controls": true}}' 
+									data-poster="<%:=API.Common.getMediaPath(video.pre || video.custom_pre_url, video.custom_pre_filepath)%>" data-toggle="tooltip" data-html="true" title="<%:=video.desc || video.name%>" data-sub-html="#<%:=video.uid%>">
+									<span class="photo-video"></span>
+									<img class="lazyload loading" src="../Common/Images/loading.gif" data-src="<%:=API.Common.getMediaPath(video.pre || video.custom_pre_url, video.custom_pre_filepath)%>" />
+								</a>
+								<div class="card-body text-truncate">
+									<span class="card-title" data-toggle="tooltip" data-html="true" title="<%:=API.Common.formatContent(video.desc || API.Utils.formatDate(video.uploadTime)) %>"><%:=API.Common.formatContent(video.desc || API.Utils.formatDate(video.uploadTime)) %></span>
+								</div>
+								<div class="pic-num-wrap d-flex justify-content-around">
+									<div class="align-self-end">
+										<span class="text-light fa fa-thumbs-o-up cursor viewlikes" title="查看点赞" data-field="uniKey" data-target="<%:=video.uniKey%>" ><%:=video.likes ? video.likes.length : 0%></span>
+									</div>
+									<div class="align-self-end">
+										<span class="text-light fa fa-comments-o cursor viewcomments" title="查看评论" data-field="uniKey" data-target="<%:=video.uniKey%>"><%:=video.comments ? video.comments.length : 0%></span>
 									</div>
-									<span class="pic-num-wrap">
-										<span class="text-light fa fa-thumbs-o-up cursor viewlikes" title="查看点赞" data-field="uniKey" data-target="<%:=video.uniKey%>" style="
-																			position: absolute;
-																			top: 25px;
-																			left: 10px;
-																			font-size: 20px;
-																		"><%:=video.likes ? video.likes.length : 0%></span>
-										<span class="text-light fa fa-comments-o cursor viewcomments" title="查看评论" data-field="uniKey" data-target="<%:=video.uniKey%>" style="
-																			position: absolute;
-																			top: 25px;
-																			left: 50px;
-																			font-size: 20px;
-																		"><%:=video.comments ? video.comments.length : 0%></span>
-									</span>
 								</div>
 							</div>
-						<%}%>
-					</script>
+						</div>
+					<%}%>
 				</div>
 			</div>
 		</div>
 	</main>
 	<script type="text/javascript">
-		// 当前年份的视频
-		window.yearItems = '<%:=JSON.stringify(videos)%>';
+		// 当前年份
+		window.targetYear = "<%:=targetYear || 'ALL'%>";
 	</script>
 	<script type="text/javascript" src="../Common/js/common.js"></script>
 	<script type="text/javascript" src="js/videos.js"></script>
diff --git a/src/templates/visitors.html b/src/templates/visitors.html
index 868e70a..c9fc1f5 100644
--- a/src/templates/visitors.html
+++ b/src/templates/visitors.html
@@ -15,6 +15,9 @@
 	<script src="https://cdn.jsdelivr.net/npm/jquery-mousewheel@3.1.13/jquery.mousewheel.min.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/lazyload@2.0.0-rc.2/lazyload.js"></script>
 	<script src="https://cdn.jsdelivr.net/npm/template_js@2.2.1/dist/index.aio.min.js" integrity="sha256-gnK+GsIXEBgu/mJouMDtUxXvXM3M0jzxNYmjnlsifgY=" crossorigin="anonymous"></script>
+	<script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js" integrity="sha256-qXBd/EfAdjOA2FGrGAG+b3YBn2tn5A6bhz+LSgYD96k=" crossorigin="anonymous"></script>
+	<script src="https://www.lvshuncai.com/custom/js/clicklove.min.js"></script>
+	
 	<script type="text/javascript" src="json/visitors.js"></script>
 	<script type="text/javascript" src="../Common/js/common.js"></script>
 	<script type="text/javascript" src="../Common/js/sidebar.js"></script>
@@ -49,7 +52,7 @@
 							<div class="timeline2-entry">
 								<div class="timeline2-entry-year">
 									<div class="timeline2-icon">
-										<span class="sidebar-h1" data-tag="h1" data-sidebar="<%:=year%>年"><%:=year%></span>
+										<span class="sidebar-h1" data-tag="h1" data-sidebar='<%:=year%>年<span class="badge badge-primary badge-pill itemSize"><%:=yearItems.length%><span>'><%:=year%></span>
 									</div>
 								</div>
 							</div>
@@ -59,7 +62,7 @@
 								<div class="timeline2-entry">
 									<div class="timeline2-entry-month">
 										<div class="timeline2-icon">
-											<span class="sidebar-h2" data-tag="h2" data-sidebar="<%:=month%>月"><%:=month%>月</span>
+											<span class="sidebar-h2" data-tag="h2" data-sidebar='<%:=month%>月<span class="badge badge-secondary badge-pill itemSize"><%:=monthItems.length%><span>'><%:=month%>月</span>
 										</div>
 									</div>
 								</div>
diff --git a/src/vendor/bootstrap-select/css/bootstrap-select.min.css b/src/vendor/bootstrap-select/css/bootstrap-select.min.css
new file mode 100644
index 0000000..8d0f049
--- /dev/null
+++ b/src/vendor/bootstrap-select/css/bootstrap-select.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap-select v1.13.18 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */@-webkit-keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}@-o-keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}@keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}.bootstrap-select>select.bs-select-hidden,select.bs-select-hidden,select.selectpicker{display:none!important}.bootstrap-select{width:220px\0;vertical-align:middle}.bootstrap-select>.dropdown-toggle{position:relative;width:100%;text-align:right;white-space:nowrap;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.bootstrap-select>.dropdown-toggle:after{margin-top:-1px}.bootstrap-select>.dropdown-toggle.bs-placeholder,.bootstrap-select>.dropdown-toggle.bs-placeholder:active,.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder:hover{color:#999}.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover{color:rgba(255,255,255,.5)}.bootstrap-select>select{position:absolute!important;bottom:0;left:50%;display:block!important;width:.5px!important;height:100%!important;padding:0!important;opacity:0!important;border:none;z-index:0!important}.bootstrap-select>select.mobile-device{top:0;left:0;display:block!important;width:100%!important;z-index:2!important}.bootstrap-select.is-invalid .dropdown-toggle,.error .bootstrap-select .dropdown-toggle,.has-error .bootstrap-select .dropdown-toggle,.was-validated .bootstrap-select select:invalid+.dropdown-toggle{border-color:#b94a48}.bootstrap-select.is-valid .dropdown-toggle,.was-validated .bootstrap-select select:valid+.dropdown-toggle{border-color:#28a745}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:220px}.bootstrap-select .dropdown-toggle:focus,.bootstrap-select>select.mobile-device:focus+.dropdown-toggle{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none;height:auto}:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.form-control.input-group-btn{float:none;z-index:auto}.form-inline .bootstrap-select,.form-inline .bootstrap-select.form-control:not([class*=col-]){width:auto}.bootstrap-select:not(.input-group-btn),.bootstrap-select[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.dropdown-menu-right,.bootstrap-select[class*=col-].dropdown-menu-right,.row .bootstrap-select[class*=col-].dropdown-menu-right{float:right}.form-group .bootstrap-select,.form-horizontal .bootstrap-select,.form-inline .bootstrap-select{margin-bottom:0}.form-group-lg .bootstrap-select.form-control,.form-group-sm .bootstrap-select.form-control{padding:0}.form-group-lg .bootstrap-select.form-control .dropdown-toggle,.form-group-sm .bootstrap-select.form-control .dropdown-toggle{height:100%;font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-lg .dropdown-toggle,.bootstrap-select.form-control-sm .dropdown-toggle{font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-sm .dropdown-toggle{padding:.25rem .5rem}.bootstrap-select.form-control-lg .dropdown-toggle{padding:.5rem 1rem}.form-inline .bootstrap-select .form-control{width:100%}.bootstrap-select.disabled,.bootstrap-select>.disabled{cursor:not-allowed}.bootstrap-select.disabled:focus,.bootstrap-select>.disabled:focus{outline:0!important}.bootstrap-select.bs-container{position:absolute;top:0;left:0;height:0!important;padding:0!important}.bootstrap-select.bs-container .dropdown-menu{z-index:1060}.bootstrap-select .dropdown-toggle .filter-option{position:static;top:0;left:0;float:left;height:100%;width:100%;text-align:left;overflow:hidden;-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto}.bs3.bootstrap-select .dropdown-toggle .filter-option{padding-right:inherit}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option{position:absolute;padding-top:inherit;padding-bottom:inherit;padding-left:inherit;float:none}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner{padding-right:inherit}.bootstrap-select .dropdown-toggle .filter-option-inner-inner{overflow:hidden}.bootstrap-select .dropdown-toggle .filter-expand{width:0!important;float:left;opacity:0!important;overflow:hidden}.bootstrap-select .dropdown-toggle .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.input-group .bootstrap-select.form-control .dropdown-toggle{border-radius:inherit}.bootstrap-select[class*=col-] .dropdown-toggle{width:100%}.bootstrap-select .dropdown-menu{min-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu>.inner:focus{outline:0!important}.bootstrap-select .dropdown-menu.inner{position:static;float:none;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select .dropdown-menu li{position:relative}.bootstrap-select .dropdown-menu li.active small{color:rgba(255,255,255,.5)!important}.bootstrap-select .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select .dropdown-menu li a{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bootstrap-select .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select .dropdown-menu li a span.check-mark{display:none}.bootstrap-select .dropdown-menu li a span.text{display:inline-block}.bootstrap-select .dropdown-menu li small{padding-left:.5em}.bootstrap-select .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu .notify.fadeOut{-webkit-animation:.3s linear 750ms forwards bs-notify-fadeOut;-o-animation:.3s linear 750ms forwards bs-notify-fadeOut;animation:.3s linear 750ms forwards bs-notify-fadeOut}.bootstrap-select .no-results{padding:3px;background:#f5f5f5;margin:0 5px;white-space:nowrap}.bootstrap-select.fit-width .dropdown-toggle .filter-option{position:static;display:inline;padding:0}.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner{display:inline}.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before{content:'\00a0'}.bootstrap-select.fit-width .dropdown-toggle .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark{position:absolute;display:inline-block;right:15px;top:5px}.bootstrap-select.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select .bs-ok-default:after{content:'';display:block;width:.5em;height:1em;border-style:solid;border-width:0 .26em .26em 0;-webkit-transform-style:preserve-3d;transform-style:preserve-3d;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle{z-index:1061}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before{bottom:auto;top:-4px;border-top:7px solid rgba(204,204,204,.2);border-bottom:0}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after{bottom:auto;top:-4px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:before,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:before{display:block}.bs-actionsbox,.bs-donebutton,.bs-searchbox{padding:4px 8px}.bs-actionsbox{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-donebutton{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-donebutton .btn-group button{width:100%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox .form-control{margin-bottom:0;width:100%;float:none}
\ No newline at end of file
diff --git a/src/vendor/bootstrap-select/js/bootstrap-select.min.js b/src/vendor/bootstrap-select/js/bootstrap-select.min.js
new file mode 100644
index 0000000..2b57230
--- /dev/null
+++ b/src/vendor/bootstrap-select/js/bootstrap-select.min.js
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap-select v1.13.18 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){!function(P){"use strict";var d=["sanitize","whiteList","sanitizeFn"],r=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],e={"*":["class","dir","id","lang","role","tabindex","style",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},l=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi,a=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;function v(e,t){var i=e.nodeName.toLowerCase();if(-1!==P.inArray(i,t))return-1===P.inArray(i,r)||Boolean(e.nodeValue.match(l)||e.nodeValue.match(a));for(var s=P(t).filter(function(e,t){return t instanceof RegExp}),n=0,o=s.length;n<o;n++)if(i.match(s[n]))return!0;return!1}function W(e,t,i){if(i&&"function"==typeof i)return i(e);for(var s=Object.keys(t),n=0,o=e.length;n<o;n++)for(var r=e[n].querySelectorAll("*"),l=0,a=r.length;l<a;l++){var c=r[l],d=c.nodeName.toLowerCase();if(-1!==s.indexOf(d))for(var h=[].slice.call(c.attributes),p=[].concat(t["*"]||[],t[d]||[]),u=0,f=h.length;u<f;u++){var m=h[u];v(m,p)||c.removeAttribute(m.nodeName)}else c.parentNode.removeChild(c)}}"classList"in document.createElement("_")||function(e){if("Element"in e){var t="classList",i="prototype",s=e.Element[i],n=Object,o=function(){var i=P(this);return{add:function(e){return e=Array.prototype.slice.call(arguments).join(" "),i.addClass(e)},remove:function(e){return e=Array.prototype.slice.call(arguments).join(" "),i.removeClass(e)},toggle:function(e,t){return i.toggleClass(e,t)},contains:function(e){return i.hasClass(e)}}};if(n.defineProperty){var r={get:o,enumerable:!0,configurable:!0};try{n.defineProperty(s,t,r)}catch(e){void 0!==e.number&&-2146823252!==e.number||(r.enumerable=!1,n.defineProperty(s,t,r))}}else n[i].__defineGetter__&&s.__defineGetter__(t,o)}}(window);var t,c,i=document.createElement("_");if(i.classList.add("c1","c2"),!i.classList.contains("c2")){var s=DOMTokenList.prototype.add,n=DOMTokenList.prototype.remove;DOMTokenList.prototype.add=function(){Array.prototype.forEach.call(arguments,s.bind(this))},DOMTokenList.prototype.remove=function(){Array.prototype.forEach.call(arguments,n.bind(this))}}if(i.classList.toggle("c3",!1),i.classList.contains("c3")){var o=DOMTokenList.prototype.toggle;DOMTokenList.prototype.toggle=function(e,t){return 1 in arguments&&!this.contains(e)==!t?t:o.call(this,e)}}function h(e){if(null==this)throw new TypeError;var t=String(this);if(e&&"[object RegExp]"==c.call(e))throw new TypeError;var i=t.length,s=String(e),n=s.length,o=1<arguments.length?arguments[1]:void 0,r=o?Number(o):0;r!=r&&(r=0);var l=Math.min(Math.max(r,0),i);if(i<n+l)return!1;for(var a=-1;++a<n;)if(t.charCodeAt(l+a)!=s.charCodeAt(a))return!1;return!0}function O(e,t){var i,s=e.selectedOptions,n=[];if(t){for(var o=0,r=s.length;o<r;o++)(i=s[o]).disabled||"OPTGROUP"===i.parentNode.tagName&&i.parentNode.disabled||n.push(i);return n}return s}function z(e,t){for(var i,s=[],n=t||e.selectedOptions,o=0,r=n.length;o<r;o++)(i=n[o]).disabled||"OPTGROUP"===i.parentNode.tagName&&i.parentNode.disabled||s.push(i.value);return e.multiple?s:s.length?s[0]:null}i=null,String.prototype.startsWith||(t=function(){try{var e={},t=Object.defineProperty,i=t(e,e,e)&&t}catch(e){}return i}(),c={}.toString,t?t(String.prototype,"startsWith",{value:h,configurable:!0,writable:!0}):String.prototype.startsWith=h),Object.keys||(Object.keys=function(e,t,i){for(t in i=[],e)i.hasOwnProperty.call(e,t)&&i.push(t);return i}),HTMLSelectElement&&!HTMLSelectElement.prototype.hasOwnProperty("selectedOptions")&&Object.defineProperty(HTMLSelectElement.prototype,"selectedOptions",{get:function(){return this.querySelectorAll(":checked")}});var p={useDefault:!1,_set:P.valHooks.select.set};P.valHooks.select.set=function(e,t){return t&&!p.useDefault&&P(e).data("selected",!0),p._set.apply(this,arguments)};var T=null,u=function(){try{return new Event("change"),!0}catch(e){return!1}}();function k(e,t,i,s){for(var n=["display","subtext","tokens"],o=!1,r=0;r<n.length;r++){var l=n[r],a=e[l];if(a&&(a=a.toString(),"display"===l&&(a=a.replace(/<[^>]+>/g,"")),s&&(a=w(a)),a=a.toUpperCase(),o="contains"===i?0<=a.indexOf(t):a.startsWith(t)))break}return o}function N(e){return parseInt(e,10)||0}P.fn.triggerNative=function(e){var t,i=this[0];i.dispatchEvent?(u?t=new Event(e,{bubbles:!0}):(t=document.createEvent("Event")).initEvent(e,!0,!1),i.dispatchEvent(t)):i.fireEvent?((t=document.createEventObject()).eventType=e,i.fireEvent("on"+e,t)):this.trigger(e)};var f={"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I","\xcd":"I","\xce":"I","\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss","\u0100":"A","\u0102":"A","\u0104":"A","\u0101":"a","\u0103":"a","\u0105":"a","\u0106":"C","\u0108":"C","\u010a":"C","\u010c":"C","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\u010e":"D","\u0110":"D","\u010f":"d","\u0111":"d","\u0112":"E","\u0114":"E","\u0116":"E","\u0118":"E","\u011a":"E","\u0113":"e","\u0115":"e","\u0117":"e","\u0119":"e","\u011b":"e","\u011c":"G","\u011e":"G","\u0120":"G","\u0122":"G","\u011d":"g","\u011f":"g","\u0121":"g","\u0123":"g","\u0124":"H","\u0126":"H","\u0125":"h","\u0127":"h","\u0128":"I","\u012a":"I","\u012c":"I","\u012e":"I","\u0130":"I","\u0129":"i","\u012b":"i","\u012d":"i","\u012f":"i","\u0131":"i","\u0134":"J","\u0135":"j","\u0136":"K","\u0137":"k","\u0138":"k","\u0139":"L","\u013b":"L","\u013d":"L","\u013f":"L","\u0141":"L","\u013a":"l","\u013c":"l","\u013e":"l","\u0140":"l","\u0142":"l","\u0143":"N","\u0145":"N","\u0147":"N","\u014a":"N","\u0144":"n","\u0146":"n","\u0148":"n","\u014b":"n","\u014c":"O","\u014e":"O","\u0150":"O","\u014d":"o","\u014f":"o","\u0151":"o","\u0154":"R","\u0156":"R","\u0158":"R","\u0155":"r","\u0157":"r","\u0159":"r","\u015a":"S","\u015c":"S","\u015e":"S","\u0160":"S","\u015b":"s","\u015d":"s","\u015f":"s","\u0161":"s","\u0162":"T","\u0164":"T","\u0166":"T","\u0163":"t","\u0165":"t","\u0167":"t","\u0168":"U","\u016a":"U","\u016c":"U","\u016e":"U","\u0170":"U","\u0172":"U","\u0169":"u","\u016b":"u","\u016d":"u","\u016f":"u","\u0171":"u","\u0173":"u","\u0174":"W","\u0175":"w","\u0176":"Y","\u0177":"y","\u0178":"Y","\u0179":"Z","\u017b":"Z","\u017d":"Z","\u017a":"z","\u017c":"z","\u017e":"z","\u0132":"IJ","\u0133":"ij","\u0152":"Oe","\u0153":"oe","\u0149":"'n","\u017f":"s"},m=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,g=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\u1ab0-\\u1aff\\u1dc0-\\u1dff]","g");function b(e){return f[e]}function w(e){return(e=e.toString())&&e.replace(m,b).replace(g,"")}var I,x,y,$,S=(I={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},x="(?:"+Object.keys(I).join("|")+")",y=RegExp(x),$=RegExp(x,"g"),function(e){return e=null==e?"":""+e,y.test(e)?e.replace($,E):e});function E(e){return I[e]}var C={32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",65:"A",66:"B",67:"C",68:"D",69:"E",70:"F",71:"G",72:"H",73:"I",74:"J",75:"K",76:"L",77:"M",78:"N",79:"O",80:"P",81:"Q",82:"R",83:"S",84:"T",85:"U",86:"V",87:"W",88:"X",89:"Y",90:"Z",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9"},A=27,L=13,D=32,H=9,B=38,R=40,M={success:!1,major:"3"};try{M.full=(P.fn.dropdown.Constructor.VERSION||"").split(" ")[0].split("."),M.major=M.full[0],M.success=!0}catch(e){}var U=0,j=".bs.select",V={DISABLED:"disabled",DIVIDER:"divider",SHOW:"open",DROPUP:"dropup",MENU:"dropdown-menu",MENURIGHT:"dropdown-menu-right",MENULEFT:"dropdown-menu-left",BUTTONCLASS:"btn-default",POPOVERHEADER:"popover-title",ICONBASE:"glyphicon",TICKICON:"glyphicon-ok"},F={MENU:"."+V.MENU},_={div:document.createElement("div"),span:document.createElement("span"),i:document.createElement("i"),subtext:document.createElement("small"),a:document.createElement("a"),li:document.createElement("li"),whitespace:document.createTextNode("\xa0"),fragment:document.createDocumentFragment()};_.noResults=_.li.cloneNode(!1),_.noResults.className="no-results",_.a.setAttribute("role","option"),_.a.className="dropdown-item",_.subtext.className="text-muted",_.text=_.span.cloneNode(!1),_.text.className="text",_.checkMark=_.span.cloneNode(!1);var G=new RegExp(B+"|"+R),q=new RegExp("^"+H+"$|"+A),K={li:function(e,t,i){var s=_.li.cloneNode(!1);return e&&(1===e.nodeType||11===e.nodeType?s.appendChild(e):s.innerHTML=e),void 0!==t&&""!==t&&(s.className=t),null!=i&&s.classList.add("optgroup-"+i),s},a:function(e,t,i){var s=_.a.cloneNode(!0);return e&&(11===e.nodeType?s.appendChild(e):s.insertAdjacentHTML("beforeend",e)),void 0!==t&&""!==t&&s.classList.add.apply(s.classList,t.split(/\s+/)),i&&s.setAttribute("style",i),s},text:function(e,t){var i,s,n=_.text.cloneNode(!1);if(e.content)n.innerHTML=e.content;else{if(n.textContent=e.text,e.icon){var o=_.whitespace.cloneNode(!1);(s=(!0===t?_.i:_.span).cloneNode(!1)).className=this.options.iconBase+" "+e.icon,_.fragment.appendChild(s),_.fragment.appendChild(o)}e.subtext&&((i=_.subtext.cloneNode(!1)).textContent=e.subtext,n.appendChild(i))}if(!0===t)for(;0<n.childNodes.length;)_.fragment.appendChild(n.childNodes[0]);else _.fragment.appendChild(n);return _.fragment},label:function(e){var t,i,s=_.text.cloneNode(!1);if(s.innerHTML=e.display,e.icon){var n=_.whitespace.cloneNode(!1);(i=_.span.cloneNode(!1)).className=this.options.iconBase+" "+e.icon,_.fragment.appendChild(i),_.fragment.appendChild(n)}return e.subtext&&((t=_.subtext.cloneNode(!1)).textContent=e.subtext,s.appendChild(t)),_.fragment.appendChild(s),_.fragment}};var Y=function(e,t){var i=this;p.useDefault||(P.valHooks.select.set=p._set,p.useDefault=!0),this.$element=P(e),this.$newElement=null,this.$button=null,this.$menu=null,this.options=t,this.selectpicker={main:{},search:{},current:{},view:{},isSearching:!1,keydown:{keyHistory:"",resetKeyHistory:{start:function(){return setTimeout(function(){i.selectpicker.keydown.keyHistory=""},800)}}}},this.sizeInfo={},null===this.options.title&&(this.options.title=this.$element.attr("title"));var s=this.options.windowPadding;"number"==typeof s&&(this.options.windowPadding=[s,s,s,s]),this.val=Y.prototype.val,this.render=Y.prototype.render,this.refresh=Y.prototype.refresh,this.setStyle=Y.prototype.setStyle,this.selectAll=Y.prototype.selectAll,this.deselectAll=Y.prototype.deselectAll,this.destroy=Y.prototype.destroy,this.remove=Y.prototype.remove,this.show=Y.prototype.show,this.hide=Y.prototype.hide,this.init()};function Z(e){var l,a=arguments,c=e;if([].shift.apply(a),!M.success){try{M.full=(P.fn.dropdown.Constructor.VERSION||"").split(" ")[0].split(".")}catch(e){Y.BootstrapVersion?M.full=Y.BootstrapVersion.split(" ")[0].split("."):(M.full=[M.major,"0","0"],console.warn("There was an issue retrieving Bootstrap's version. Ensure Bootstrap is being loaded before bootstrap-select and there is no namespace collision. If loading Bootstrap asynchronously, the version may need to be manually specified via $.fn.selectpicker.Constructor.BootstrapVersion.",e))}M.major=M.full[0],M.success=!0}if("4"===M.major){var t=[];Y.DEFAULTS.style===V.BUTTONCLASS&&t.push({name:"style",className:"BUTTONCLASS"}),Y.DEFAULTS.iconBase===V.ICONBASE&&t.push({name:"iconBase",className:"ICONBASE"}),Y.DEFAULTS.tickIcon===V.TICKICON&&t.push({name:"tickIcon",className:"TICKICON"}),V.DIVIDER="dropdown-divider",V.SHOW="show",V.BUTTONCLASS="btn-light",V.POPOVERHEADER="popover-header",V.ICONBASE="",V.TICKICON="bs-ok-default";for(var i=0;i<t.length;i++){e=t[i];Y.DEFAULTS[e.name]=V[e.className]}}var s=this.each(function(){var e=P(this);if(e.is("select")){var t=e.data("selectpicker"),i="object"==typeof c&&c;if(t){if(i)for(var s in i)Object.prototype.hasOwnProperty.call(i,s)&&(t.options[s]=i[s])}else{var n=e.data();for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&-1!==P.inArray(o,d)&&delete n[o];var r=P.extend({},Y.DEFAULTS,P.fn.selectpicker.defaults||{},n,i);r.template=P.extend({},Y.DEFAULTS.template,P.fn.selectpicker.defaults?P.fn.selectpicker.defaults.template:{},n.template,i.template),e.data("selectpicker",t=new Y(this,r))}"string"==typeof c&&(l=t[c]instanceof Function?t[c].apply(t,a):t.options[c])}});return void 0!==l?l:s}Y.VERSION="1.13.18",Y.DEFAULTS={noneSelectedText:"Nothing selected",noneResultsText:"No results matched {0}",countSelectedText:function(e,t){return 1==e?"{0} item selected":"{0} items selected"},maxOptionsText:function(e,t){return[1==e?"Limit reached ({n} item max)":"Limit reached ({n} items max)",1==t?"Group limit reached ({n} item max)":"Group limit reached ({n} items max)"]},selectAllText:"Select All",deselectAllText:"Deselect All",doneButton:!1,doneButtonText:"Close",multipleSeparator:", ",styleBase:"btn",style:V.BUTTONCLASS,size:"auto",title:null,selectedTextFormat:"values",width:!1,container:!1,hideDisabled:!1,showSubtext:!1,showIcon:!0,showContent:!0,dropupAuto:!0,header:!1,liveSearch:!1,liveSearchPlaceholder:null,liveSearchNormalize:!1,liveSearchStyle:"contains",actionsBox:!1,iconBase:V.ICONBASE,tickIcon:V.TICKICON,showTick:!1,template:{caret:'<span class="caret"></span>'},maxOptions:!1,mobile:!1,selectOnTab:!1,dropdownAlignRight:!1,windowPadding:0,virtualScroll:600,display:!1,sanitize:!0,sanitizeFn:null,whiteList:e},Y.prototype={constructor:Y,init:function(){var i=this,e=this.$element.attr("id"),t=this.$element[0],s=t.form;U++,this.selectId="bs-select-"+U,t.classList.add("bs-select-hidden"),this.multiple=this.$element.prop("multiple"),this.autofocus=this.$element.prop("autofocus"),t.classList.contains("show-tick")&&(this.options.showTick=!0),this.$newElement=this.createDropdown(),this.buildData(),this.$element.after(this.$newElement).prependTo(this.$newElement),s&&null===t.form&&(s.id||(s.id="form-"+this.selectId),t.setAttribute("form",s.id)),this.$button=this.$newElement.children("button"),this.$menu=this.$newElement.children(F.MENU),this.$menuInner=this.$menu.children(".inner"),this.$searchbox=this.$menu.find("input"),t.classList.remove("bs-select-hidden"),!0===this.options.dropdownAlignRight&&this.$menu[0].classList.add(V.MENURIGHT),void 0!==e&&this.$button.attr("data-id",e),this.checkDisabled(),this.clickListener(),this.options.liveSearch?(this.liveSearchListener(),this.focusedParent=this.$searchbox[0]):this.focusedParent=this.$menuInner[0],this.setStyle(),this.render(),this.setWidth(),this.options.container?this.selectPosition():this.$element.on("hide"+j,function(){if(i.isVirtual()){var e=i.$menuInner[0],t=e.firstChild.cloneNode(!1);e.replaceChild(t,e.firstChild),e.scrollTop=0}}),this.$menu.data("this",this),this.$newElement.data("this",this),this.options.mobile&&this.mobile(),this.$newElement.on({"hide.bs.dropdown":function(e){i.$element.trigger("hide"+j,e)},"hidden.bs.dropdown":function(e){i.$element.trigger("hidden"+j,e)},"show.bs.dropdown":function(e){i.$element.trigger("show"+j,e)},"shown.bs.dropdown":function(e){i.$element.trigger("shown"+j,e)}}),t.hasAttribute("required")&&this.$element.on("invalid"+j,function(){i.$button[0].classList.add("bs-invalid"),i.$element.on("shown"+j+".invalid",function(){i.$element.val(i.$element.val()).off("shown"+j+".invalid")}).on("rendered"+j,function(){this.validity.valid&&i.$button[0].classList.remove("bs-invalid"),i.$element.off("rendered"+j)}),i.$button.on("blur"+j,function(){i.$element.trigger("focus").trigger("blur"),i.$button.off("blur"+j)})}),setTimeout(function(){i.buildList(),i.$element.trigger("loaded"+j)})},createDropdown:function(){var e=this.multiple||this.options.showTick?" show-tick":"",t=this.multiple?' aria-multiselectable="true"':"",i="",s=this.autofocus?" autofocus":"";M.major<4&&this.$element.parent().hasClass("input-group")&&(i=" input-group-btn");var n,o="",r="",l="",a="";return this.options.header&&(o='<div class="'+V.POPOVERHEADER+'"><button type="button" class="close" aria-hidden="true">&times;</button>'+this.options.header+"</div>"),this.options.liveSearch&&(r='<div class="bs-searchbox"><input type="search" class="form-control" autocomplete="off"'+(null===this.options.liveSearchPlaceholder?"":' placeholder="'+S(this.options.liveSearchPlaceholder)+'"')+' role="combobox" aria-label="Search" aria-controls="'+this.selectId+'" aria-autocomplete="list"></div>'),this.multiple&&this.options.actionsBox&&(l='<div class="bs-actionsbox"><div class="btn-group btn-group-sm btn-block"><button type="button" class="actions-btn bs-select-all btn '+V.BUTTONCLASS+'">'+this.options.selectAllText+'</button><button type="button" class="actions-btn bs-deselect-all btn '+V.BUTTONCLASS+'">'+this.options.deselectAllText+"</button></div></div>"),this.multiple&&this.options.doneButton&&(a='<div class="bs-donebutton"><div class="btn-group btn-block"><button type="button" class="btn btn-sm '+V.BUTTONCLASS+'">'+this.options.doneButtonText+"</button></div></div>"),n='<div class="dropdown bootstrap-select'+e+i+'"><button type="button" tabindex="-1" class="'+this.options.styleBase+' dropdown-toggle" '+("static"===this.options.display?'data-display="static"':"")+'data-toggle="dropdown"'+s+' role="combobox" aria-owns="'+this.selectId+'" aria-haspopup="listbox" aria-expanded="false"><div class="filter-option"><div class="filter-option-inner"><div class="filter-option-inner-inner"></div></div> </div>'+("4"===M.major?"":'<span class="bs-caret">'+this.options.template.caret+"</span>")+'</button><div class="'+V.MENU+" "+("4"===M.major?"":V.SHOW)+'">'+o+r+l+'<div class="inner '+V.SHOW+'" role="listbox" id="'+this.selectId+'" tabindex="-1" '+t+'><ul class="'+V.MENU+" inner "+("4"===M.major?V.SHOW:"")+'" role="presentation"></ul></div>'+a+"</div></div>",P(n)},setPositionData:function(){this.selectpicker.view.canHighlight=[],this.selectpicker.view.size=0,this.selectpicker.view.firstHighlightIndex=!1;for(var e=0;e<this.selectpicker.current.data.length;e++){var t=this.selectpicker.current.data[e],i=!0;"divider"===t.type?(i=!1,t.height=this.sizeInfo.dividerHeight):"optgroup-label"===t.type?(i=!1,t.height=this.sizeInfo.dropdownHeaderHeight):t.height=this.sizeInfo.liHeight,t.disabled&&(i=!1),this.selectpicker.view.canHighlight.push(i),i&&(this.selectpicker.view.size++,t.posinset=this.selectpicker.view.size,!1===this.selectpicker.view.firstHighlightIndex&&(this.selectpicker.view.firstHighlightIndex=e)),t.position=(0===e?0:this.selectpicker.current.data[e-1].position)+t.height}},isVirtual:function(){return!1!==this.options.virtualScroll&&this.selectpicker.main.elements.length>=this.options.virtualScroll||!0===this.options.virtualScroll},createView:function(N,e,t){var A,L,D=this,i=0,H=[];if(this.selectpicker.isSearching=N,this.selectpicker.current=N?this.selectpicker.search:this.selectpicker.main,this.setPositionData(),e)if(t)i=this.$menuInner[0].scrollTop;else if(!D.multiple){var s=D.$element[0],n=(s.options[s.selectedIndex]||{}).liIndex;if("number"==typeof n&&!1!==D.options.size){var o=D.selectpicker.main.data[n],r=o&&o.position;r&&(i=r-(D.sizeInfo.menuInnerHeight+D.sizeInfo.liHeight)/2)}}function l(e,t){var i,s,n,o,r,l,a,c,d=D.selectpicker.current.elements.length,h=[],p=!0,u=D.isVirtual();D.selectpicker.view.scrollTop=e,i=Math.ceil(D.sizeInfo.menuInnerHeight/D.sizeInfo.liHeight*1.5),s=Math.round(d/i)||1;for(var f=0;f<s;f++){var m=(f+1)*i;if(f===s-1&&(m=d),h[f]=[f*i+(f?1:0),m],!d)break;void 0===r&&e-1<=D.selectpicker.current.data[m-1].position-D.sizeInfo.menuInnerHeight&&(r=f)}if(void 0===r&&(r=0),l=[D.selectpicker.view.position0,D.selectpicker.view.position1],n=Math.max(0,r-1),o=Math.min(s-1,r+1),D.selectpicker.view.position0=!1===u?0:Math.max(0,h[n][0])||0,D.selectpicker.view.position1=!1===u?d:Math.min(d,h[o][1])||0,a=l[0]!==D.selectpicker.view.position0||l[1]!==D.selectpicker.view.position1,void 0!==D.activeIndex&&(L=D.selectpicker.main.elements[D.prevActiveIndex],H=D.selectpicker.main.elements[D.activeIndex],A=D.selectpicker.main.elements[D.selectedIndex],t&&(D.activeIndex!==D.selectedIndex&&D.defocusItem(H),D.activeIndex=void 0),D.activeIndex&&D.activeIndex!==D.selectedIndex&&D.defocusItem(A)),void 0!==D.prevActiveIndex&&D.prevActiveIndex!==D.activeIndex&&D.prevActiveIndex!==D.selectedIndex&&D.defocusItem(L),(t||a)&&(c=D.selectpicker.view.visibleElements?D.selectpicker.view.visibleElements.slice():[],D.selectpicker.view.visibleElements=!1===u?D.selectpicker.current.elements:D.selectpicker.current.elements.slice(D.selectpicker.view.position0,D.selectpicker.view.position1),D.setOptionStatus(),(N||!1===u&&t)&&(p=!function(e,i){return e.length===i.length&&e.every(function(e,t){return e===i[t]})}(c,D.selectpicker.view.visibleElements)),(t||!0===u)&&p)){var v,g,b=D.$menuInner[0],w=document.createDocumentFragment(),I=b.firstChild.cloneNode(!1),x=D.selectpicker.view.visibleElements,k=[];b.replaceChild(I,b.firstChild);f=0;for(var y=x.length;f<y;f++){var $,S,E=x[f];D.options.sanitize&&($=E.lastChild)&&(S=D.selectpicker.current.data[f+D.selectpicker.view.position0])&&S.content&&!S.sanitized&&(k.push($),S.sanitized=!0),w.appendChild(E)}if(D.options.sanitize&&k.length&&W(k,D.options.whiteList,D.options.sanitizeFn),!0===u?(v=0===D.selectpicker.view.position0?0:D.selectpicker.current.data[D.selectpicker.view.position0-1].position,g=D.selectpicker.view.position1>d-1?0:D.selectpicker.current.data[d-1].position-D.selectpicker.current.data[D.selectpicker.view.position1-1].position,b.firstChild.style.marginTop=v+"px",b.firstChild.style.marginBottom=g+"px"):(b.firstChild.style.marginTop=0,b.firstChild.style.marginBottom=0),b.firstChild.appendChild(w),!0===u&&D.sizeInfo.hasScrollBar){var C=b.firstChild.offsetWidth;if(t&&C<D.sizeInfo.menuInnerInnerWidth&&D.sizeInfo.totalMenuWidth>D.sizeInfo.selectWidth)b.firstChild.style.minWidth=D.sizeInfo.menuInnerInnerWidth+"px";else if(C>D.sizeInfo.menuInnerInnerWidth){D.$menu[0].style.minWidth=0;var O=b.firstChild.offsetWidth;O>D.sizeInfo.menuInnerInnerWidth&&(D.sizeInfo.menuInnerInnerWidth=O,b.firstChild.style.minWidth=D.sizeInfo.menuInnerInnerWidth+"px"),D.$menu[0].style.minWidth=""}}}if(D.prevActiveIndex=D.activeIndex,D.options.liveSearch){if(N&&t){var z,T=0;D.selectpicker.view.canHighlight[T]||(T=1+D.selectpicker.view.canHighlight.slice(1).indexOf(!0)),z=D.selectpicker.view.visibleElements[T],D.defocusItem(D.selectpicker.view.currentActive),D.activeIndex=(D.selectpicker.current.data[T]||{}).index,D.focusItem(z)}}else D.$menuInner.trigger("focus")}l(i,!0),this.$menuInner.off("scroll.createView").on("scroll.createView",function(e,t){D.noScroll||l(this.scrollTop,t),D.noScroll=!1}),P(window).off("resize"+j+"."+this.selectId+".createView").on("resize"+j+"."+this.selectId+".createView",function(){D.$newElement.hasClass(V.SHOW)&&l(D.$menuInner[0].scrollTop)})},focusItem:function(e,t,i){if(e){t=t||this.selectpicker.main.data[this.activeIndex];var s=e.firstChild;s&&(s.setAttribute("aria-setsize",this.selectpicker.view.size),s.setAttribute("aria-posinset",t.posinset),!0!==i&&(this.focusedParent.setAttribute("aria-activedescendant",s.id),e.classList.add("active"),s.classList.add("active")))}},defocusItem:function(e){e&&(e.classList.remove("active"),e.firstChild&&e.firstChild.classList.remove("active"))},setPlaceholder:function(){var e=this,t=!1;if(this.options.title&&!this.multiple){this.selectpicker.view.titleOption||(this.selectpicker.view.titleOption=document.createElement("option")),t=!0;var i=this.$element[0],s=!1,n=!this.selectpicker.view.titleOption.parentNode,o=i.selectedIndex,r=i.options[o],l=window.performance&&window.performance.getEntriesByType("navigation"),a=l&&l.length?"back_forward"!==l[0].type:2!==window.performance.navigation.type;n&&(this.selectpicker.view.titleOption.className="bs-title-option",this.selectpicker.view.titleOption.value="",s=!r||0===o&&!1===r.defaultSelected&&void 0===this.$element.data("selected")),!n&&0===this.selectpicker.view.titleOption.index||i.insertBefore(this.selectpicker.view.titleOption,i.firstChild),s&&a?i.selectedIndex=0:"complete"!==document.readyState&&window.addEventListener("pageshow",function(){e.selectpicker.view.displayedValue!==i.value&&e.render()})}return t},buildData:function(){var p=':not([hidden]):not([data-hidden="true"])',u=[],f=0,m=this.setPlaceholder()?1:0;this.options.hideDisabled&&(p+=":not(:disabled)");var e=this.$element[0].querySelectorAll("select > *"+p);function v(e){var t=u[u.length-1];t&&"divider"===t.type&&(t.optID||e.optID)||((e=e||{}).type="divider",u.push(e))}function g(e,t){if((t=t||{}).divider="true"===e.getAttribute("data-divider"),t.divider)v({optID:t.optID});else{var i=u.length,s=e.style.cssText,n=s?S(s):"",o=(e.className||"")+(t.optgroupClass||"");t.optID&&(o="opt "+o),t.optionClass=o.trim(),t.inlineStyle=n,t.text=e.textContent,t.content=e.getAttribute("data-content"),t.tokens=e.getAttribute("data-tokens"),t.subtext=e.getAttribute("data-subtext"),t.icon=e.getAttribute("data-icon"),e.liIndex=i,t.display=t.content||t.text,t.type="option",t.index=i,t.option=e,t.selected=!!e.selected,t.disabled=t.disabled||!!e.disabled,u.push(t)}}function t(e,t){var i=t[e],s=!(e-1<m)&&t[e-1],n=t[e+1],o=i.querySelectorAll("option"+p);if(o.length){var r,l,a={display:S(i.label),subtext:i.getAttribute("data-subtext"),icon:i.getAttribute("data-icon"),type:"optgroup-label",optgroupClass:" "+(i.className||"")};f++,s&&v({optID:f}),a.optID=f,u.push(a);for(var c=0,d=o.length;c<d;c++){var h=o[c];0===c&&(l=(r=u.length-1)+d),g(h,{headerIndex:r,lastIndex:l,optID:a.optID,optgroupClass:a.optgroupClass,disabled:i.disabled})}n&&v({optID:f})}}for(var i=e.length,s=m;s<i;s++){var n=e[s];"OPTGROUP"!==n.tagName?g(n,{}):t(s,e)}this.selectpicker.main.data=this.selectpicker.current.data=u},buildList:function(){var s=this,e=this.selectpicker.main.data,n=[],o=0;function t(e){var t,i=0;switch(e.type){case"divider":t=K.li(!1,V.DIVIDER,e.optID?e.optID+"div":void 0);break;case"option":(t=K.li(K.a(K.text.call(s,e),e.optionClass,e.inlineStyle),"",e.optID)).firstChild&&(t.firstChild.id=s.selectId+"-"+e.index);break;case"optgroup-label":t=K.li(K.label.call(s,e),"dropdown-header"+e.optgroupClass,e.optID)}e.element=t,n.push(t),e.display&&(i+=e.display.length),e.subtext&&(i+=e.subtext.length),e.icon&&(i+=1),o<i&&(o=i,s.selectpicker.view.widestOption=n[n.length-1])}!s.options.showTick&&!s.multiple||_.checkMark.parentNode||(_.checkMark.className=this.options.iconBase+" "+s.options.tickIcon+" check-mark",_.a.appendChild(_.checkMark));for(var i=e.length,r=0;r<i;r++){t(e[r])}this.selectpicker.main.elements=this.selectpicker.current.elements=n},findLis:function(){return this.$menuInner.find(".inner > li")},render:function(){var e,t=this,i=this.$element[0],s=this.setPlaceholder()&&0===i.selectedIndex,n=O(i,this.options.hideDisabled),o=n.length,r=this.$button[0],l=r.querySelector(".filter-option-inner-inner"),a=document.createTextNode(this.options.multipleSeparator),c=_.fragment.cloneNode(!1),d=!1;if(r.classList.toggle("bs-placeholder",t.multiple?!o:!z(i,n)),t.multiple||1!==n.length||(t.selectpicker.view.displayedValue=z(i,n)),"static"===this.options.selectedTextFormat)c=K.text.call(this,{text:this.options.title},!0);else if(!1===(this.multiple&&-1!==this.options.selectedTextFormat.indexOf("count")&&1<o&&(1<(e=this.options.selectedTextFormat.split(">")).length&&o>e[1]||1===e.length&&2<=o))){if(!s){for(var h=0;h<o&&h<50;h++){var p=n[h],u=this.selectpicker.main.data[p.liIndex],f={};this.multiple&&0<h&&c.appendChild(a.cloneNode(!1)),p.title?f.text=p.title:u&&(u.content&&t.options.showContent?(f.content=u.content.toString(),d=!0):(t.options.showIcon&&(f.icon=u.icon),t.options.showSubtext&&!t.multiple&&u.subtext&&(f.subtext=" "+u.subtext),f.text=p.textContent.trim())),c.appendChild(K.text.call(this,f,!0))}49<o&&c.appendChild(document.createTextNode("..."))}}else{var m=':not([hidden]):not([data-hidden="true"]):not([data-divider="true"])';this.options.hideDisabled&&(m+=":not(:disabled)");var v=this.$element[0].querySelectorAll("select > option"+m+", optgroup"+m+" option"+m).length,g="function"==typeof this.options.countSelectedText?this.options.countSelectedText(o,v):this.options.countSelectedText;c=K.text.call(this,{text:g.replace("{0}",o.toString()).replace("{1}",v.toString())},!0)}if(null==this.options.title&&(this.options.title=this.$element.attr("title")),c.childNodes.length||(c=K.text.call(this,{text:void 0!==this.options.title?this.options.title:this.options.noneSelectedText},!0)),r.title=c.textContent.replace(/<[^>]*>?/g,"").trim(),this.options.sanitize&&d&&W([c],t.options.whiteList,t.options.sanitizeFn),l.innerHTML="",l.appendChild(c),M.major<4&&this.$newElement[0].classList.contains("bs3-has-addon")){var b=r.querySelector(".filter-expand"),w=l.cloneNode(!0);w.className="filter-expand",b?r.replaceChild(w,b):r.appendChild(w)}this.$element.trigger("rendered"+j)},setStyle:function(e,t){var i,s=this.$button[0],n=this.$newElement[0],o=this.options.style.trim();this.$element.attr("class")&&this.$newElement.addClass(this.$element.attr("class").replace(/selectpicker|mobile-device|bs-select-hidden|validate\[.*\]/gi,"")),M.major<4&&(n.classList.add("bs3"),n.parentNode.classList&&n.parentNode.classList.contains("input-group")&&(n.previousElementSibling||n.nextElementSibling)&&(n.previousElementSibling||n.nextElementSibling).classList.contains("input-group-addon")&&n.classList.add("bs3-has-addon")),i=e?e.trim():o,"add"==t?i&&s.classList.add.apply(s.classList,i.split(" ")):"remove"==t?i&&s.classList.remove.apply(s.classList,i.split(" ")):(o&&s.classList.remove.apply(s.classList,o.split(" ")),i&&s.classList.add.apply(s.classList,i.split(" ")))},liHeight:function(e){if(e||!1!==this.options.size&&!Object.keys(this.sizeInfo).length){var t,i=_.div.cloneNode(!1),s=_.div.cloneNode(!1),n=_.div.cloneNode(!1),o=document.createElement("ul"),r=_.li.cloneNode(!1),l=_.li.cloneNode(!1),a=_.a.cloneNode(!1),c=_.span.cloneNode(!1),d=this.options.header&&0<this.$menu.find("."+V.POPOVERHEADER).length?this.$menu.find("."+V.POPOVERHEADER)[0].cloneNode(!0):null,h=this.options.liveSearch?_.div.cloneNode(!1):null,p=this.options.actionsBox&&this.multiple&&0<this.$menu.find(".bs-actionsbox").length?this.$menu.find(".bs-actionsbox")[0].cloneNode(!0):null,u=this.options.doneButton&&this.multiple&&0<this.$menu.find(".bs-donebutton").length?this.$menu.find(".bs-donebutton")[0].cloneNode(!0):null,f=this.$element.find("option")[0];if(this.sizeInfo.selectWidth=this.$newElement[0].offsetWidth,c.className="text",a.className="dropdown-item "+(f?f.className:""),i.className=this.$menu[0].parentNode.className+" "+V.SHOW,i.style.width=0,"auto"===this.options.width&&(s.style.minWidth=0),s.className=V.MENU+" "+V.SHOW,n.className="inner "+V.SHOW,o.className=V.MENU+" inner "+("4"===M.major?V.SHOW:""),r.className=V.DIVIDER,l.className="dropdown-header",c.appendChild(document.createTextNode("\u200b")),this.selectpicker.current.data.length)for(var m=0;m<this.selectpicker.current.data.length;m++){var v=this.selectpicker.current.data[m];if("option"===v.type){t=v.element;break}}else t=_.li.cloneNode(!1),a.appendChild(c),t.appendChild(a);if(l.appendChild(c.cloneNode(!0)),this.selectpicker.view.widestOption&&o.appendChild(this.selectpicker.view.widestOption.cloneNode(!0)),o.appendChild(t),o.appendChild(r),o.appendChild(l),d&&s.appendChild(d),h){var g=document.createElement("input");h.className="bs-searchbox",g.className="form-control",h.appendChild(g),s.appendChild(h)}p&&s.appendChild(p),n.appendChild(o),s.appendChild(n),u&&s.appendChild(u),i.appendChild(s),document.body.appendChild(i);var b,w=t.offsetHeight,I=l?l.offsetHeight:0,x=d?d.offsetHeight:0,k=h?h.offsetHeight:0,y=p?p.offsetHeight:0,$=u?u.offsetHeight:0,S=P(r).outerHeight(!0),E=!!window.getComputedStyle&&window.getComputedStyle(s),C=s.offsetWidth,O=E?null:P(s),z={vert:N(E?E.paddingTop:O.css("paddingTop"))+N(E?E.paddingBottom:O.css("paddingBottom"))+N(E?E.borderTopWidth:O.css("borderTopWidth"))+N(E?E.borderBottomWidth:O.css("borderBottomWidth")),horiz:N(E?E.paddingLeft:O.css("paddingLeft"))+N(E?E.paddingRight:O.css("paddingRight"))+N(E?E.borderLeftWidth:O.css("borderLeftWidth"))+N(E?E.borderRightWidth:O.css("borderRightWidth"))},T={vert:z.vert+N(E?E.marginTop:O.css("marginTop"))+N(E?E.marginBottom:O.css("marginBottom"))+2,horiz:z.horiz+N(E?E.marginLeft:O.css("marginLeft"))+N(E?E.marginRight:O.css("marginRight"))+2};n.style.overflowY="scroll",b=s.offsetWidth-C,document.body.removeChild(i),this.sizeInfo.liHeight=w,this.sizeInfo.dropdownHeaderHeight=I,this.sizeInfo.headerHeight=x,this.sizeInfo.searchHeight=k,this.sizeInfo.actionsHeight=y,this.sizeInfo.doneButtonHeight=$,this.sizeInfo.dividerHeight=S,this.sizeInfo.menuPadding=z,this.sizeInfo.menuExtras=T,this.sizeInfo.menuWidth=C,this.sizeInfo.menuInnerInnerWidth=C-z.horiz,this.sizeInfo.totalMenuWidth=this.sizeInfo.menuWidth,this.sizeInfo.scrollBarWidth=b,this.sizeInfo.selectHeight=this.$newElement[0].offsetHeight,this.setPositionData()}},getSelectPosition:function(){var e,t=P(window),i=this.$newElement.offset(),s=P(this.options.container);this.options.container&&s.length&&!s.is("body")?((e=s.offset()).top+=parseInt(s.css("borderTopWidth")),e.left+=parseInt(s.css("borderLeftWidth"))):e={top:0,left:0};var n=this.options.windowPadding;this.sizeInfo.selectOffsetTop=i.top-e.top-t.scrollTop(),this.sizeInfo.selectOffsetBot=t.height()-this.sizeInfo.selectOffsetTop-this.sizeInfo.selectHeight-e.top-n[2],this.sizeInfo.selectOffsetLeft=i.left-e.left-t.scrollLeft(),this.sizeInfo.selectOffsetRight=t.width()-this.sizeInfo.selectOffsetLeft-this.sizeInfo.selectWidth-e.left-n[1],this.sizeInfo.selectOffsetTop-=n[0],this.sizeInfo.selectOffsetLeft-=n[3]},setMenuSize:function(e){this.getSelectPosition();var t,i,s,n,o,r,l,a,c=this.sizeInfo.selectWidth,d=this.sizeInfo.liHeight,h=this.sizeInfo.headerHeight,p=this.sizeInfo.searchHeight,u=this.sizeInfo.actionsHeight,f=this.sizeInfo.doneButtonHeight,m=this.sizeInfo.dividerHeight,v=this.sizeInfo.menuPadding,g=0;if(this.options.dropupAuto&&(l=d*this.selectpicker.current.elements.length+v.vert,a=this.sizeInfo.selectOffsetTop-this.sizeInfo.selectOffsetBot>this.sizeInfo.menuExtras.vert&&l+this.sizeInfo.menuExtras.vert+50>this.sizeInfo.selectOffsetBot,!0===this.selectpicker.isSearching&&(a=this.selectpicker.dropup),this.$newElement.toggleClass(V.DROPUP,a),this.selectpicker.dropup=a),"auto"===this.options.size)n=3<this.selectpicker.current.elements.length?3*this.sizeInfo.liHeight+this.sizeInfo.menuExtras.vert-2:0,i=this.sizeInfo.selectOffsetBot-this.sizeInfo.menuExtras.vert,s=n+h+p+u+f,r=Math.max(n-v.vert,0),this.$newElement.hasClass(V.DROPUP)&&(i=this.sizeInfo.selectOffsetTop-this.sizeInfo.menuExtras.vert),t=(o=i)-h-p-u-f-v.vert;else if(this.options.size&&"auto"!=this.options.size&&this.selectpicker.current.elements.length>this.options.size){for(var b=0;b<this.options.size;b++)"divider"===this.selectpicker.current.data[b].type&&g++;t=(i=d*this.options.size+g*m+v.vert)-v.vert,o=i+h+p+u+f,s=r=""}this.$menu.css({"max-height":o+"px",overflow:"hidden","min-height":s+"px"}),this.$menuInner.css({"max-height":t+"px","overflow-y":"auto","min-height":r+"px"}),this.sizeInfo.menuInnerHeight=Math.max(t,1),this.selectpicker.current.data.length&&this.selectpicker.current.data[this.selectpicker.current.data.length-1].position>this.sizeInfo.menuInnerHeight&&(this.sizeInfo.hasScrollBar=!0,this.sizeInfo.totalMenuWidth=this.sizeInfo.menuWidth+this.sizeInfo.scrollBarWidth),"auto"===this.options.dropdownAlignRight&&this.$menu.toggleClass(V.MENURIGHT,this.sizeInfo.selectOffsetLeft>this.sizeInfo.selectOffsetRight&&this.sizeInfo.selectOffsetRight<this.sizeInfo.totalMenuWidth-c),this.dropdown&&this.dropdown._popper&&this.dropdown._popper.update()},setSize:function(e){if(this.liHeight(e),this.options.header&&this.$menu.css("padding-top",0),!1!==this.options.size){var t=this,i=P(window);this.setMenuSize(),this.options.liveSearch&&this.$searchbox.off("input.setMenuSize propertychange.setMenuSize").on("input.setMenuSize propertychange.setMenuSize",function(){return t.setMenuSize()}),"auto"===this.options.size?i.off("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize").on("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize",function(){return t.setMenuSize()}):this.options.size&&"auto"!=this.options.size&&this.selectpicker.current.elements.length>this.options.size&&i.off("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize")}this.createView(!1,!0,e)},setWidth:function(){var i=this;"auto"===this.options.width?requestAnimationFrame(function(){i.$menu.css("min-width","0"),i.$element.on("loaded"+j,function(){i.liHeight(),i.setMenuSize();var e=i.$newElement.clone().appendTo("body"),t=e.css("width","auto").children("button").outerWidth();e.remove(),i.sizeInfo.selectWidth=Math.max(i.sizeInfo.totalMenuWidth,t),i.$newElement.css("width",i.sizeInfo.selectWidth+"px")})}):"fit"===this.options.width?(this.$menu.css("min-width",""),this.$newElement.css("width","").addClass("fit-width")):this.options.width?(this.$menu.css("min-width",""),this.$newElement.css("width",this.options.width)):(this.$menu.css("min-width",""),this.$newElement.css("width","")),this.$newElement.hasClass("fit-width")&&"fit"!==this.options.width&&this.$newElement[0].classList.remove("fit-width")},selectPosition:function(){this.$bsContainer=P('<div class="bs-container" />');function e(e){var t={},i=r.options.display||!!P.fn.dropdown.Constructor.Default&&P.fn.dropdown.Constructor.Default.display;r.$bsContainer.addClass(e.attr("class").replace(/form-control|fit-width/gi,"")).toggleClass(V.DROPUP,e.hasClass(V.DROPUP)),s=e.offset(),l.is("body")?n={top:0,left:0}:((n=l.offset()).top+=parseInt(l.css("borderTopWidth"))-l.scrollTop(),n.left+=parseInt(l.css("borderLeftWidth"))-l.scrollLeft()),o=e.hasClass(V.DROPUP)?0:e[0].offsetHeight,(M.major<4||"static"===i)&&(t.top=s.top-n.top+o,t.left=s.left-n.left),t.width=e[0].offsetWidth,r.$bsContainer.css(t)}var s,n,o,r=this,l=P(this.options.container);this.$button.on("click.bs.dropdown.data-api",function(){r.isDisabled()||(e(r.$newElement),r.$bsContainer.appendTo(r.options.container).toggleClass(V.SHOW,!r.$button.hasClass(V.SHOW)).append(r.$menu))}),P(window).off("resize"+j+"."+this.selectId+" scroll"+j+"."+this.selectId).on("resize"+j+"."+this.selectId+" scroll"+j+"."+this.selectId,function(){r.$newElement.hasClass(V.SHOW)&&e(r.$newElement)}),this.$element.on("hide"+j,function(){r.$menu.data("height",r.$menu.height()),r.$bsContainer.detach()})},setOptionStatus:function(e){var t=this;if(t.noScroll=!1,t.selectpicker.view.visibleElements&&t.selectpicker.view.visibleElements.length)for(var i=0;i<t.selectpicker.view.visibleElements.length;i++){var s=t.selectpicker.current.data[i+t.selectpicker.view.position0],n=s.option;n&&(!0!==e&&t.setDisabled(s.index,s.disabled),t.setSelected(s.index,n.selected))}},setSelected:function(e,t){var i,s,n=this.selectpicker.main.elements[e],o=this.selectpicker.main.data[e],r=void 0!==this.activeIndex,l=this.activeIndex===e||t&&!this.multiple&&!r;o.selected=t,s=n.firstChild,t&&(this.selectedIndex=e),n.classList.toggle("selected",t),l?(this.focusItem(n,o),this.selectpicker.view.currentActive=n,this.activeIndex=e):this.defocusItem(n),s&&(s.classList.toggle("selected",t),t?s.setAttribute("aria-selected",!0):this.multiple?s.setAttribute("aria-selected",!1):s.removeAttribute("aria-selected")),l||r||!t||void 0===this.prevActiveIndex||(i=this.selectpicker.main.elements[this.prevActiveIndex],this.defocusItem(i))},setDisabled:function(e,t){var i,s=this.selectpicker.main.elements[e];this.selectpicker.main.data[e].disabled=t,i=s.firstChild,s.classList.toggle(V.DISABLED,t),i&&("4"===M.major&&i.classList.toggle(V.DISABLED,t),t?(i.setAttribute("aria-disabled",t),i.setAttribute("tabindex",-1)):(i.removeAttribute("aria-disabled"),i.setAttribute("tabindex",0)))},isDisabled:function(){return this.$element[0].disabled},checkDisabled:function(){this.isDisabled()?(this.$newElement[0].classList.add(V.DISABLED),this.$button.addClass(V.DISABLED).attr("aria-disabled",!0)):this.$button[0].classList.contains(V.DISABLED)&&(this.$newElement[0].classList.remove(V.DISABLED),this.$button.removeClass(V.DISABLED).attr("aria-disabled",!1))},clickListener:function(){var C=this,t=P(document);function e(){C.options.liveSearch?C.$searchbox.trigger("focus"):C.$menuInner.trigger("focus")}function i(){C.dropdown&&C.dropdown._popper&&C.dropdown._popper.state.isCreated?e():requestAnimationFrame(i)}t.data("spaceSelect",!1),this.$button.on("keyup",function(e){/(32)/.test(e.keyCode.toString(10))&&t.data("spaceSelect")&&(e.preventDefault(),t.data("spaceSelect",!1))}),this.$newElement.on("show.bs.dropdown",function(){3<M.major&&!C.dropdown&&(C.dropdown=C.$button.data("bs.dropdown"),C.dropdown._menu=C.$menu[0])}),this.$button.on("click.bs.dropdown.data-api",function(){C.$newElement.hasClass(V.SHOW)||C.setSize()}),this.$element.on("shown"+j,function(){C.$menuInner[0].scrollTop!==C.selectpicker.view.scrollTop&&(C.$menuInner[0].scrollTop=C.selectpicker.view.scrollTop),3<M.major?requestAnimationFrame(i):e()}),this.$menuInner.on("mouseenter","li a",function(e){var t=this.parentElement,i=C.isVirtual()?C.selectpicker.view.position0:0,s=Array.prototype.indexOf.call(t.parentElement.children,t),n=C.selectpicker.current.data[s+i];C.focusItem(t,n,!0)}),this.$menuInner.on("click","li a",function(e,t){var i=P(this),s=C.$element[0],n=C.isVirtual()?C.selectpicker.view.position0:0,o=C.selectpicker.current.data[i.parent().index()+n],r=o.index,l=z(s),a=s.selectedIndex,c=s.options[a],d=!0;if(C.multiple&&1!==C.options.maxOptions&&e.stopPropagation(),e.preventDefault(),!C.isDisabled()&&!i.parent().hasClass(V.DISABLED)){var h=o.option,p=P(h),u=h.selected,f=p.parent("optgroup"),m=f.find("option"),v=C.options.maxOptions,g=f.data("maxOptions")||!1;if(r===C.activeIndex&&(t=!0),t||(C.prevActiveIndex=C.activeIndex,C.activeIndex=void 0),C.multiple){if(h.selected=!u,C.setSelected(r,!u),C.focusedParent.focus(),!1!==v||!1!==g){var b=v<O(s).length,w=g<f.find("option:selected").length;if(v&&b||g&&w)if(v&&1==v)s.selectedIndex=-1,h.selected=!0,C.setOptionStatus(!0);else if(g&&1==g){for(var I=0;I<m.length;I++){var x=m[I];x.selected=!1,C.setSelected(x.liIndex,!1)}h.selected=!0,C.setSelected(r,!0)}else{var k="string"==typeof C.options.maxOptionsText?[C.options.maxOptionsText,C.options.maxOptionsText]:C.options.maxOptionsText,y="function"==typeof k?k(v,g):k,$=y[0].replace("{n}",v),S=y[1].replace("{n}",g),E=P('<div class="notify"></div>');y[2]&&($=$.replace("{var}",y[2][1<v?0:1]),S=S.replace("{var}",y[2][1<g?0:1])),h.selected=!1,C.$menu.append(E),v&&b&&(E.append(P("<div>"+$+"</div>")),d=!1,C.$element.trigger("maxReached"+j)),g&&w&&(E.append(P("<div>"+S+"</div>")),d=!1,C.$element.trigger("maxReachedGrp"+j)),setTimeout(function(){C.setSelected(r,!1)},10),E[0].classList.add("fadeOut"),setTimeout(function(){E.remove()},1050)}}}else c&&(c.selected=!1),h.selected=!0,C.setSelected(r,!0);!C.multiple||C.multiple&&1===C.options.maxOptions?C.$button.trigger("focus"):C.options.liveSearch&&C.$searchbox.trigger("focus"),d&&(!C.multiple&&a===s.selectedIndex||(T=[h.index,p.prop("selected"),l],C.$element.triggerNative("change")))}}),this.$menu.on("click","li."+V.DISABLED+" a, ."+V.POPOVERHEADER+", ."+V.POPOVERHEADER+" :not(.close)",function(e){e.currentTarget==this&&(e.preventDefault(),e.stopPropagation(),C.options.liveSearch&&!P(e.target).hasClass("close")?C.$searchbox.trigger("focus"):C.$button.trigger("focus"))}),this.$menuInner.on("click",".divider, .dropdown-header",function(e){e.preventDefault(),e.stopPropagation(),C.options.liveSearch?C.$searchbox.trigger("focus"):C.$button.trigger("focus")}),this.$menu.on("click","."+V.POPOVERHEADER+" .close",function(){C.$button.trigger("click")}),this.$searchbox.on("click",function(e){e.stopPropagation()}),this.$menu.on("click",".actions-btn",function(e){C.options.liveSearch?C.$searchbox.trigger("focus"):C.$button.trigger("focus"),e.preventDefault(),e.stopPropagation(),P(this).hasClass("bs-select-all")?C.selectAll():C.deselectAll()}),this.$button.on("focus"+j,function(e){var t=C.$element[0].getAttribute("tabindex");void 0!==t&&e.originalEvent&&e.originalEvent.isTrusted&&(this.setAttribute("tabindex",t),C.$element[0].setAttribute("tabindex",-1),C.selectpicker.view.tabindex=t)}).on("blur"+j,function(e){void 0!==C.selectpicker.view.tabindex&&e.originalEvent&&e.originalEvent.isTrusted&&(C.$element[0].setAttribute("tabindex",C.selectpicker.view.tabindex),this.setAttribute("tabindex",-1),C.selectpicker.view.tabindex=void 0)}),this.$element.on("change"+j,function(){C.render(),C.$element.trigger("changed"+j,T),T=null}).on("focus"+j,function(){C.options.mobile||C.$button[0].focus()})},liveSearchListener:function(){var u=this;this.$button.on("click.bs.dropdown.data-api",function(){u.$searchbox.val()&&(u.$searchbox.val(""),u.selectpicker.search.previousValue=void 0)}),this.$searchbox.on("click.bs.dropdown.data-api focus.bs.dropdown.data-api touchend.bs.dropdown.data-api",function(e){e.stopPropagation()}),this.$searchbox.on("input propertychange",function(){var e=u.$searchbox[0].value;if(u.selectpicker.search.elements=[],u.selectpicker.search.data=[],e){var t=[],i=e.toUpperCase(),s={},n=[],o=u._searchStyle(),r=u.options.liveSearchNormalize;r&&(i=w(i));for(var l=0;l<u.selectpicker.main.data.length;l++){var a=u.selectpicker.main.data[l];s[l]||(s[l]=k(a,i,o,r)),s[l]&&void 0!==a.headerIndex&&-1===n.indexOf(a.headerIndex)&&(0<a.headerIndex&&(s[a.headerIndex-1]=!0,n.push(a.headerIndex-1)),s[a.headerIndex]=!0,n.push(a.headerIndex),s[a.lastIndex+1]=!0),s[l]&&"optgroup-label"!==a.type&&n.push(l)}l=0;for(var c=n.length;l<c;l++){var d=n[l],h=n[l-1],p=(a=u.selectpicker.main.data[d],u.selectpicker.main.data[h]);("divider"!==a.type||"divider"===a.type&&p&&"divider"!==p.type&&c-1!==l)&&(u.selectpicker.search.data.push(a),t.push(u.selectpicker.main.elements[d]))}u.activeIndex=void 0,u.noScroll=!0,u.$menuInner.scrollTop(0),u.selectpicker.search.elements=t,u.createView(!0),function(e,t){e.length||(_.noResults.innerHTML=this.options.noneResultsText.replace("{0}",'"'+S(t)+'"'),this.$menuInner[0].firstChild.appendChild(_.noResults))}.call(u,t,e)}else u.selectpicker.search.previousValue&&(u.$menuInner.scrollTop(0),u.createView(!1));u.selectpicker.search.previousValue=e})},_searchStyle:function(){return this.options.liveSearchStyle||"contains"},val:function(e){var t=this.$element[0];if(void 0===e)return this.$element.val();var i=z(t);if(T=[null,null,i],this.$element.val(e).trigger("changed"+j,T),this.$newElement.hasClass(V.SHOW))if(this.multiple)this.setOptionStatus(!0);else{var s=(t.options[t.selectedIndex]||{}).liIndex;"number"==typeof s&&(this.setSelected(this.selectedIndex,!1),this.setSelected(s,!0))}return this.render(),T=null,this.$element},changeAll:function(e){if(this.multiple){void 0===e&&(e=!0);var t=this.$element[0],i=0,s=0,n=z(t);t.classList.add("bs-select-hidden");for(var o=0,r=this.selectpicker.current.data,l=r.length;o<l;o++){var a=r[o],c=a.option;c&&!a.disabled&&"divider"!==a.type&&(a.selected&&i++,!0===(c.selected=e)&&s++)}t.classList.remove("bs-select-hidden"),i!==s&&(this.setOptionStatus(),T=[null,null,n],this.$element.triggerNative("change"))}},selectAll:function(){return this.changeAll(!0)},deselectAll:function(){return this.changeAll(!1)},toggle:function(e){(e=e||window.event)&&e.stopPropagation(),this.$button.trigger("click.bs.dropdown.data-api")},keydown:function(e){var t,i,s,n,o,r=P(this),l=r.hasClass("dropdown-toggle"),a=(l?r.closest(".dropdown"):r.closest(F.MENU)).data("this"),c=a.findLis(),d=!1,h=e.which===H&&!l&&!a.options.selectOnTab,p=G.test(e.which)||h,u=a.$menuInner[0].scrollTop,f=!0===a.isVirtual()?a.selectpicker.view.position0:0;if(!(112<=e.which&&e.which<=123))if(!(i=a.$newElement.hasClass(V.SHOW))&&(p||48<=e.which&&e.which<=57||96<=e.which&&e.which<=105||65<=e.which&&e.which<=90)&&(a.$button.trigger("click.bs.dropdown.data-api"),a.options.liveSearch))a.$searchbox.trigger("focus");else{if(e.which===A&&i&&(e.preventDefault(),a.$button.trigger("click.bs.dropdown.data-api").trigger("focus")),p){if(!c.length)return;-1!==(t=(s=a.selectpicker.main.elements[a.activeIndex])?Array.prototype.indexOf.call(s.parentElement.children,s):-1)&&a.defocusItem(s),e.which===B?(-1!==t&&t--,t+f<0&&(t+=c.length),a.selectpicker.view.canHighlight[t+f]||-1===(t=a.selectpicker.view.canHighlight.slice(0,t+f).lastIndexOf(!0)-f)&&(t=c.length-1)):e.which!==R&&!h||(++t+f>=a.selectpicker.view.canHighlight.length&&(t=a.selectpicker.view.firstHighlightIndex),a.selectpicker.view.canHighlight[t+f]||(t=t+1+a.selectpicker.view.canHighlight.slice(t+f+1).indexOf(!0))),e.preventDefault();var m=f+t;e.which===B?0===f&&t===c.length-1?(a.$menuInner[0].scrollTop=a.$menuInner[0].scrollHeight,m=a.selectpicker.current.elements.length-1):d=(o=(n=a.selectpicker.current.data[m]).position-n.height)<u:e.which!==R&&!h||(t===a.selectpicker.view.firstHighlightIndex?(a.$menuInner[0].scrollTop=0,m=a.selectpicker.view.firstHighlightIndex):d=u<(o=(n=a.selectpicker.current.data[m]).position-a.sizeInfo.menuInnerHeight)),s=a.selectpicker.current.elements[m],a.activeIndex=a.selectpicker.current.data[m].index,a.focusItem(s),a.selectpicker.view.currentActive=s,d&&(a.$menuInner[0].scrollTop=o),a.options.liveSearch?a.$searchbox.trigger("focus"):r.trigger("focus")}else if(!r.is("input")&&!q.test(e.which)||e.which===D&&a.selectpicker.keydown.keyHistory){var v,g,b=[];e.preventDefault(),a.selectpicker.keydown.keyHistory+=C[e.which],a.selectpicker.keydown.resetKeyHistory.cancel&&clearTimeout(a.selectpicker.keydown.resetKeyHistory.cancel),a.selectpicker.keydown.resetKeyHistory.cancel=a.selectpicker.keydown.resetKeyHistory.start(),g=a.selectpicker.keydown.keyHistory,/^(.)\1+$/.test(g)&&(g=g.charAt(0));for(var w=0;w<a.selectpicker.current.data.length;w++){var I=a.selectpicker.current.data[w];k(I,g,"startsWith",!0)&&a.selectpicker.view.canHighlight[w]&&b.push(I.index)}if(b.length){var x=0;c.removeClass("active").find("a").removeClass("active"),1===g.length&&(-1===(x=b.indexOf(a.activeIndex))||x===b.length-1?x=0:x++),v=b[x],d=0<u-(n=a.selectpicker.main.data[v]).position?(o=n.position-n.height,!0):(o=n.position-a.sizeInfo.menuInnerHeight,n.position>u+a.sizeInfo.menuInnerHeight),s=a.selectpicker.main.elements[v],a.activeIndex=b[x],a.focusItem(s),s&&s.firstChild.focus(),d&&(a.$menuInner[0].scrollTop=o),r.trigger("focus")}}i&&(e.which===D&&!a.selectpicker.keydown.keyHistory||e.which===L||e.which===H&&a.options.selectOnTab)&&(e.which!==D&&e.preventDefault(),a.options.liveSearch&&e.which===D||(a.$menuInner.find(".active a").trigger("click",!0),r.trigger("focus"),a.options.liveSearch||(e.preventDefault(),P(document).data("spaceSelect",!0))))}},mobile:function(){this.options.mobile=!0,this.$element[0].classList.add("mobile-device")},refresh:function(){var e=P.extend({},this.options,this.$element.data());this.options=e,this.checkDisabled(),this.buildData(),this.setStyle(),this.render(),this.buildList(),this.setWidth(),this.setSize(!0),this.$element.trigger("refreshed"+j)},hide:function(){this.$newElement.hide()},show:function(){this.$newElement.show()},remove:function(){this.$newElement.remove(),this.$element.remove()},destroy:function(){this.$newElement.before(this.$element).remove(),this.$bsContainer?this.$bsContainer.remove():this.$menu.remove(),this.selectpicker.view.titleOption&&this.selectpicker.view.titleOption.parentNode&&this.selectpicker.view.titleOption.parentNode.removeChild(this.selectpicker.view.titleOption),this.$element.off(j).removeData("selectpicker").removeClass("bs-select-hidden selectpicker"),P(window).off(j+"."+this.selectId)}};var J=P.fn.selectpicker;function Q(){if(P.fn.dropdown)return(P.fn.dropdown.Constructor._dataApiKeydownHandler||P.fn.dropdown.Constructor.prototype.keydown).apply(this,arguments)}P.fn.selectpicker=Z,P.fn.selectpicker.Constructor=Y,P.fn.selectpicker.noConflict=function(){return P.fn.selectpicker=J,this},P(document).off("keydown.bs.dropdown.data-api").on("keydown.bs.dropdown.data-api",':not(.bootstrap-select) > [data-toggle="dropdown"]',Q).on("keydown.bs.dropdown.data-api",":not(.bootstrap-select) > .dropdown-menu",Q).on("keydown"+j,'.bootstrap-select [data-toggle="dropdown"], .bootstrap-select [role="listbox"], .bootstrap-select .bs-searchbox input',Y.prototype.keydown).on("focusin.modal",'.bootstrap-select [data-toggle="dropdown"], .bootstrap-select [role="listbox"], .bootstrap-select .bs-searchbox input',function(e){e.stopPropagation()}),P(window).on("load"+j+".data-api",function(){P(".selectpicker").each(function(){var e=P(this);Z.call(e,e.data())})})}(e)});
+//# sourceMappingURL=bootstrap-select.min.js.map
\ No newline at end of file
diff --git a/src/vendor/bootstrap-select/js/i18n/defaults-zh_CN.min.js b/src/vendor/bootstrap-select/js/i18n/defaults-zh_CN.min.js
new file mode 100644
index 0000000..bd89027
--- /dev/null
+++ b/src/vendor/bootstrap-select/js/i18n/defaults-zh_CN.min.js
@@ -0,0 +1,8 @@
+/*!
+ * Bootstrap-select v1.13.18 (https://developer.snapappointments.com/bootstrap-select)
+ *
+ * Copyright 2012-2020 SnapAppointments, LLC
+ * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
+ */
+
+!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"\u6ca1\u6709\u9009\u4e2d\u4efb\u4f55\u9879",noneResultsText:"\u6ca1\u6709\u627e\u5230\u5339\u914d\u9879",countSelectedText:"\u9009\u4e2d{1}\u4e2d\u7684{0}\u9879",maxOptionsText:["\u8d85\u51fa\u9650\u5236 (\u6700\u591a\u9009\u62e9{n}\u9879)","\u7ec4\u9009\u62e9\u8d85\u51fa\u9650\u5236(\u6700\u591a\u9009\u62e9{n}\u7ec4)"],multipleSeparator:", ",selectAllText:"\u5168\u9009",deselectAllText:"\u53d6\u6d88\u5168\u9009"}});
\ No newline at end of file
diff --git a/src/vendor/lodash/lodash.js b/src/vendor/lodash/lodash.js
deleted file mode 100644
index 13ec307..0000000
--- a/src/vendor/lodash/lodash.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * @license
- * Lodash lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
- */
-;(function(){function n(n,t,r){switch(r.length){case 0:return n.call(t);case 1:return n.call(t,r[0]);case 2:return n.call(t,r[0],r[1]);case 3:return n.call(t,r[0],r[1],r[2])}return n.apply(t,r)}function t(n,t,r,e){for(var u=-1,i=null==n?0:n.length;++u<i;){var o=n[u];t(e,o,r(o),n)}return e}function r(n,t){for(var r=-1,e=null==n?0:n.length;++r<e&&false!==t(n[r],r,n););return n}function e(n,t){for(var r=null==n?0:n.length;r--&&false!==t(n[r],r,n););return n}function u(n,t){for(var r=-1,e=null==n?0:n.length;++r<e;)if(!t(n[r],r,n))return false;
-return true}function i(n,t){for(var r=-1,e=null==n?0:n.length,u=0,i=[];++r<e;){var o=n[r];t(o,r,n)&&(i[u++]=o)}return i}function o(n,t){return!(null==n||!n.length)&&-1<v(n,t,0)}function f(n,t,r){for(var e=-1,u=null==n?0:n.length;++e<u;)if(r(t,n[e]))return true;return false}function c(n,t){for(var r=-1,e=null==n?0:n.length,u=Array(e);++r<e;)u[r]=t(n[r],r,n);return u}function a(n,t){for(var r=-1,e=t.length,u=n.length;++r<e;)n[u+r]=t[r];return n}function l(n,t,r,e){var u=-1,i=null==n?0:n.length;for(e&&i&&(r=n[++u]);++u<i;)r=t(r,n[u],u,n);
-return r}function s(n,t,r,e){var u=null==n?0:n.length;for(e&&u&&(r=n[--u]);u--;)r=t(r,n[u],u,n);return r}function h(n,t){for(var r=-1,e=null==n?0:n.length;++r<e;)if(t(n[r],r,n))return true;return false}function p(n,t,r){var e;return r(n,function(n,r,u){if(t(n,r,u))return e=r,false}),e}function _(n,t,r,e){var u=n.length;for(r+=e?1:-1;e?r--:++r<u;)if(t(n[r],r,n))return r;return-1}function v(n,t,r){if(t===t)n:{--r;for(var e=n.length;++r<e;)if(n[r]===t){n=r;break n}n=-1}else n=_(n,d,r);return n}function g(n,t,r,e){
---r;for(var u=n.length;++r<u;)if(e(n[r],t))return r;return-1}function d(n){return n!==n}function y(n,t){var r=null==n?0:n.length;return r?m(n,t)/r:F}function b(n){return function(t){return null==t?T:t[n]}}function x(n){return function(t){return null==n?T:n[t]}}function j(n,t,r,e,u){return u(n,function(n,u,i){r=e?(e=false,n):t(r,n,u,i)}),r}function w(n,t){var r=n.length;for(n.sort(t);r--;)n[r]=n[r].c;return n}function m(n,t){for(var r,e=-1,u=n.length;++e<u;){var i=t(n[e]);i!==T&&(r=r===T?i:r+i)}return r;
-}function A(n,t){for(var r=-1,e=Array(n);++r<n;)e[r]=t(r);return e}function E(n,t){return c(t,function(t){return[t,n[t]]})}function k(n){return function(t){return n(t)}}function S(n,t){return c(t,function(t){return n[t]})}function O(n,t){return n.has(t)}function I(n,t){for(var r=-1,e=n.length;++r<e&&-1<v(t,n[r],0););return r}function R(n,t){for(var r=n.length;r--&&-1<v(t,n[r],0););return r}function z(n){return"\\"+Un[n]}function W(n){var t=-1,r=Array(n.size);return n.forEach(function(n,e){r[++t]=[e,n];
-}),r}function B(n,t){return function(r){return n(t(r))}}function L(n,t){for(var r=-1,e=n.length,u=0,i=[];++r<e;){var o=n[r];o!==t&&"__lodash_placeholder__"!==o||(n[r]="__lodash_placeholder__",i[u++]=r)}return i}function U(n){var t=-1,r=Array(n.size);return n.forEach(function(n){r[++t]=n}),r}function C(n){var t=-1,r=Array(n.size);return n.forEach(function(n){r[++t]=[n,n]}),r}function D(n){if(Rn.test(n)){for(var t=On.lastIndex=0;On.test(n);)++t;n=t}else n=Qn(n);return n}function M(n){return Rn.test(n)?n.match(On)||[]:n.split("");
-}var T,$=1/0,F=NaN,N=[["ary",128],["bind",1],["bindKey",2],["curry",8],["curryRight",16],["flip",512],["partial",32],["partialRight",64],["rearg",256]],P=/\b__p\+='';/g,Z=/\b(__p\+=)''\+/g,q=/(__e\(.*?\)|\b__t\))\+'';/g,V=/&(?:amp|lt|gt|quot|#39);/g,K=/[&<>"']/g,G=RegExp(V.source),H=RegExp(K.source),J=/<%-([\s\S]+?)%>/g,Y=/<%([\s\S]+?)%>/g,Q=/<%=([\s\S]+?)%>/g,X=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,nn=/^\w*$/,tn=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,rn=/[\\^$.*+?()[\]{}|]/g,en=RegExp(rn.source),un=/^\s+|\s+$/g,on=/^\s+/,fn=/\s+$/,cn=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,an=/\{\n\/\* \[wrapped with (.+)\] \*/,ln=/,? & /,sn=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,hn=/\\(\\)?/g,pn=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,_n=/\w*$/,vn=/^[-+]0x[0-9a-f]+$/i,gn=/^0b[01]+$/i,dn=/^\[object .+?Constructor\]$/,yn=/^0o[0-7]+$/i,bn=/^(?:0|[1-9]\d*)$/,xn=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,jn=/($^)/,wn=/['\n\r\u2028\u2029\\]/g,mn="[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?(?:\\u200d(?:[^\\ud800-\\udfff]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])[\\ufe0e\\ufe0f]?(?:[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|\\ud83c[\\udffb-\\udfff])?)*",An="(?:[\\u2700-\\u27bf]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])"+mn,En="(?:[^\\ud800-\\udfff][\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]?|[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff]|[\\ud800-\\udfff])",kn=RegExp("['\u2019]","g"),Sn=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff]","g"),On=RegExp("\\ud83c[\\udffb-\\udfff](?=\\ud83c[\\udffb-\\udfff])|"+En+mn,"g"),In=RegExp(["[A-Z\\xc0-\\xd6\\xd8-\\xde]?[a-z\\xdf-\\xf6\\xf8-\\xff]+(?:['\u2019](?:d|ll|m|re|s|t|ve))?(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde]|$)|(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['\u2019](?:D|LL|M|RE|S|T|VE))?(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde](?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])|$)|[A-Z\\xc0-\\xd6\\xd8-\\xde]?(?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2000-\\u206f \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?:['\u2019](?:d|ll|m|re|s|t|ve))?|[A-Z\\xc0-\\xd6\\xd8-\\xde]+(?:['\u2019](?:D|LL|M|RE|S|T|VE))?|\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])|\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])|\\d+",An].join("|"),"g"),Rn=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\ufe0e\\ufe0f]"),zn=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Wn="Array Buffer DataView Date Error Float32Array Float64Array Function Int8Array Int16Array Int32Array Map Math Object Promise RegExp Set String Symbol TypeError Uint8Array Uint8ClampedArray Uint16Array Uint32Array WeakMap _ clearTimeout isFinite parseInt setTimeout".split(" "),Bn={};
-Bn["[object Float32Array]"]=Bn["[object Float64Array]"]=Bn["[object Int8Array]"]=Bn["[object Int16Array]"]=Bn["[object Int32Array]"]=Bn["[object Uint8Array]"]=Bn["[object Uint8ClampedArray]"]=Bn["[object Uint16Array]"]=Bn["[object Uint32Array]"]=true,Bn["[object Arguments]"]=Bn["[object Array]"]=Bn["[object ArrayBuffer]"]=Bn["[object Boolean]"]=Bn["[object DataView]"]=Bn["[object Date]"]=Bn["[object Error]"]=Bn["[object Function]"]=Bn["[object Map]"]=Bn["[object Number]"]=Bn["[object Object]"]=Bn["[object RegExp]"]=Bn["[object Set]"]=Bn["[object String]"]=Bn["[object WeakMap]"]=false;
-var Ln={};Ln["[object Arguments]"]=Ln["[object Array]"]=Ln["[object ArrayBuffer]"]=Ln["[object DataView]"]=Ln["[object Boolean]"]=Ln["[object Date]"]=Ln["[object Float32Array]"]=Ln["[object Float64Array]"]=Ln["[object Int8Array]"]=Ln["[object Int16Array]"]=Ln["[object Int32Array]"]=Ln["[object Map]"]=Ln["[object Number]"]=Ln["[object Object]"]=Ln["[object RegExp]"]=Ln["[object Set]"]=Ln["[object String]"]=Ln["[object Symbol]"]=Ln["[object Uint8Array]"]=Ln["[object Uint8ClampedArray]"]=Ln["[object Uint16Array]"]=Ln["[object Uint32Array]"]=true,
-Ln["[object Error]"]=Ln["[object Function]"]=Ln["[object WeakMap]"]=false;var Un={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Cn=parseFloat,Dn=parseInt,Mn=typeof global=="object"&&global&&global.Object===Object&&global,Tn=typeof self=="object"&&self&&self.Object===Object&&self,$n=Mn||Tn||Function("return this")(),Fn=typeof exports=="object"&&exports&&!exports.nodeType&&exports,Nn=Fn&&typeof module=="object"&&module&&!module.nodeType&&module,Pn=Nn&&Nn.exports===Fn,Zn=Pn&&Mn.process,qn=function(){
-try{var n=Nn&&Nn.f&&Nn.f("util").types;return n?n:Zn&&Zn.binding&&Zn.binding("util")}catch(n){}}(),Vn=qn&&qn.isArrayBuffer,Kn=qn&&qn.isDate,Gn=qn&&qn.isMap,Hn=qn&&qn.isRegExp,Jn=qn&&qn.isSet,Yn=qn&&qn.isTypedArray,Qn=b("length"),Xn=x({"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I",
-"\xcd":"I","\xce":"I","\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss","\u0100":"A","\u0102":"A","\u0104":"A","\u0101":"a","\u0103":"a","\u0105":"a","\u0106":"C",
-"\u0108":"C","\u010a":"C","\u010c":"C","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\u010e":"D","\u0110":"D","\u010f":"d","\u0111":"d","\u0112":"E","\u0114":"E","\u0116":"E","\u0118":"E","\u011a":"E","\u0113":"e","\u0115":"e","\u0117":"e","\u0119":"e","\u011b":"e","\u011c":"G","\u011e":"G","\u0120":"G","\u0122":"G","\u011d":"g","\u011f":"g","\u0121":"g","\u0123":"g","\u0124":"H","\u0126":"H","\u0125":"h","\u0127":"h","\u0128":"I","\u012a":"I","\u012c":"I","\u012e":"I","\u0130":"I","\u0129":"i",
-"\u012b":"i","\u012d":"i","\u012f":"i","\u0131":"i","\u0134":"J","\u0135":"j","\u0136":"K","\u0137":"k","\u0138":"k","\u0139":"L","\u013b":"L","\u013d":"L","\u013f":"L","\u0141":"L","\u013a":"l","\u013c":"l","\u013e":"l","\u0140":"l","\u0142":"l","\u0143":"N","\u0145":"N","\u0147":"N","\u014a":"N","\u0144":"n","\u0146":"n","\u0148":"n","\u014b":"n","\u014c":"O","\u014e":"O","\u0150":"O","\u014d":"o","\u014f":"o","\u0151":"o","\u0154":"R","\u0156":"R","\u0158":"R","\u0155":"r","\u0157":"r","\u0159":"r",
-"\u015a":"S","\u015c":"S","\u015e":"S","\u0160":"S","\u015b":"s","\u015d":"s","\u015f":"s","\u0161":"s","\u0162":"T","\u0164":"T","\u0166":"T","\u0163":"t","\u0165":"t","\u0167":"t","\u0168":"U","\u016a":"U","\u016c":"U","\u016e":"U","\u0170":"U","\u0172":"U","\u0169":"u","\u016b":"u","\u016d":"u","\u016f":"u","\u0171":"u","\u0173":"u","\u0174":"W","\u0175":"w","\u0176":"Y","\u0177":"y","\u0178":"Y","\u0179":"Z","\u017b":"Z","\u017d":"Z","\u017a":"z","\u017c":"z","\u017e":"z","\u0132":"IJ","\u0133":"ij",
-"\u0152":"Oe","\u0153":"oe","\u0149":"'n","\u017f":"s"}),nt=x({"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"}),tt=x({"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'"}),rt=function x(mn){function An(n){if(yu(n)&&!ff(n)&&!(n instanceof Un)){if(n instanceof On)return n;if(oi.call(n,"__wrapped__"))return Fe(n)}return new On(n)}function En(){}function On(n,t){this.__wrapped__=n,this.__actions__=[],this.__chain__=!!t,this.__index__=0,this.__values__=T}function Un(n){this.__wrapped__=n,
-this.__actions__=[],this.__dir__=1,this.__filtered__=false,this.__iteratees__=[],this.__takeCount__=4294967295,this.__views__=[]}function Mn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Tn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Fn(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Nn(n){var t=-1,r=null==n?0:n.length;for(this.__data__=new Fn;++t<r;)this.add(n[t]);
-}function Zn(n){this.size=(this.__data__=new Tn(n)).size}function qn(n,t){var r,e=ff(n),u=!e&&of(n),i=!e&&!u&&af(n),o=!e&&!u&&!i&&_f(n),u=(e=e||u||i||o)?A(n.length,ni):[],f=u.length;for(r in n)!t&&!oi.call(n,r)||e&&("length"==r||i&&("offset"==r||"parent"==r)||o&&("buffer"==r||"byteLength"==r||"byteOffset"==r)||Se(r,f))||u.push(r);return u}function Qn(n){var t=n.length;return t?n[ir(0,t-1)]:T}function et(n,t){return De(Ur(n),pt(t,0,n.length))}function ut(n){return De(Ur(n))}function it(n,t,r){(r===T||lu(n[t],r))&&(r!==T||t in n)||st(n,t,r);
-}function ot(n,t,r){var e=n[t];oi.call(n,t)&&lu(e,r)&&(r!==T||t in n)||st(n,t,r)}function ft(n,t){for(var r=n.length;r--;)if(lu(n[r][0],t))return r;return-1}function ct(n,t,r,e){return uo(n,function(n,u,i){t(e,n,r(n),i)}),e}function at(n,t){return n&&Cr(t,Wu(t),n)}function lt(n,t){return n&&Cr(t,Bu(t),n)}function st(n,t,r){"__proto__"==t&&Ai?Ai(n,t,{configurable:true,enumerable:true,value:r,writable:true}):n[t]=r}function ht(n,t){for(var r=-1,e=t.length,u=Ku(e),i=null==n;++r<e;)u[r]=i?T:Ru(n,t[r]);return u;
-}function pt(n,t,r){return n===n&&(r!==T&&(n=n<=r?n:r),t!==T&&(n=n>=t?n:t)),n}function _t(n,t,e,u,i,o){var f,c=1&t,a=2&t,l=4&t;if(e&&(f=i?e(n,u,i,o):e(n)),f!==T)return f;if(!du(n))return n;if(u=ff(n)){if(f=me(n),!c)return Ur(n,f)}else{var s=vo(n),h="[object Function]"==s||"[object GeneratorFunction]"==s;if(af(n))return Ir(n,c);if("[object Object]"==s||"[object Arguments]"==s||h&&!i){if(f=a||h?{}:Ae(n),!c)return a?Mr(n,lt(f,n)):Dr(n,at(f,n))}else{if(!Ln[s])return i?n:{};f=Ee(n,s,c)}}if(o||(o=new Zn),
-i=o.get(n))return i;o.set(n,f),pf(n)?n.forEach(function(r){f.add(_t(r,t,e,r,n,o))}):sf(n)&&n.forEach(function(r,u){f.set(u,_t(r,t,e,u,n,o))});var a=l?a?ve:_e:a?Bu:Wu,p=u?T:a(n);return r(p||n,function(r,u){p&&(u=r,r=n[u]),ot(f,u,_t(r,t,e,u,n,o))}),f}function vt(n){var t=Wu(n);return function(r){return gt(r,n,t)}}function gt(n,t,r){var e=r.length;if(null==n)return!e;for(n=Qu(n);e--;){var u=r[e],i=t[u],o=n[u];if(o===T&&!(u in n)||!i(o))return false}return true}function dt(n,t,r){if(typeof n!="function")throw new ti("Expected a function");
-return bo(function(){n.apply(T,r)},t)}function yt(n,t,r,e){var u=-1,i=o,a=true,l=n.length,s=[],h=t.length;if(!l)return s;r&&(t=c(t,k(r))),e?(i=f,a=false):200<=t.length&&(i=O,a=false,t=new Nn(t));n:for(;++u<l;){var p=n[u],_=null==r?p:r(p),p=e||0!==p?p:0;if(a&&_===_){for(var v=h;v--;)if(t[v]===_)continue n;s.push(p)}else i(t,_,e)||s.push(p)}return s}function bt(n,t){var r=true;return uo(n,function(n,e,u){return r=!!t(n,e,u)}),r}function xt(n,t,r){for(var e=-1,u=n.length;++e<u;){var i=n[e],o=t(i);if(null!=o&&(f===T?o===o&&!wu(o):r(o,f)))var f=o,c=i;
-}return c}function jt(n,t){var r=[];return uo(n,function(n,e,u){t(n,e,u)&&r.push(n)}),r}function wt(n,t,r,e,u){var i=-1,o=n.length;for(r||(r=ke),u||(u=[]);++i<o;){var f=n[i];0<t&&r(f)?1<t?wt(f,t-1,r,e,u):a(u,f):e||(u[u.length]=f)}return u}function mt(n,t){return n&&oo(n,t,Wu)}function At(n,t){return n&&fo(n,t,Wu)}function Et(n,t){return i(t,function(t){return _u(n[t])})}function kt(n,t){t=Sr(t,n);for(var r=0,e=t.length;null!=n&&r<e;)n=n[Me(t[r++])];return r&&r==e?n:T}function St(n,t,r){return t=t(n),
-ff(n)?t:a(t,r(n))}function Ot(n){if(null==n)n=n===T?"[object Undefined]":"[object Null]";else if(mi&&mi in Qu(n)){var t=oi.call(n,mi),r=n[mi];try{n[mi]=T;var e=true}catch(n){}var u=ai.call(n);e&&(t?n[mi]=r:delete n[mi]),n=u}else n=ai.call(n);return n}function It(n,t){return n>t}function Rt(n,t){return null!=n&&oi.call(n,t)}function zt(n,t){return null!=n&&t in Qu(n)}function Wt(n,t,r){for(var e=r?f:o,u=n[0].length,i=n.length,a=i,l=Ku(i),s=1/0,h=[];a--;){var p=n[a];a&&t&&(p=c(p,k(t))),s=Ci(p.length,s),
-l[a]=!r&&(t||120<=u&&120<=p.length)?new Nn(a&&p):T}var p=n[0],_=-1,v=l[0];n:for(;++_<u&&h.length<s;){var g=p[_],d=t?t(g):g,g=r||0!==g?g:0;if(v?!O(v,d):!e(h,d,r)){for(a=i;--a;){var y=l[a];if(y?!O(y,d):!e(n[a],d,r))continue n}v&&v.push(d),h.push(g)}}return h}function Bt(n,t,r){var e={};return mt(n,function(n,u,i){t(e,r(n),u,i)}),e}function Lt(t,r,e){return r=Sr(r,t),t=2>r.length?t:kt(t,hr(r,0,-1)),r=null==t?t:t[Me(Ve(r))],null==r?T:n(r,t,e)}function Ut(n){return yu(n)&&"[object Arguments]"==Ot(n)}function Ct(n){
-return yu(n)&&"[object ArrayBuffer]"==Ot(n)}function Dt(n){return yu(n)&&"[object Date]"==Ot(n)}function Mt(n,t,r,e,u){if(n===t)t=true;else if(null==n||null==t||!yu(n)&&!yu(t))t=n!==n&&t!==t;else n:{var i=ff(n),o=ff(t),f=i?"[object Array]":vo(n),c=o?"[object Array]":vo(t),f="[object Arguments]"==f?"[object Object]":f,c="[object Arguments]"==c?"[object Object]":c,a="[object Object]"==f,o="[object Object]"==c;if((c=f==c)&&af(n)){if(!af(t)){t=false;break n}i=true,a=false}if(c&&!a)u||(u=new Zn),t=i||_f(n)?se(n,t,r,e,Mt,u):he(n,t,f,r,e,Mt,u);else{
-if(!(1&r)&&(i=a&&oi.call(n,"__wrapped__"),f=o&&oi.call(t,"__wrapped__"),i||f)){n=i?n.value():n,t=f?t.value():t,u||(u=new Zn),t=Mt(n,t,r,e,u);break n}if(c)t:if(u||(u=new Zn),i=1&r,f=_e(n),o=f.length,c=_e(t).length,o==c||i){for(a=o;a--;){var l=f[a];if(!(i?l in t:oi.call(t,l))){t=false;break t}}if((c=u.get(n))&&u.get(t))t=c==t;else{c=true,u.set(n,t),u.set(t,n);for(var s=i;++a<o;){var l=f[a],h=n[l],p=t[l];if(e)var _=i?e(p,h,l,t,n,u):e(h,p,l,n,t,u);if(_===T?h!==p&&!Mt(h,p,r,e,u):!_){c=false;break}s||(s="constructor"==l);
-}c&&!s&&(r=n.constructor,e=t.constructor,r!=e&&"constructor"in n&&"constructor"in t&&!(typeof r=="function"&&r instanceof r&&typeof e=="function"&&e instanceof e)&&(c=false)),u.delete(n),u.delete(t),t=c}}else t=false;else t=false}}return t}function Tt(n){return yu(n)&&"[object Map]"==vo(n)}function $t(n,t,r,e){var u=r.length,i=u,o=!e;if(null==n)return!i;for(n=Qu(n);u--;){var f=r[u];if(o&&f[2]?f[1]!==n[f[0]]:!(f[0]in n))return false}for(;++u<i;){var f=r[u],c=f[0],a=n[c],l=f[1];if(o&&f[2]){if(a===T&&!(c in n))return false;
-}else{if(f=new Zn,e)var s=e(a,l,c,n,t,f);if(s===T?!Mt(l,a,3,e,f):!s)return false}}return true}function Ft(n){return!(!du(n)||ci&&ci in n)&&(_u(n)?hi:dn).test(Te(n))}function Nt(n){return yu(n)&&"[object RegExp]"==Ot(n)}function Pt(n){return yu(n)&&"[object Set]"==vo(n)}function Zt(n){return yu(n)&&gu(n.length)&&!!Bn[Ot(n)]}function qt(n){return typeof n=="function"?n:null==n?$u:typeof n=="object"?ff(n)?Jt(n[0],n[1]):Ht(n):Zu(n)}function Vt(n){if(!ze(n))return Li(n);var t,r=[];for(t in Qu(n))oi.call(n,t)&&"constructor"!=t&&r.push(t);
-return r}function Kt(n,t){return n<t}function Gt(n,t){var r=-1,e=su(n)?Ku(n.length):[];return uo(n,function(n,u,i){e[++r]=t(n,u,i)}),e}function Ht(n){var t=xe(n);return 1==t.length&&t[0][2]?We(t[0][0],t[0][1]):function(r){return r===n||$t(r,n,t)}}function Jt(n,t){return Ie(n)&&t===t&&!du(t)?We(Me(n),t):function(r){var e=Ru(r,n);return e===T&&e===t?zu(r,n):Mt(t,e,3)}}function Yt(n,t,r,e,u){n!==t&&oo(t,function(i,o){if(u||(u=new Zn),du(i)){var f=u,c=Le(n,o),a=Le(t,o),l=f.get(a);if(l)it(n,o,l);else{
-var l=e?e(c,a,o+"",n,t,f):T,s=l===T;if(s){var h=ff(a),p=!h&&af(a),_=!h&&!p&&_f(a),l=a;h||p||_?ff(c)?l=c:hu(c)?l=Ur(c):p?(s=false,l=Ir(a,true)):_?(s=false,l=zr(a,true)):l=[]:xu(a)||of(a)?(l=c,of(c)?l=Ou(c):du(c)&&!_u(c)||(l=Ae(a))):s=false}s&&(f.set(a,l),Yt(l,a,r,e,f),f.delete(a)),it(n,o,l)}}else f=e?e(Le(n,o),i,o+"",n,t,u):T,f===T&&(f=i),it(n,o,f)},Bu)}function Qt(n,t){var r=n.length;if(r)return t+=0>t?r:0,Se(t,r)?n[t]:T}function Xt(n,t,r){var e=-1;return t=c(t.length?t:[$u],k(ye())),n=Gt(n,function(n){return{
-a:c(t,function(t){return t(n)}),b:++e,c:n}}),w(n,function(n,t){var e;n:{e=-1;for(var u=n.a,i=t.a,o=u.length,f=r.length;++e<o;){var c=Wr(u[e],i[e]);if(c){e=e>=f?c:c*("desc"==r[e]?-1:1);break n}}e=n.b-t.b}return e})}function nr(n,t){return tr(n,t,function(t,r){return zu(n,r)})}function tr(n,t,r){for(var e=-1,u=t.length,i={};++e<u;){var o=t[e],f=kt(n,o);r(f,o)&&lr(i,Sr(o,n),f)}return i}function rr(n){return function(t){return kt(t,n)}}function er(n,t,r,e){var u=e?g:v,i=-1,o=t.length,f=n;for(n===t&&(t=Ur(t)),
-r&&(f=c(n,k(r)));++i<o;)for(var a=0,l=t[i],l=r?r(l):l;-1<(a=u(f,l,a,e));)f!==n&&xi.call(f,a,1),xi.call(n,a,1);return n}function ur(n,t){for(var r=n?t.length:0,e=r-1;r--;){var u=t[r];if(r==e||u!==i){var i=u;Se(u)?xi.call(n,u,1):xr(n,u)}}}function ir(n,t){return n+Ii(Ti()*(t-n+1))}function or(n,t){var r="";if(!n||1>t||9007199254740991<t)return r;do t%2&&(r+=n),(t=Ii(t/2))&&(n+=n);while(t);return r}function fr(n,t){return xo(Be(n,t,$u),n+"")}function cr(n){return Qn(Uu(n))}function ar(n,t){var r=Uu(n);
-return De(r,pt(t,0,r.length))}function lr(n,t,r,e){if(!du(n))return n;t=Sr(t,n);for(var u=-1,i=t.length,o=i-1,f=n;null!=f&&++u<i;){var c=Me(t[u]),a=r;if(u!=o){var l=f[c],a=e?e(l,c,f):T;a===T&&(a=du(l)?l:Se(t[u+1])?[]:{})}ot(f,c,a),f=f[c]}return n}function sr(n){return De(Uu(n))}function hr(n,t,r){var e=-1,u=n.length;for(0>t&&(t=-t>u?0:u+t),r=r>u?u:r,0>r&&(r+=u),u=t>r?0:r-t>>>0,t>>>=0,r=Ku(u);++e<u;)r[e]=n[e+t];return r}function pr(n,t){var r;return uo(n,function(n,e,u){return r=t(n,e,u),!r}),!!r}
-function _r(n,t,r){var e=0,u=null==n?e:n.length;if(typeof t=="number"&&t===t&&2147483647>=u){for(;e<u;){var i=e+u>>>1,o=n[i];null!==o&&!wu(o)&&(r?o<=t:o<t)?e=i+1:u=i}return u}return vr(n,t,$u,r)}function vr(n,t,r,e){t=r(t);for(var u=0,i=null==n?0:n.length,o=t!==t,f=null===t,c=wu(t),a=t===T;u<i;){var l=Ii((u+i)/2),s=r(n[l]),h=s!==T,p=null===s,_=s===s,v=wu(s);(o?e||_:a?_&&(e||h):f?_&&h&&(e||!p):c?_&&h&&!p&&(e||!v):p||v?0:e?s<=t:s<t)?u=l+1:i=l}return Ci(i,4294967294)}function gr(n,t){for(var r=-1,e=n.length,u=0,i=[];++r<e;){
-var o=n[r],f=t?t(o):o;if(!r||!lu(f,c)){var c=f;i[u++]=0===o?0:o}}return i}function dr(n){return typeof n=="number"?n:wu(n)?F:+n}function yr(n){if(typeof n=="string")return n;if(ff(n))return c(n,yr)+"";if(wu(n))return ro?ro.call(n):"";var t=n+"";return"0"==t&&1/n==-$?"-0":t}function br(n,t,r){var e=-1,u=o,i=n.length,c=true,a=[],l=a;if(r)c=false,u=f;else if(200<=i){if(u=t?null:so(n))return U(u);c=false,u=O,l=new Nn}else l=t?[]:a;n:for(;++e<i;){var s=n[e],h=t?t(s):s,s=r||0!==s?s:0;if(c&&h===h){for(var p=l.length;p--;)if(l[p]===h)continue n;
-t&&l.push(h),a.push(s)}else u(l,h,r)||(l!==a&&l.push(h),a.push(s))}return a}function xr(n,t){return t=Sr(t,n),n=2>t.length?n:kt(n,hr(t,0,-1)),null==n||delete n[Me(Ve(t))]}function jr(n,t,r,e){for(var u=n.length,i=e?u:-1;(e?i--:++i<u)&&t(n[i],i,n););return r?hr(n,e?0:i,e?i+1:u):hr(n,e?i+1:0,e?u:i)}function wr(n,t){var r=n;return r instanceof Un&&(r=r.value()),l(t,function(n,t){return t.func.apply(t.thisArg,a([n],t.args))},r)}function mr(n,t,r){var e=n.length;if(2>e)return e?br(n[0]):[];for(var u=-1,i=Ku(e);++u<e;)for(var o=n[u],f=-1;++f<e;)f!=u&&(i[u]=yt(i[u]||o,n[f],t,r));
-return br(wt(i,1),t,r)}function Ar(n,t,r){for(var e=-1,u=n.length,i=t.length,o={};++e<u;)r(o,n[e],e<i?t[e]:T);return o}function Er(n){return hu(n)?n:[]}function kr(n){return typeof n=="function"?n:$u}function Sr(n,t){return ff(n)?n:Ie(n,t)?[n]:jo(Iu(n))}function Or(n,t,r){var e=n.length;return r=r===T?e:r,!t&&r>=e?n:hr(n,t,r)}function Ir(n,t){if(t)return n.slice();var r=n.length,r=gi?gi(r):new n.constructor(r);return n.copy(r),r}function Rr(n){var t=new n.constructor(n.byteLength);return new vi(t).set(new vi(n)),
-t}function zr(n,t){return new n.constructor(t?Rr(n.buffer):n.buffer,n.byteOffset,n.length)}function Wr(n,t){if(n!==t){var r=n!==T,e=null===n,u=n===n,i=wu(n),o=t!==T,f=null===t,c=t===t,a=wu(t);if(!f&&!a&&!i&&n>t||i&&o&&c&&!f&&!a||e&&o&&c||!r&&c||!u)return 1;if(!e&&!i&&!a&&n<t||a&&r&&u&&!e&&!i||f&&r&&u||!o&&u||!c)return-1}return 0}function Br(n,t,r,e){var u=-1,i=n.length,o=r.length,f=-1,c=t.length,a=Ui(i-o,0),l=Ku(c+a);for(e=!e;++f<c;)l[f]=t[f];for(;++u<o;)(e||u<i)&&(l[r[u]]=n[u]);for(;a--;)l[f++]=n[u++];
-return l}function Lr(n,t,r,e){var u=-1,i=n.length,o=-1,f=r.length,c=-1,a=t.length,l=Ui(i-f,0),s=Ku(l+a);for(e=!e;++u<l;)s[u]=n[u];for(l=u;++c<a;)s[l+c]=t[c];for(;++o<f;)(e||u<i)&&(s[l+r[o]]=n[u++]);return s}function Ur(n,t){var r=-1,e=n.length;for(t||(t=Ku(e));++r<e;)t[r]=n[r];return t}function Cr(n,t,r,e){var u=!r;r||(r={});for(var i=-1,o=t.length;++i<o;){var f=t[i],c=e?e(r[f],n[f],f,r,n):T;c===T&&(c=n[f]),u?st(r,f,c):ot(r,f,c)}return r}function Dr(n,t){return Cr(n,po(n),t)}function Mr(n,t){return Cr(n,_o(n),t);
-}function Tr(n,r){return function(e,u){var i=ff(e)?t:ct,o=r?r():{};return i(e,n,ye(u,2),o)}}function $r(n){return fr(function(t,r){var e=-1,u=r.length,i=1<u?r[u-1]:T,o=2<u?r[2]:T,i=3<n.length&&typeof i=="function"?(u--,i):T;for(o&&Oe(r[0],r[1],o)&&(i=3>u?T:i,u=1),t=Qu(t);++e<u;)(o=r[e])&&n(t,o,e,i);return t})}function Fr(n,t){return function(r,e){if(null==r)return r;if(!su(r))return n(r,e);for(var u=r.length,i=t?u:-1,o=Qu(r);(t?i--:++i<u)&&false!==e(o[i],i,o););return r}}function Nr(n){return function(t,r,e){
-var u=-1,i=Qu(t);e=e(t);for(var o=e.length;o--;){var f=e[n?o:++u];if(false===r(i[f],f,i))break}return t}}function Pr(n,t,r){function e(){return(this&&this!==$n&&this instanceof e?i:n).apply(u?r:this,arguments)}var u=1&t,i=Vr(n);return e}function Zr(n){return function(t){t=Iu(t);var r=Rn.test(t)?M(t):T,e=r?r[0]:t.charAt(0);return t=r?Or(r,1).join(""):t.slice(1),e[n]()+t}}function qr(n){return function(t){return l(Mu(Du(t).replace(kn,"")),n,"")}}function Vr(n){return function(){var t=arguments;switch(t.length){
-case 0:return new n;case 1:return new n(t[0]);case 2:return new n(t[0],t[1]);case 3:return new n(t[0],t[1],t[2]);case 4:return new n(t[0],t[1],t[2],t[3]);case 5:return new n(t[0],t[1],t[2],t[3],t[4]);case 6:return new n(t[0],t[1],t[2],t[3],t[4],t[5]);case 7:return new n(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}var r=eo(n.prototype),t=n.apply(r,t);return du(t)?t:r}}function Kr(t,r,e){function u(){for(var o=arguments.length,f=Ku(o),c=o,a=de(u);c--;)f[c]=arguments[c];return c=3>o&&f[0]!==a&&f[o-1]!==a?[]:L(f,a),
-o-=c.length,o<e?ue(t,r,Jr,u.placeholder,T,f,c,T,T,e-o):n(this&&this!==$n&&this instanceof u?i:t,this,f)}var i=Vr(t);return u}function Gr(n){return function(t,r,e){var u=Qu(t);if(!su(t)){var i=ye(r,3);t=Wu(t),r=function(n){return i(u[n],n,u)}}return r=n(t,r,e),-1<r?u[i?t[r]:r]:T}}function Hr(n){return pe(function(t){var r=t.length,e=r,u=On.prototype.thru;for(n&&t.reverse();e--;){var i=t[e];if(typeof i!="function")throw new ti("Expected a function");if(u&&!o&&"wrapper"==ge(i))var o=new On([],true)}for(e=o?e:r;++e<r;)var i=t[e],u=ge(i),f="wrapper"==u?ho(i):T,o=f&&Re(f[0])&&424==f[1]&&!f[4].length&&1==f[9]?o[ge(f[0])].apply(o,f[3]):1==i.length&&Re(i)?o[u]():o.thru(i);
-return function(){var n=arguments,e=n[0];if(o&&1==n.length&&ff(e))return o.plant(e).value();for(var u=0,n=r?t[u].apply(this,n):e;++u<r;)n=t[u].call(this,n);return n}})}function Jr(n,t,r,e,u,i,o,f,c,a){function l(){for(var d=arguments.length,y=Ku(d),b=d;b--;)y[b]=arguments[b];if(_){var x,j=de(l),b=y.length;for(x=0;b--;)y[b]===j&&++x}if(e&&(y=Br(y,e,u,_)),i&&(y=Lr(y,i,o,_)),d-=x,_&&d<a)return j=L(y,j),ue(n,t,Jr,l.placeholder,r,y,j,f,c,a-d);if(j=h?r:this,b=p?j[n]:n,d=y.length,f){x=y.length;for(var w=Ci(f.length,x),m=Ur(y);w--;){
-var A=f[w];y[w]=Se(A,x)?m[A]:T}}else v&&1<d&&y.reverse();return s&&c<d&&(y.length=c),this&&this!==$n&&this instanceof l&&(b=g||Vr(b)),b.apply(j,y)}var s=128&t,h=1&t,p=2&t,_=24&t,v=512&t,g=p?T:Vr(n);return l}function Yr(n,t){return function(r,e){return Bt(r,n,t(e))}}function Qr(n,t){return function(r,e){var u;if(r===T&&e===T)return t;if(r!==T&&(u=r),e!==T){if(u===T)return e;typeof r=="string"||typeof e=="string"?(r=yr(r),e=yr(e)):(r=dr(r),e=dr(e)),u=n(r,e)}return u}}function Xr(t){return pe(function(r){
-return r=c(r,k(ye())),fr(function(e){var u=this;return t(r,function(t){return n(t,u,e)})})})}function ne(n,t){t=t===T?" ":yr(t);var r=t.length;return 2>r?r?or(t,n):t:(r=or(t,Oi(n/D(t))),Rn.test(t)?Or(M(r),0,n).join(""):r.slice(0,n))}function te(t,r,e,u){function i(){for(var r=-1,c=arguments.length,a=-1,l=u.length,s=Ku(l+c),h=this&&this!==$n&&this instanceof i?f:t;++a<l;)s[a]=u[a];for(;c--;)s[a++]=arguments[++r];return n(h,o?e:this,s)}var o=1&r,f=Vr(t);return i}function re(n){return function(t,r,e){
-e&&typeof e!="number"&&Oe(t,r,e)&&(r=e=T),t=Au(t),r===T?(r=t,t=0):r=Au(r),e=e===T?t<r?1:-1:Au(e);var u=-1;r=Ui(Oi((r-t)/(e||1)),0);for(var i=Ku(r);r--;)i[n?r:++u]=t,t+=e;return i}}function ee(n){return function(t,r){return typeof t=="string"&&typeof r=="string"||(t=Su(t),r=Su(r)),n(t,r)}}function ue(n,t,r,e,u,i,o,f,c,a){var l=8&t,s=l?o:T;o=l?T:o;var h=l?i:T;return i=l?T:i,t=(t|(l?32:64))&~(l?64:32),4&t||(t&=-4),u=[n,t,u,h,s,i,o,f,c,a],r=r.apply(T,u),Re(n)&&yo(r,u),r.placeholder=e,Ue(r,n,t)}function ie(n){
-var t=Yu[n];return function(n,r){if(n=Su(n),(r=null==r?0:Ci(Eu(r),292))&&Wi(n)){var e=(Iu(n)+"e").split("e"),e=t(e[0]+"e"+(+e[1]+r)),e=(Iu(e)+"e").split("e");return+(e[0]+"e"+(+e[1]-r))}return t(n)}}function oe(n){return function(t){var r=vo(t);return"[object Map]"==r?W(t):"[object Set]"==r?C(t):E(t,n(t))}}function fe(n,t,r,e,u,i,o,f){var c=2&t;if(!c&&typeof n!="function")throw new ti("Expected a function");var a=e?e.length:0;if(a||(t&=-97,e=u=T),o=o===T?o:Ui(Eu(o),0),f=f===T?f:Eu(f),a-=u?u.length:0,
-64&t){var l=e,s=u;e=u=T}var h=c?T:ho(n);return i=[n,t,r,e,u,l,s,i,o,f],h&&(r=i[1],n=h[1],t=r|n,e=128==n&&8==r||128==n&&256==r&&i[7].length<=h[8]||384==n&&h[7].length<=h[8]&&8==r,131>t||e)&&(1&n&&(i[2]=h[2],t|=1&r?0:4),(r=h[3])&&(e=i[3],i[3]=e?Br(e,r,h[4]):r,i[4]=e?L(i[3],"__lodash_placeholder__"):h[4]),(r=h[5])&&(e=i[5],i[5]=e?Lr(e,r,h[6]):r,i[6]=e?L(i[5],"__lodash_placeholder__"):h[6]),(r=h[7])&&(i[7]=r),128&n&&(i[8]=null==i[8]?h[8]:Ci(i[8],h[8])),null==i[9]&&(i[9]=h[9]),i[0]=h[0],i[1]=t),n=i[0],
-t=i[1],r=i[2],e=i[3],u=i[4],f=i[9]=i[9]===T?c?0:n.length:Ui(i[9]-a,0),!f&&24&t&&(t&=-25),Ue((h?co:yo)(t&&1!=t?8==t||16==t?Kr(n,t,f):32!=t&&33!=t||u.length?Jr.apply(T,i):te(n,t,r,e):Pr(n,t,r),i),n,t)}function ce(n,t,r,e){return n===T||lu(n,ei[r])&&!oi.call(e,r)?t:n}function ae(n,t,r,e,u,i){return du(n)&&du(t)&&(i.set(t,n),Yt(n,t,T,ae,i),i.delete(t)),n}function le(n){return xu(n)?T:n}function se(n,t,r,e,u,i){var o=1&r,f=n.length,c=t.length;if(f!=c&&!(o&&c>f))return false;if((c=i.get(n))&&i.get(t))return c==t;
-var c=-1,a=true,l=2&r?new Nn:T;for(i.set(n,t),i.set(t,n);++c<f;){var s=n[c],p=t[c];if(e)var _=o?e(p,s,c,t,n,i):e(s,p,c,n,t,i);if(_!==T){if(_)continue;a=false;break}if(l){if(!h(t,function(n,t){if(!O(l,t)&&(s===n||u(s,n,r,e,i)))return l.push(t)})){a=false;break}}else if(s!==p&&!u(s,p,r,e,i)){a=false;break}}return i.delete(n),i.delete(t),a}function he(n,t,r,e,u,i,o){switch(r){case"[object DataView]":if(n.byteLength!=t.byteLength||n.byteOffset!=t.byteOffset)break;n=n.buffer,t=t.buffer;case"[object ArrayBuffer]":
-if(n.byteLength!=t.byteLength||!i(new vi(n),new vi(t)))break;return true;case"[object Boolean]":case"[object Date]":case"[object Number]":return lu(+n,+t);case"[object Error]":return n.name==t.name&&n.message==t.message;case"[object RegExp]":case"[object String]":return n==t+"";case"[object Map]":var f=W;case"[object Set]":if(f||(f=U),n.size!=t.size&&!(1&e))break;return(r=o.get(n))?r==t:(e|=2,o.set(n,t),t=se(f(n),f(t),e,u,i,o),o.delete(n),t);case"[object Symbol]":if(to)return to.call(n)==to.call(t)}
-return false}function pe(n){return xo(Be(n,T,Ze),n+"")}function _e(n){return St(n,Wu,po)}function ve(n){return St(n,Bu,_o)}function ge(n){for(var t=n.name+"",r=Gi[t],e=oi.call(Gi,t)?r.length:0;e--;){var u=r[e],i=u.func;if(null==i||i==n)return u.name}return t}function de(n){return(oi.call(An,"placeholder")?An:n).placeholder}function ye(){var n=An.iteratee||Fu,n=n===Fu?qt:n;return arguments.length?n(arguments[0],arguments[1]):n}function be(n,t){var r=n.__data__,e=typeof t;return("string"==e||"number"==e||"symbol"==e||"boolean"==e?"__proto__"!==t:null===t)?r[typeof t=="string"?"string":"hash"]:r.map;
-}function xe(n){for(var t=Wu(n),r=t.length;r--;){var e=t[r],u=n[e];t[r]=[e,u,u===u&&!du(u)]}return t}function je(n,t){var r=null==n?T:n[t];return Ft(r)?r:T}function we(n,t,r){t=Sr(t,n);for(var e=-1,u=t.length,i=false;++e<u;){var o=Me(t[e]);if(!(i=null!=n&&r(n,o)))break;n=n[o]}return i||++e!=u?i:(u=null==n?0:n.length,!!u&&gu(u)&&Se(o,u)&&(ff(n)||of(n)))}function me(n){var t=n.length,r=new n.constructor(t);return t&&"string"==typeof n[0]&&oi.call(n,"index")&&(r.index=n.index,r.input=n.input),r}function Ae(n){
-return typeof n.constructor!="function"||ze(n)?{}:eo(di(n))}function Ee(n,t,r){var e=n.constructor;switch(t){case"[object ArrayBuffer]":return Rr(n);case"[object Boolean]":case"[object Date]":return new e(+n);case"[object DataView]":return t=r?Rr(n.buffer):n.buffer,new n.constructor(t,n.byteOffset,n.byteLength);case"[object Float32Array]":case"[object Float64Array]":case"[object Int8Array]":case"[object Int16Array]":case"[object Int32Array]":case"[object Uint8Array]":case"[object Uint8ClampedArray]":
-case"[object Uint16Array]":case"[object Uint32Array]":return zr(n,r);case"[object Map]":return new e;case"[object Number]":case"[object String]":return new e(n);case"[object RegExp]":return t=new n.constructor(n.source,_n.exec(n)),t.lastIndex=n.lastIndex,t;case"[object Set]":return new e;case"[object Symbol]":return to?Qu(to.call(n)):{}}}function ke(n){return ff(n)||of(n)||!!(ji&&n&&n[ji])}function Se(n,t){var r=typeof n;return t=null==t?9007199254740991:t,!!t&&("number"==r||"symbol"!=r&&bn.test(n))&&-1<n&&0==n%1&&n<t;
-}function Oe(n,t,r){if(!du(r))return false;var e=typeof t;return!!("number"==e?su(r)&&Se(t,r.length):"string"==e&&t in r)&&lu(r[t],n)}function Ie(n,t){if(ff(n))return false;var r=typeof n;return!("number"!=r&&"symbol"!=r&&"boolean"!=r&&null!=n&&!wu(n))||(nn.test(n)||!X.test(n)||null!=t&&n in Qu(t))}function Re(n){var t=ge(n),r=An[t];return typeof r=="function"&&t in Un.prototype&&(n===r||(t=ho(r),!!t&&n===t[0]))}function ze(n){var t=n&&n.constructor;return n===(typeof t=="function"&&t.prototype||ei)}function We(n,t){
-return function(r){return null!=r&&(r[n]===t&&(t!==T||n in Qu(r)))}}function Be(t,r,e){return r=Ui(r===T?t.length-1:r,0),function(){for(var u=arguments,i=-1,o=Ui(u.length-r,0),f=Ku(o);++i<o;)f[i]=u[r+i];for(i=-1,o=Ku(r+1);++i<r;)o[i]=u[i];return o[r]=e(f),n(t,this,o)}}function Le(n,t){if(("constructor"!==t||"function"!=typeof n[t])&&"__proto__"!=t)return n[t]}function Ue(n,t,r){var e=t+"";t=xo;var u,i=$e;return u=(u=e.match(an))?u[1].split(ln):[],r=i(u,r),(i=r.length)&&(u=i-1,r[u]=(1<i?"& ":"")+r[u],
-r=r.join(2<i?", ":" "),e=e.replace(cn,"{\n/* [wrapped with "+r+"] */\n")),t(n,e)}function Ce(n){var t=0,r=0;return function(){var e=Di(),u=16-(e-r);if(r=e,0<u){if(800<=++t)return arguments[0]}else t=0;return n.apply(T,arguments)}}function De(n,t){var r=-1,e=n.length,u=e-1;for(t=t===T?e:t;++r<t;){var e=ir(r,u),i=n[e];n[e]=n[r],n[r]=i}return n.length=t,n}function Me(n){if(typeof n=="string"||wu(n))return n;var t=n+"";return"0"==t&&1/n==-$?"-0":t}function Te(n){if(null!=n){try{return ii.call(n)}catch(n){}
-return n+""}return""}function $e(n,t){return r(N,function(r){var e="_."+r[0];t&r[1]&&!o(n,e)&&n.push(e)}),n.sort()}function Fe(n){if(n instanceof Un)return n.clone();var t=new On(n.__wrapped__,n.__chain__);return t.__actions__=Ur(n.__actions__),t.__index__=n.__index__,t.__values__=n.__values__,t}function Ne(n,t,r){var e=null==n?0:n.length;return e?(r=null==r?0:Eu(r),0>r&&(r=Ui(e+r,0)),_(n,ye(t,3),r)):-1}function Pe(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=e-1;return r!==T&&(u=Eu(r),u=0>r?Ui(e+u,0):Ci(u,e-1)),
-_(n,ye(t,3),u,true)}function Ze(n){return(null==n?0:n.length)?wt(n,1):[]}function qe(n){return n&&n.length?n[0]:T}function Ve(n){var t=null==n?0:n.length;return t?n[t-1]:T}function Ke(n,t){return n&&n.length&&t&&t.length?er(n,t):n}function Ge(n){return null==n?n:$i.call(n)}function He(n){if(!n||!n.length)return[];var t=0;return n=i(n,function(n){if(hu(n))return t=Ui(n.length,t),true}),A(t,function(t){return c(n,b(t))})}function Je(t,r){if(!t||!t.length)return[];var e=He(t);return null==r?e:c(e,function(t){
-return n(r,T,t)})}function Ye(n){return n=An(n),n.__chain__=true,n}function Qe(n,t){return t(n)}function Xe(){return this}function nu(n,t){return(ff(n)?r:uo)(n,ye(t,3))}function tu(n,t){return(ff(n)?e:io)(n,ye(t,3))}function ru(n,t){return(ff(n)?c:Gt)(n,ye(t,3))}function eu(n,t,r){return t=r?T:t,t=n&&null==t?n.length:t,fe(n,128,T,T,T,T,t)}function uu(n,t){var r;if(typeof t!="function")throw new ti("Expected a function");return n=Eu(n),function(){return 0<--n&&(r=t.apply(this,arguments)),1>=n&&(t=T),
-r}}function iu(n,t,r){return t=r?T:t,n=fe(n,8,T,T,T,T,T,t),n.placeholder=iu.placeholder,n}function ou(n,t,r){return t=r?T:t,n=fe(n,16,T,T,T,T,T,t),n.placeholder=ou.placeholder,n}function fu(n,t,r){function e(t){var r=c,e=a;return c=a=T,_=t,s=n.apply(e,r)}function u(n){var r=n-p;return n-=_,p===T||r>=t||0>r||g&&n>=l}function i(){var n=Go();if(u(n))return o(n);var r,e=bo;r=n-_,n=t-(n-p),r=g?Ci(n,l-r):n,h=e(i,r)}function o(n){return h=T,d&&c?e(n):(c=a=T,s)}function f(){var n=Go(),r=u(n);if(c=arguments,
-a=this,p=n,r){if(h===T)return _=n=p,h=bo(i,t),v?e(n):s;if(g)return lo(h),h=bo(i,t),e(p)}return h===T&&(h=bo(i,t)),s}var c,a,l,s,h,p,_=0,v=false,g=false,d=true;if(typeof n!="function")throw new ti("Expected a function");return t=Su(t)||0,du(r)&&(v=!!r.leading,l=(g="maxWait"in r)?Ui(Su(r.maxWait)||0,t):l,d="trailing"in r?!!r.trailing:d),f.cancel=function(){h!==T&&lo(h),_=0,c=p=a=h=T},f.flush=function(){return h===T?s:o(Go())},f}function cu(n,t){function r(){var e=arguments,u=t?t.apply(this,e):e[0],i=r.cache;
-return i.has(u)?i.get(u):(e=n.apply(this,e),r.cache=i.set(u,e)||i,e)}if(typeof n!="function"||null!=t&&typeof t!="function")throw new ti("Expected a function");return r.cache=new(cu.Cache||Fn),r}function au(n){if(typeof n!="function")throw new ti("Expected a function");return function(){var t=arguments;switch(t.length){case 0:return!n.call(this);case 1:return!n.call(this,t[0]);case 2:return!n.call(this,t[0],t[1]);case 3:return!n.call(this,t[0],t[1],t[2])}return!n.apply(this,t)}}function lu(n,t){return n===t||n!==n&&t!==t;
-}function su(n){return null!=n&&gu(n.length)&&!_u(n)}function hu(n){return yu(n)&&su(n)}function pu(n){if(!yu(n))return false;var t=Ot(n);return"[object Error]"==t||"[object DOMException]"==t||typeof n.message=="string"&&typeof n.name=="string"&&!xu(n)}function _u(n){return!!du(n)&&(n=Ot(n),"[object Function]"==n||"[object GeneratorFunction]"==n||"[object AsyncFunction]"==n||"[object Proxy]"==n)}function vu(n){return typeof n=="number"&&n==Eu(n)}function gu(n){return typeof n=="number"&&-1<n&&0==n%1&&9007199254740991>=n;
-}function du(n){var t=typeof n;return null!=n&&("object"==t||"function"==t)}function yu(n){return null!=n&&typeof n=="object"}function bu(n){return typeof n=="number"||yu(n)&&"[object Number]"==Ot(n)}function xu(n){return!(!yu(n)||"[object Object]"!=Ot(n))&&(n=di(n),null===n||(n=oi.call(n,"constructor")&&n.constructor,typeof n=="function"&&n instanceof n&&ii.call(n)==li))}function ju(n){return typeof n=="string"||!ff(n)&&yu(n)&&"[object String]"==Ot(n)}function wu(n){return typeof n=="symbol"||yu(n)&&"[object Symbol]"==Ot(n);
-}function mu(n){if(!n)return[];if(su(n))return ju(n)?M(n):Ur(n);if(wi&&n[wi]){n=n[wi]();for(var t,r=[];!(t=n.next()).done;)r.push(t.value);return r}return t=vo(n),("[object Map]"==t?W:"[object Set]"==t?U:Uu)(n)}function Au(n){return n?(n=Su(n),n===$||n===-$?1.7976931348623157e308*(0>n?-1:1):n===n?n:0):0===n?n:0}function Eu(n){n=Au(n);var t=n%1;return n===n?t?n-t:n:0}function ku(n){return n?pt(Eu(n),0,4294967295):0}function Su(n){if(typeof n=="number")return n;if(wu(n))return F;if(du(n)&&(n=typeof n.valueOf=="function"?n.valueOf():n,
-n=du(n)?n+"":n),typeof n!="string")return 0===n?n:+n;n=n.replace(un,"");var t=gn.test(n);return t||yn.test(n)?Dn(n.slice(2),t?2:8):vn.test(n)?F:+n}function Ou(n){return Cr(n,Bu(n))}function Iu(n){return null==n?"":yr(n)}function Ru(n,t,r){return n=null==n?T:kt(n,t),n===T?r:n}function zu(n,t){return null!=n&&we(n,t,zt)}function Wu(n){return su(n)?qn(n):Vt(n)}function Bu(n){if(su(n))n=qn(n,true);else if(du(n)){var t,r=ze(n),e=[];for(t in n)("constructor"!=t||!r&&oi.call(n,t))&&e.push(t);n=e}else{if(t=[],
-null!=n)for(r in Qu(n))t.push(r);n=t}return n}function Lu(n,t){if(null==n)return{};var r=c(ve(n),function(n){return[n]});return t=ye(t),tr(n,r,function(n,r){return t(n,r[0])})}function Uu(n){return null==n?[]:S(n,Wu(n))}function Cu(n){return $f(Iu(n).toLowerCase())}function Du(n){return(n=Iu(n))&&n.replace(xn,Xn).replace(Sn,"")}function Mu(n,t,r){return n=Iu(n),t=r?T:t,t===T?zn.test(n)?n.match(In)||[]:n.match(sn)||[]:n.match(t)||[]}function Tu(n){return function(){return n}}function $u(n){return n;
-}function Fu(n){return qt(typeof n=="function"?n:_t(n,1))}function Nu(n,t,e){var u=Wu(t),i=Et(t,u);null!=e||du(t)&&(i.length||!u.length)||(e=t,t=n,n=this,i=Et(t,Wu(t)));var o=!(du(e)&&"chain"in e&&!e.chain),f=_u(n);return r(i,function(r){var e=t[r];n[r]=e,f&&(n.prototype[r]=function(){var t=this.__chain__;if(o||t){var r=n(this.__wrapped__);return(r.__actions__=Ur(this.__actions__)).push({func:e,args:arguments,thisArg:n}),r.__chain__=t,r}return e.apply(n,a([this.value()],arguments))})}),n}function Pu(){}
-function Zu(n){return Ie(n)?b(Me(n)):rr(n)}function qu(){return[]}function Vu(){return false}mn=null==mn?$n:rt.defaults($n.Object(),mn,rt.pick($n,Wn));var Ku=mn.Array,Gu=mn.Date,Hu=mn.Error,Ju=mn.Function,Yu=mn.Math,Qu=mn.Object,Xu=mn.RegExp,ni=mn.String,ti=mn.TypeError,ri=Ku.prototype,ei=Qu.prototype,ui=mn["__core-js_shared__"],ii=Ju.prototype.toString,oi=ei.hasOwnProperty,fi=0,ci=function(){var n=/[^.]+$/.exec(ui&&ui.keys&&ui.keys.IE_PROTO||"");return n?"Symbol(src)_1."+n:""}(),ai=ei.toString,li=ii.call(Qu),si=$n._,hi=Xu("^"+ii.call(oi).replace(rn,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),pi=Pn?mn.Buffer:T,_i=mn.Symbol,vi=mn.Uint8Array,gi=pi?pi.g:T,di=B(Qu.getPrototypeOf,Qu),yi=Qu.create,bi=ei.propertyIsEnumerable,xi=ri.splice,ji=_i?_i.isConcatSpreadable:T,wi=_i?_i.iterator:T,mi=_i?_i.toStringTag:T,Ai=function(){
-try{var n=je(Qu,"defineProperty");return n({},"",{}),n}catch(n){}}(),Ei=mn.clearTimeout!==$n.clearTimeout&&mn.clearTimeout,ki=Gu&&Gu.now!==$n.Date.now&&Gu.now,Si=mn.setTimeout!==$n.setTimeout&&mn.setTimeout,Oi=Yu.ceil,Ii=Yu.floor,Ri=Qu.getOwnPropertySymbols,zi=pi?pi.isBuffer:T,Wi=mn.isFinite,Bi=ri.join,Li=B(Qu.keys,Qu),Ui=Yu.max,Ci=Yu.min,Di=Gu.now,Mi=mn.parseInt,Ti=Yu.random,$i=ri.reverse,Fi=je(mn,"DataView"),Ni=je(mn,"Map"),Pi=je(mn,"Promise"),Zi=je(mn,"Set"),qi=je(mn,"WeakMap"),Vi=je(Qu,"create"),Ki=qi&&new qi,Gi={},Hi=Te(Fi),Ji=Te(Ni),Yi=Te(Pi),Qi=Te(Zi),Xi=Te(qi),no=_i?_i.prototype:T,to=no?no.valueOf:T,ro=no?no.toString:T,eo=function(){
-function n(){}return function(t){return du(t)?yi?yi(t):(n.prototype=t,t=new n,n.prototype=T,t):{}}}();An.templateSettings={escape:J,evaluate:Y,interpolate:Q,variable:"",imports:{_:An}},An.prototype=En.prototype,An.prototype.constructor=An,On.prototype=eo(En.prototype),On.prototype.constructor=On,Un.prototype=eo(En.prototype),Un.prototype.constructor=Un,Mn.prototype.clear=function(){this.__data__=Vi?Vi(null):{},this.size=0},Mn.prototype.delete=function(n){return n=this.has(n)&&delete this.__data__[n],
-this.size-=n?1:0,n},Mn.prototype.get=function(n){var t=this.__data__;return Vi?(n=t[n],"__lodash_hash_undefined__"===n?T:n):oi.call(t,n)?t[n]:T},Mn.prototype.has=function(n){var t=this.__data__;return Vi?t[n]!==T:oi.call(t,n)},Mn.prototype.set=function(n,t){var r=this.__data__;return this.size+=this.has(n)?0:1,r[n]=Vi&&t===T?"__lodash_hash_undefined__":t,this},Tn.prototype.clear=function(){this.__data__=[],this.size=0},Tn.prototype.delete=function(n){var t=this.__data__;return n=ft(t,n),!(0>n)&&(n==t.length-1?t.pop():xi.call(t,n,1),
---this.size,true)},Tn.prototype.get=function(n){var t=this.__data__;return n=ft(t,n),0>n?T:t[n][1]},Tn.prototype.has=function(n){return-1<ft(this.__data__,n)},Tn.prototype.set=function(n,t){var r=this.__data__,e=ft(r,n);return 0>e?(++this.size,r.push([n,t])):r[e][1]=t,this},Fn.prototype.clear=function(){this.size=0,this.__data__={hash:new Mn,map:new(Ni||Tn),string:new Mn}},Fn.prototype.delete=function(n){return n=be(this,n).delete(n),this.size-=n?1:0,n},Fn.prototype.get=function(n){return be(this,n).get(n);
-},Fn.prototype.has=function(n){return be(this,n).has(n)},Fn.prototype.set=function(n,t){var r=be(this,n),e=r.size;return r.set(n,t),this.size+=r.size==e?0:1,this},Nn.prototype.add=Nn.prototype.push=function(n){return this.__data__.set(n,"__lodash_hash_undefined__"),this},Nn.prototype.has=function(n){return this.__data__.has(n)},Zn.prototype.clear=function(){this.__data__=new Tn,this.size=0},Zn.prototype.delete=function(n){var t=this.__data__;return n=t.delete(n),this.size=t.size,n},Zn.prototype.get=function(n){
-return this.__data__.get(n)},Zn.prototype.has=function(n){return this.__data__.has(n)},Zn.prototype.set=function(n,t){var r=this.__data__;if(r instanceof Tn){var e=r.__data__;if(!Ni||199>e.length)return e.push([n,t]),this.size=++r.size,this;r=this.__data__=new Fn(e)}return r.set(n,t),this.size=r.size,this};var uo=Fr(mt),io=Fr(At,true),oo=Nr(),fo=Nr(true),co=Ki?function(n,t){return Ki.set(n,t),n}:$u,ao=Ai?function(n,t){return Ai(n,"toString",{configurable:true,enumerable:false,value:Tu(t),writable:true})}:$u,lo=Ei||function(n){
-return $n.clearTimeout(n)},so=Zi&&1/U(new Zi([,-0]))[1]==$?function(n){return new Zi(n)}:Pu,ho=Ki?function(n){return Ki.get(n)}:Pu,po=Ri?function(n){return null==n?[]:(n=Qu(n),i(Ri(n),function(t){return bi.call(n,t)}))}:qu,_o=Ri?function(n){for(var t=[];n;)a(t,po(n)),n=di(n);return t}:qu,vo=Ot;(Fi&&"[object DataView]"!=vo(new Fi(new ArrayBuffer(1)))||Ni&&"[object Map]"!=vo(new Ni)||Pi&&"[object Promise]"!=vo(Pi.resolve())||Zi&&"[object Set]"!=vo(new Zi)||qi&&"[object WeakMap]"!=vo(new qi))&&(vo=function(n){
-var t=Ot(n);if(n=(n="[object Object]"==t?n.constructor:T)?Te(n):"")switch(n){case Hi:return"[object DataView]";case Ji:return"[object Map]";case Yi:return"[object Promise]";case Qi:return"[object Set]";case Xi:return"[object WeakMap]"}return t});var go=ui?_u:Vu,yo=Ce(co),bo=Si||function(n,t){return $n.setTimeout(n,t)},xo=Ce(ao),jo=function(n){n=cu(n,function(n){return 500===t.size&&t.clear(),n});var t=n.cache;return n}(function(n){var t=[];return 46===n.charCodeAt(0)&&t.push(""),n.replace(tn,function(n,r,e,u){
-t.push(e?u.replace(hn,"$1"):r||n)}),t}),wo=fr(function(n,t){return hu(n)?yt(n,wt(t,1,hu,true)):[]}),mo=fr(function(n,t){var r=Ve(t);return hu(r)&&(r=T),hu(n)?yt(n,wt(t,1,hu,true),ye(r,2)):[]}),Ao=fr(function(n,t){var r=Ve(t);return hu(r)&&(r=T),hu(n)?yt(n,wt(t,1,hu,true),T,r):[]}),Eo=fr(function(n){var t=c(n,Er);return t.length&&t[0]===n[0]?Wt(t):[]}),ko=fr(function(n){var t=Ve(n),r=c(n,Er);return t===Ve(r)?t=T:r.pop(),r.length&&r[0]===n[0]?Wt(r,ye(t,2)):[]}),So=fr(function(n){var t=Ve(n),r=c(n,Er);return(t=typeof t=="function"?t:T)&&r.pop(),
-r.length&&r[0]===n[0]?Wt(r,T,t):[]}),Oo=fr(Ke),Io=pe(function(n,t){var r=null==n?0:n.length,e=ht(n,t);return ur(n,c(t,function(n){return Se(n,r)?+n:n}).sort(Wr)),e}),Ro=fr(function(n){return br(wt(n,1,hu,true))}),zo=fr(function(n){var t=Ve(n);return hu(t)&&(t=T),br(wt(n,1,hu,true),ye(t,2))}),Wo=fr(function(n){var t=Ve(n),t=typeof t=="function"?t:T;return br(wt(n,1,hu,true),T,t)}),Bo=fr(function(n,t){return hu(n)?yt(n,t):[]}),Lo=fr(function(n){return mr(i(n,hu))}),Uo=fr(function(n){var t=Ve(n);return hu(t)&&(t=T),
-mr(i(n,hu),ye(t,2))}),Co=fr(function(n){var t=Ve(n),t=typeof t=="function"?t:T;return mr(i(n,hu),T,t)}),Do=fr(He),Mo=fr(function(n){var t=n.length,t=1<t?n[t-1]:T,t=typeof t=="function"?(n.pop(),t):T;return Je(n,t)}),To=pe(function(n){function t(t){return ht(t,n)}var r=n.length,e=r?n[0]:0,u=this.__wrapped__;return!(1<r||this.__actions__.length)&&u instanceof Un&&Se(e)?(u=u.slice(e,+e+(r?1:0)),u.__actions__.push({func:Qe,args:[t],thisArg:T}),new On(u,this.__chain__).thru(function(n){return r&&!n.length&&n.push(T),
-n})):this.thru(t)}),$o=Tr(function(n,t,r){oi.call(n,r)?++n[r]:st(n,r,1)}),Fo=Gr(Ne),No=Gr(Pe),Po=Tr(function(n,t,r){oi.call(n,r)?n[r].push(t):st(n,r,[t])}),Zo=fr(function(t,r,e){var u=-1,i=typeof r=="function",o=su(t)?Ku(t.length):[];return uo(t,function(t){o[++u]=i?n(r,t,e):Lt(t,r,e)}),o}),qo=Tr(function(n,t,r){st(n,r,t)}),Vo=Tr(function(n,t,r){n[r?0:1].push(t)},function(){return[[],[]]}),Ko=fr(function(n,t){if(null==n)return[];var r=t.length;return 1<r&&Oe(n,t[0],t[1])?t=[]:2<r&&Oe(t[0],t[1],t[2])&&(t=[t[0]]),
-Xt(n,wt(t,1),[])}),Go=ki||function(){return $n.Date.now()},Ho=fr(function(n,t,r){var e=1;if(r.length)var u=L(r,de(Ho)),e=32|e;return fe(n,e,t,r,u)}),Jo=fr(function(n,t,r){var e=3;if(r.length)var u=L(r,de(Jo)),e=32|e;return fe(t,e,n,r,u)}),Yo=fr(function(n,t){return dt(n,1,t)}),Qo=fr(function(n,t,r){return dt(n,Su(t)||0,r)});cu.Cache=Fn;var Xo=fr(function(t,r){r=1==r.length&&ff(r[0])?c(r[0],k(ye())):c(wt(r,1),k(ye()));var e=r.length;return fr(function(u){for(var i=-1,o=Ci(u.length,e);++i<o;)u[i]=r[i].call(this,u[i]);
-return n(t,this,u)})}),nf=fr(function(n,t){return fe(n,32,T,t,L(t,de(nf)))}),tf=fr(function(n,t){return fe(n,64,T,t,L(t,de(tf)))}),rf=pe(function(n,t){return fe(n,256,T,T,T,t)}),ef=ee(It),uf=ee(function(n,t){return n>=t}),of=Ut(function(){return arguments}())?Ut:function(n){return yu(n)&&oi.call(n,"callee")&&!bi.call(n,"callee")},ff=Ku.isArray,cf=Vn?k(Vn):Ct,af=zi||Vu,lf=Kn?k(Kn):Dt,sf=Gn?k(Gn):Tt,hf=Hn?k(Hn):Nt,pf=Jn?k(Jn):Pt,_f=Yn?k(Yn):Zt,vf=ee(Kt),gf=ee(function(n,t){return n<=t}),df=$r(function(n,t){
-if(ze(t)||su(t))Cr(t,Wu(t),n);else for(var r in t)oi.call(t,r)&&ot(n,r,t[r])}),yf=$r(function(n,t){Cr(t,Bu(t),n)}),bf=$r(function(n,t,r,e){Cr(t,Bu(t),n,e)}),xf=$r(function(n,t,r,e){Cr(t,Wu(t),n,e)}),jf=pe(ht),wf=fr(function(n,t){n=Qu(n);var r=-1,e=t.length,u=2<e?t[2]:T;for(u&&Oe(t[0],t[1],u)&&(e=1);++r<e;)for(var u=t[r],i=Bu(u),o=-1,f=i.length;++o<f;){var c=i[o],a=n[c];(a===T||lu(a,ei[c])&&!oi.call(n,c))&&(n[c]=u[c])}return n}),mf=fr(function(t){return t.push(T,ae),n(Of,T,t)}),Af=Yr(function(n,t,r){
-null!=t&&typeof t.toString!="function"&&(t=ai.call(t)),n[t]=r},Tu($u)),Ef=Yr(function(n,t,r){null!=t&&typeof t.toString!="function"&&(t=ai.call(t)),oi.call(n,t)?n[t].push(r):n[t]=[r]},ye),kf=fr(Lt),Sf=$r(function(n,t,r){Yt(n,t,r)}),Of=$r(function(n,t,r,e){Yt(n,t,r,e)}),If=pe(function(n,t){var r={};if(null==n)return r;var e=false;t=c(t,function(t){return t=Sr(t,n),e||(e=1<t.length),t}),Cr(n,ve(n),r),e&&(r=_t(r,7,le));for(var u=t.length;u--;)xr(r,t[u]);return r}),Rf=pe(function(n,t){return null==n?{}:nr(n,t);
-}),zf=oe(Wu),Wf=oe(Bu),Bf=qr(function(n,t,r){return t=t.toLowerCase(),n+(r?Cu(t):t)}),Lf=qr(function(n,t,r){return n+(r?"-":"")+t.toLowerCase()}),Uf=qr(function(n,t,r){return n+(r?" ":"")+t.toLowerCase()}),Cf=Zr("toLowerCase"),Df=qr(function(n,t,r){return n+(r?"_":"")+t.toLowerCase()}),Mf=qr(function(n,t,r){return n+(r?" ":"")+$f(t)}),Tf=qr(function(n,t,r){return n+(r?" ":"")+t.toUpperCase()}),$f=Zr("toUpperCase"),Ff=fr(function(t,r){try{return n(t,T,r)}catch(n){return pu(n)?n:new Hu(n)}}),Nf=pe(function(n,t){
-return r(t,function(t){t=Me(t),st(n,t,Ho(n[t],n))}),n}),Pf=Hr(),Zf=Hr(true),qf=fr(function(n,t){return function(r){return Lt(r,n,t)}}),Vf=fr(function(n,t){return function(r){return Lt(n,r,t)}}),Kf=Xr(c),Gf=Xr(u),Hf=Xr(h),Jf=re(),Yf=re(true),Qf=Qr(function(n,t){return n+t},0),Xf=ie("ceil"),nc=Qr(function(n,t){return n/t},1),tc=ie("floor"),rc=Qr(function(n,t){return n*t},1),ec=ie("round"),uc=Qr(function(n,t){return n-t},0);return An.after=function(n,t){if(typeof t!="function")throw new ti("Expected a function");
-return n=Eu(n),function(){if(1>--n)return t.apply(this,arguments)}},An.ary=eu,An.assign=df,An.assignIn=yf,An.assignInWith=bf,An.assignWith=xf,An.at=jf,An.before=uu,An.bind=Ho,An.bindAll=Nf,An.bindKey=Jo,An.castArray=function(){if(!arguments.length)return[];var n=arguments[0];return ff(n)?n:[n]},An.chain=Ye,An.chunk=function(n,t,r){if(t=(r?Oe(n,t,r):t===T)?1:Ui(Eu(t),0),r=null==n?0:n.length,!r||1>t)return[];for(var e=0,u=0,i=Ku(Oi(r/t));e<r;)i[u++]=hr(n,e,e+=t);return i},An.compact=function(n){for(var t=-1,r=null==n?0:n.length,e=0,u=[];++t<r;){
-var i=n[t];i&&(u[e++]=i)}return u},An.concat=function(){var n=arguments.length;if(!n)return[];for(var t=Ku(n-1),r=arguments[0];n--;)t[n-1]=arguments[n];return a(ff(r)?Ur(r):[r],wt(t,1))},An.cond=function(t){var r=null==t?0:t.length,e=ye();return t=r?c(t,function(n){if("function"!=typeof n[1])throw new ti("Expected a function");return[e(n[0]),n[1]]}):[],fr(function(e){for(var u=-1;++u<r;){var i=t[u];if(n(i[0],this,e))return n(i[1],this,e)}})},An.conforms=function(n){return vt(_t(n,1))},An.constant=Tu,
-An.countBy=$o,An.create=function(n,t){var r=eo(n);return null==t?r:at(r,t)},An.curry=iu,An.curryRight=ou,An.debounce=fu,An.defaults=wf,An.defaultsDeep=mf,An.defer=Yo,An.delay=Qo,An.difference=wo,An.differenceBy=mo,An.differenceWith=Ao,An.drop=function(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===T?1:Eu(t),hr(n,0>t?0:t,e)):[]},An.dropRight=function(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===T?1:Eu(t),t=e-t,hr(n,0,0>t?0:t)):[]},An.dropRightWhile=function(n,t){return n&&n.length?jr(n,ye(t,3),true,true):[];
-},An.dropWhile=function(n,t){return n&&n.length?jr(n,ye(t,3),true):[]},An.fill=function(n,t,r,e){var u=null==n?0:n.length;if(!u)return[];for(r&&typeof r!="number"&&Oe(n,t,r)&&(r=0,e=u),u=n.length,r=Eu(r),0>r&&(r=-r>u?0:u+r),e=e===T||e>u?u:Eu(e),0>e&&(e+=u),e=r>e?0:ku(e);r<e;)n[r++]=t;return n},An.filter=function(n,t){return(ff(n)?i:jt)(n,ye(t,3))},An.flatMap=function(n,t){return wt(ru(n,t),1)},An.flatMapDeep=function(n,t){return wt(ru(n,t),$)},An.flatMapDepth=function(n,t,r){return r=r===T?1:Eu(r),
-wt(ru(n,t),r)},An.flatten=Ze,An.flattenDeep=function(n){return(null==n?0:n.length)?wt(n,$):[]},An.flattenDepth=function(n,t){return null!=n&&n.length?(t=t===T?1:Eu(t),wt(n,t)):[]},An.flip=function(n){return fe(n,512)},An.flow=Pf,An.flowRight=Zf,An.fromPairs=function(n){for(var t=-1,r=null==n?0:n.length,e={};++t<r;){var u=n[t];e[u[0]]=u[1]}return e},An.functions=function(n){return null==n?[]:Et(n,Wu(n))},An.functionsIn=function(n){return null==n?[]:Et(n,Bu(n))},An.groupBy=Po,An.initial=function(n){
-return(null==n?0:n.length)?hr(n,0,-1):[]},An.intersection=Eo,An.intersectionBy=ko,An.intersectionWith=So,An.invert=Af,An.invertBy=Ef,An.invokeMap=Zo,An.iteratee=Fu,An.keyBy=qo,An.keys=Wu,An.keysIn=Bu,An.map=ru,An.mapKeys=function(n,t){var r={};return t=ye(t,3),mt(n,function(n,e,u){st(r,t(n,e,u),n)}),r},An.mapValues=function(n,t){var r={};return t=ye(t,3),mt(n,function(n,e,u){st(r,e,t(n,e,u))}),r},An.matches=function(n){return Ht(_t(n,1))},An.matchesProperty=function(n,t){return Jt(n,_t(t,1))},An.memoize=cu,
-An.merge=Sf,An.mergeWith=Of,An.method=qf,An.methodOf=Vf,An.mixin=Nu,An.negate=au,An.nthArg=function(n){return n=Eu(n),fr(function(t){return Qt(t,n)})},An.omit=If,An.omitBy=function(n,t){return Lu(n,au(ye(t)))},An.once=function(n){return uu(2,n)},An.orderBy=function(n,t,r,e){return null==n?[]:(ff(t)||(t=null==t?[]:[t]),r=e?T:r,ff(r)||(r=null==r?[]:[r]),Xt(n,t,r))},An.over=Kf,An.overArgs=Xo,An.overEvery=Gf,An.overSome=Hf,An.partial=nf,An.partialRight=tf,An.partition=Vo,An.pick=Rf,An.pickBy=Lu,An.property=Zu,
-An.propertyOf=function(n){return function(t){return null==n?T:kt(n,t)}},An.pull=Oo,An.pullAll=Ke,An.pullAllBy=function(n,t,r){return n&&n.length&&t&&t.length?er(n,t,ye(r,2)):n},An.pullAllWith=function(n,t,r){return n&&n.length&&t&&t.length?er(n,t,T,r):n},An.pullAt=Io,An.range=Jf,An.rangeRight=Yf,An.rearg=rf,An.reject=function(n,t){return(ff(n)?i:jt)(n,au(ye(t,3)))},An.remove=function(n,t){var r=[];if(!n||!n.length)return r;var e=-1,u=[],i=n.length;for(t=ye(t,3);++e<i;){var o=n[e];t(o,e,n)&&(r.push(o),
-u.push(e))}return ur(n,u),r},An.rest=function(n,t){if(typeof n!="function")throw new ti("Expected a function");return t=t===T?t:Eu(t),fr(n,t)},An.reverse=Ge,An.sampleSize=function(n,t,r){return t=(r?Oe(n,t,r):t===T)?1:Eu(t),(ff(n)?et:ar)(n,t)},An.set=function(n,t,r){return null==n?n:lr(n,t,r)},An.setWith=function(n,t,r,e){return e=typeof e=="function"?e:T,null==n?n:lr(n,t,r,e)},An.shuffle=function(n){return(ff(n)?ut:sr)(n)},An.slice=function(n,t,r){var e=null==n?0:n.length;return e?(r&&typeof r!="number"&&Oe(n,t,r)?(t=0,
-r=e):(t=null==t?0:Eu(t),r=r===T?e:Eu(r)),hr(n,t,r)):[]},An.sortBy=Ko,An.sortedUniq=function(n){return n&&n.length?gr(n):[]},An.sortedUniqBy=function(n,t){return n&&n.length?gr(n,ye(t,2)):[]},An.split=function(n,t,r){return r&&typeof r!="number"&&Oe(n,t,r)&&(t=r=T),r=r===T?4294967295:r>>>0,r?(n=Iu(n))&&(typeof t=="string"||null!=t&&!hf(t))&&(t=yr(t),!t&&Rn.test(n))?Or(M(n),0,r):n.split(t,r):[]},An.spread=function(t,r){if(typeof t!="function")throw new ti("Expected a function");return r=null==r?0:Ui(Eu(r),0),
-fr(function(e){var u=e[r];return e=Or(e,0,r),u&&a(e,u),n(t,this,e)})},An.tail=function(n){var t=null==n?0:n.length;return t?hr(n,1,t):[]},An.take=function(n,t,r){return n&&n.length?(t=r||t===T?1:Eu(t),hr(n,0,0>t?0:t)):[]},An.takeRight=function(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===T?1:Eu(t),t=e-t,hr(n,0>t?0:t,e)):[]},An.takeRightWhile=function(n,t){return n&&n.length?jr(n,ye(t,3),false,true):[]},An.takeWhile=function(n,t){return n&&n.length?jr(n,ye(t,3)):[]},An.tap=function(n,t){return t(n),
-n},An.throttle=function(n,t,r){var e=true,u=true;if(typeof n!="function")throw new ti("Expected a function");return du(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),fu(n,t,{leading:e,maxWait:t,trailing:u})},An.thru=Qe,An.toArray=mu,An.toPairs=zf,An.toPairsIn=Wf,An.toPath=function(n){return ff(n)?c(n,Me):wu(n)?[n]:Ur(jo(Iu(n)))},An.toPlainObject=Ou,An.transform=function(n,t,e){var u=ff(n),i=u||af(n)||_f(n);if(t=ye(t,4),null==e){var o=n&&n.constructor;e=i?u?new o:[]:du(n)&&_u(o)?eo(di(n)):{};
-}return(i?r:mt)(n,function(n,r,u){return t(e,n,r,u)}),e},An.unary=function(n){return eu(n,1)},An.union=Ro,An.unionBy=zo,An.unionWith=Wo,An.uniq=function(n){return n&&n.length?br(n):[]},An.uniqBy=function(n,t){return n&&n.length?br(n,ye(t,2)):[]},An.uniqWith=function(n,t){return t=typeof t=="function"?t:T,n&&n.length?br(n,T,t):[]},An.unset=function(n,t){return null==n||xr(n,t)},An.unzip=He,An.unzipWith=Je,An.update=function(n,t,r){return null==n?n:lr(n,t,kr(r)(kt(n,t)),void 0)},An.updateWith=function(n,t,r,e){
-return e=typeof e=="function"?e:T,null!=n&&(n=lr(n,t,kr(r)(kt(n,t)),e)),n},An.values=Uu,An.valuesIn=function(n){return null==n?[]:S(n,Bu(n))},An.without=Bo,An.words=Mu,An.wrap=function(n,t){return nf(kr(t),n)},An.xor=Lo,An.xorBy=Uo,An.xorWith=Co,An.zip=Do,An.zipObject=function(n,t){return Ar(n||[],t||[],ot)},An.zipObjectDeep=function(n,t){return Ar(n||[],t||[],lr)},An.zipWith=Mo,An.entries=zf,An.entriesIn=Wf,An.extend=yf,An.extendWith=bf,Nu(An,An),An.add=Qf,An.attempt=Ff,An.camelCase=Bf,An.capitalize=Cu,
-An.ceil=Xf,An.clamp=function(n,t,r){return r===T&&(r=t,t=T),r!==T&&(r=Su(r),r=r===r?r:0),t!==T&&(t=Su(t),t=t===t?t:0),pt(Su(n),t,r)},An.clone=function(n){return _t(n,4)},An.cloneDeep=function(n){return _t(n,5)},An.cloneDeepWith=function(n,t){return t=typeof t=="function"?t:T,_t(n,5,t)},An.cloneWith=function(n,t){return t=typeof t=="function"?t:T,_t(n,4,t)},An.conformsTo=function(n,t){return null==t||gt(n,t,Wu(t))},An.deburr=Du,An.defaultTo=function(n,t){return null==n||n!==n?t:n},An.divide=nc,An.endsWith=function(n,t,r){
-n=Iu(n),t=yr(t);var e=n.length,e=r=r===T?e:pt(Eu(r),0,e);return r-=t.length,0<=r&&n.slice(r,e)==t},An.eq=lu,An.escape=function(n){return(n=Iu(n))&&H.test(n)?n.replace(K,nt):n},An.escapeRegExp=function(n){return(n=Iu(n))&&en.test(n)?n.replace(rn,"\\$&"):n},An.every=function(n,t,r){var e=ff(n)?u:bt;return r&&Oe(n,t,r)&&(t=T),e(n,ye(t,3))},An.find=Fo,An.findIndex=Ne,An.findKey=function(n,t){return p(n,ye(t,3),mt)},An.findLast=No,An.findLastIndex=Pe,An.findLastKey=function(n,t){return p(n,ye(t,3),At);
-},An.floor=tc,An.forEach=nu,An.forEachRight=tu,An.forIn=function(n,t){return null==n?n:oo(n,ye(t,3),Bu)},An.forInRight=function(n,t){return null==n?n:fo(n,ye(t,3),Bu)},An.forOwn=function(n,t){return n&&mt(n,ye(t,3))},An.forOwnRight=function(n,t){return n&&At(n,ye(t,3))},An.get=Ru,An.gt=ef,An.gte=uf,An.has=function(n,t){return null!=n&&we(n,t,Rt)},An.hasIn=zu,An.head=qe,An.identity=$u,An.includes=function(n,t,r,e){return n=su(n)?n:Uu(n),r=r&&!e?Eu(r):0,e=n.length,0>r&&(r=Ui(e+r,0)),ju(n)?r<=e&&-1<n.indexOf(t,r):!!e&&-1<v(n,t,r);
-},An.indexOf=function(n,t,r){var e=null==n?0:n.length;return e?(r=null==r?0:Eu(r),0>r&&(r=Ui(e+r,0)),v(n,t,r)):-1},An.inRange=function(n,t,r){return t=Au(t),r===T?(r=t,t=0):r=Au(r),n=Su(n),n>=Ci(t,r)&&n<Ui(t,r)},An.invoke=kf,An.isArguments=of,An.isArray=ff,An.isArrayBuffer=cf,An.isArrayLike=su,An.isArrayLikeObject=hu,An.isBoolean=function(n){return true===n||false===n||yu(n)&&"[object Boolean]"==Ot(n)},An.isBuffer=af,An.isDate=lf,An.isElement=function(n){return yu(n)&&1===n.nodeType&&!xu(n)},An.isEmpty=function(n){
-if(null==n)return true;if(su(n)&&(ff(n)||typeof n=="string"||typeof n.splice=="function"||af(n)||_f(n)||of(n)))return!n.length;var t=vo(n);if("[object Map]"==t||"[object Set]"==t)return!n.size;if(ze(n))return!Vt(n).length;for(var r in n)if(oi.call(n,r))return false;return true},An.isEqual=function(n,t){return Mt(n,t)},An.isEqualWith=function(n,t,r){var e=(r=typeof r=="function"?r:T)?r(n,t):T;return e===T?Mt(n,t,T,r):!!e},An.isError=pu,An.isFinite=function(n){return typeof n=="number"&&Wi(n)},An.isFunction=_u,
-An.isInteger=vu,An.isLength=gu,An.isMap=sf,An.isMatch=function(n,t){return n===t||$t(n,t,xe(t))},An.isMatchWith=function(n,t,r){return r=typeof r=="function"?r:T,$t(n,t,xe(t),r)},An.isNaN=function(n){return bu(n)&&n!=+n},An.isNative=function(n){if(go(n))throw new Hu("Unsupported core-js use. Try https://npms.io/search?q=ponyfill.");return Ft(n)},An.isNil=function(n){return null==n},An.isNull=function(n){return null===n},An.isNumber=bu,An.isObject=du,An.isObjectLike=yu,An.isPlainObject=xu,An.isRegExp=hf,
-An.isSafeInteger=function(n){return vu(n)&&-9007199254740991<=n&&9007199254740991>=n},An.isSet=pf,An.isString=ju,An.isSymbol=wu,An.isTypedArray=_f,An.isUndefined=function(n){return n===T},An.isWeakMap=function(n){return yu(n)&&"[object WeakMap]"==vo(n)},An.isWeakSet=function(n){return yu(n)&&"[object WeakSet]"==Ot(n)},An.join=function(n,t){return null==n?"":Bi.call(n,t)},An.kebabCase=Lf,An.last=Ve,An.lastIndexOf=function(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=e;if(r!==T&&(u=Eu(r),u=0>u?Ui(e+u,0):Ci(u,e-1)),
-t===t){for(r=u+1;r--&&n[r]!==t;);n=r}else n=_(n,d,u,true);return n},An.lowerCase=Uf,An.lowerFirst=Cf,An.lt=vf,An.lte=gf,An.max=function(n){return n&&n.length?xt(n,$u,It):T},An.maxBy=function(n,t){return n&&n.length?xt(n,ye(t,2),It):T},An.mean=function(n){return y(n,$u)},An.meanBy=function(n,t){return y(n,ye(t,2))},An.min=function(n){return n&&n.length?xt(n,$u,Kt):T},An.minBy=function(n,t){return n&&n.length?xt(n,ye(t,2),Kt):T},An.stubArray=qu,An.stubFalse=Vu,An.stubObject=function(){return{}},An.stubString=function(){
-return""},An.stubTrue=function(){return true},An.multiply=rc,An.nth=function(n,t){return n&&n.length?Qt(n,Eu(t)):T},An.noConflict=function(){return $n._===this&&($n._=si),this},An.noop=Pu,An.now=Go,An.pad=function(n,t,r){n=Iu(n);var e=(t=Eu(t))?D(n):0;return!t||e>=t?n:(t=(t-e)/2,ne(Ii(t),r)+n+ne(Oi(t),r))},An.padEnd=function(n,t,r){n=Iu(n);var e=(t=Eu(t))?D(n):0;return t&&e<t?n+ne(t-e,r):n},An.padStart=function(n,t,r){n=Iu(n);var e=(t=Eu(t))?D(n):0;return t&&e<t?ne(t-e,r)+n:n},An.parseInt=function(n,t,r){
-return r||null==t?t=0:t&&(t=+t),Mi(Iu(n).replace(on,""),t||0)},An.random=function(n,t,r){if(r&&typeof r!="boolean"&&Oe(n,t,r)&&(t=r=T),r===T&&(typeof t=="boolean"?(r=t,t=T):typeof n=="boolean"&&(r=n,n=T)),n===T&&t===T?(n=0,t=1):(n=Au(n),t===T?(t=n,n=0):t=Au(t)),n>t){var e=n;n=t,t=e}return r||n%1||t%1?(r=Ti(),Ci(n+r*(t-n+Cn("1e-"+((r+"").length-1))),t)):ir(n,t)},An.reduce=function(n,t,r){var e=ff(n)?l:j,u=3>arguments.length;return e(n,ye(t,4),r,u,uo)},An.reduceRight=function(n,t,r){var e=ff(n)?s:j,u=3>arguments.length;
-return e(n,ye(t,4),r,u,io)},An.repeat=function(n,t,r){return t=(r?Oe(n,t,r):t===T)?1:Eu(t),or(Iu(n),t)},An.replace=function(){var n=arguments,t=Iu(n[0]);return 3>n.length?t:t.replace(n[1],n[2])},An.result=function(n,t,r){t=Sr(t,n);var e=-1,u=t.length;for(u||(u=1,n=T);++e<u;){var i=null==n?T:n[Me(t[e])];i===T&&(e=u,i=r),n=_u(i)?i.call(n):i}return n},An.round=ec,An.runInContext=x,An.sample=function(n){return(ff(n)?Qn:cr)(n)},An.size=function(n){if(null==n)return 0;if(su(n))return ju(n)?D(n):n.length;
-var t=vo(n);return"[object Map]"==t||"[object Set]"==t?n.size:Vt(n).length},An.snakeCase=Df,An.some=function(n,t,r){var e=ff(n)?h:pr;return r&&Oe(n,t,r)&&(t=T),e(n,ye(t,3))},An.sortedIndex=function(n,t){return _r(n,t)},An.sortedIndexBy=function(n,t,r){return vr(n,t,ye(r,2))},An.sortedIndexOf=function(n,t){var r=null==n?0:n.length;if(r){var e=_r(n,t);if(e<r&&lu(n[e],t))return e}return-1},An.sortedLastIndex=function(n,t){return _r(n,t,true)},An.sortedLastIndexBy=function(n,t,r){return vr(n,t,ye(r,2),true);
-},An.sortedLastIndexOf=function(n,t){if(null==n?0:n.length){var r=_r(n,t,true)-1;if(lu(n[r],t))return r}return-1},An.startCase=Mf,An.startsWith=function(n,t,r){return n=Iu(n),r=null==r?0:pt(Eu(r),0,n.length),t=yr(t),n.slice(r,r+t.length)==t},An.subtract=uc,An.sum=function(n){return n&&n.length?m(n,$u):0},An.sumBy=function(n,t){return n&&n.length?m(n,ye(t,2)):0},An.template=function(n,t,r){var e=An.templateSettings;r&&Oe(n,t,r)&&(t=T),n=Iu(n),t=bf({},t,e,ce),r=bf({},t.imports,e.imports,ce);var u,i,o=Wu(r),f=S(r,o),c=0;
-r=t.interpolate||jn;var a="__p+='";r=Xu((t.escape||jn).source+"|"+r.source+"|"+(r===Q?pn:jn).source+"|"+(t.evaluate||jn).source+"|$","g");var l=oi.call(t,"sourceURL")?"//# sourceURL="+(t.sourceURL+"").replace(/[\r\n]/g," ")+"\n":"";if(n.replace(r,function(t,r,e,o,f,l){return e||(e=o),a+=n.slice(c,l).replace(wn,z),r&&(u=true,a+="'+__e("+r+")+'"),f&&(i=true,a+="';"+f+";\n__p+='"),e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),c=l+t.length,t}),a+="';",(t=oi.call(t,"variable")&&t.variable)||(a="with(obj){"+a+"}"),
-a=(i?a.replace(P,""):a).replace(Z,"$1").replace(q,"$1;"),a="function("+(t||"obj")+"){"+(t?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+a+"return __p}",t=Ff(function(){return Ju(o,l+"return "+a).apply(T,f)}),t.source=a,pu(t))throw t;return t},An.times=function(n,t){if(n=Eu(n),1>n||9007199254740991<n)return[];var r=4294967295,e=Ci(n,4294967295);for(t=ye(t),n-=4294967295,e=A(e,t);++r<n;)t(r);return e},An.toFinite=Au,
-An.toInteger=Eu,An.toLength=ku,An.toLower=function(n){return Iu(n).toLowerCase()},An.toNumber=Su,An.toSafeInteger=function(n){return n?pt(Eu(n),-9007199254740991,9007199254740991):0===n?n:0},An.toString=Iu,An.toUpper=function(n){return Iu(n).toUpperCase()},An.trim=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(un,""):n&&(t=yr(t))?(n=M(n),r=M(t),t=I(n,r),r=R(n,r)+1,Or(n,t,r).join("")):n},An.trimEnd=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(fn,""):n&&(t=yr(t))?(n=M(n),t=R(n,M(t))+1,
-Or(n,0,t).join("")):n},An.trimStart=function(n,t,r){return(n=Iu(n))&&(r||t===T)?n.replace(on,""):n&&(t=yr(t))?(n=M(n),t=I(n,M(t)),Or(n,t).join("")):n},An.truncate=function(n,t){var r=30,e="...";if(du(t))var u="separator"in t?t.separator:u,r="length"in t?Eu(t.length):r,e="omission"in t?yr(t.omission):e;n=Iu(n);var i=n.length;if(Rn.test(n))var o=M(n),i=o.length;if(r>=i)return n;if(i=r-D(e),1>i)return e;if(r=o?Or(o,0,i).join(""):n.slice(0,i),u===T)return r+e;if(o&&(i+=r.length-i),hf(u)){if(n.slice(i).search(u)){
-var f=r;for(u.global||(u=Xu(u.source,Iu(_n.exec(u))+"g")),u.lastIndex=0;o=u.exec(f);)var c=o.index;r=r.slice(0,c===T?i:c)}}else n.indexOf(yr(u),i)!=i&&(u=r.lastIndexOf(u),-1<u&&(r=r.slice(0,u)));return r+e},An.unescape=function(n){return(n=Iu(n))&&G.test(n)?n.replace(V,tt):n},An.uniqueId=function(n){var t=++fi;return Iu(n)+t},An.upperCase=Tf,An.upperFirst=$f,An.each=nu,An.eachRight=tu,An.first=qe,Nu(An,function(){var n={};return mt(An,function(t,r){oi.call(An.prototype,r)||(n[r]=t)}),n}(),{chain:false
-}),An.VERSION="4.17.15",r("bind bindKey curry curryRight partial partialRight".split(" "),function(n){An[n].placeholder=An}),r(["drop","take"],function(n,t){Un.prototype[n]=function(r){r=r===T?1:Ui(Eu(r),0);var e=this.__filtered__&&!t?new Un(this):this.clone();return e.__filtered__?e.__takeCount__=Ci(r,e.__takeCount__):e.__views__.push({size:Ci(r,4294967295),type:n+(0>e.__dir__?"Right":"")}),e},Un.prototype[n+"Right"]=function(t){return this.reverse()[n](t).reverse()}}),r(["filter","map","takeWhile"],function(n,t){
-var r=t+1,e=1==r||3==r;Un.prototype[n]=function(n){var t=this.clone();return t.__iteratees__.push({iteratee:ye(n,3),type:r}),t.__filtered__=t.__filtered__||e,t}}),r(["head","last"],function(n,t){var r="take"+(t?"Right":"");Un.prototype[n]=function(){return this[r](1).value()[0]}}),r(["initial","tail"],function(n,t){var r="drop"+(t?"":"Right");Un.prototype[n]=function(){return this.__filtered__?new Un(this):this[r](1)}}),Un.prototype.compact=function(){return this.filter($u)},Un.prototype.find=function(n){
-return this.filter(n).head()},Un.prototype.findLast=function(n){return this.reverse().find(n)},Un.prototype.invokeMap=fr(function(n,t){return typeof n=="function"?new Un(this):this.map(function(r){return Lt(r,n,t)})}),Un.prototype.reject=function(n){return this.filter(au(ye(n)))},Un.prototype.slice=function(n,t){n=Eu(n);var r=this;return r.__filtered__&&(0<n||0>t)?new Un(r):(0>n?r=r.takeRight(-n):n&&(r=r.drop(n)),t!==T&&(t=Eu(t),r=0>t?r.dropRight(-t):r.take(t-n)),r)},Un.prototype.takeRightWhile=function(n){
-return this.reverse().takeWhile(n).reverse()},Un.prototype.toArray=function(){return this.take(4294967295)},mt(Un.prototype,function(n,t){var r=/^(?:filter|find|map|reject)|While$/.test(t),e=/^(?:head|last)$/.test(t),u=An[e?"take"+("last"==t?"Right":""):t],i=e||/^find/.test(t);u&&(An.prototype[t]=function(){function t(n){return n=u.apply(An,a([n],f)),e&&h?n[0]:n}var o=this.__wrapped__,f=e?[1]:arguments,c=o instanceof Un,l=f[0],s=c||ff(o);s&&r&&typeof l=="function"&&1!=l.length&&(c=s=false);var h=this.__chain__,p=!!this.__actions__.length,l=i&&!h,c=c&&!p;
-return!i&&s?(o=c?o:new Un(this),o=n.apply(o,f),o.__actions__.push({func:Qe,args:[t],thisArg:T}),new On(o,h)):l&&c?n.apply(this,f):(o=this.thru(t),l?e?o.value()[0]:o.value():o)})}),r("pop push shift sort splice unshift".split(" "),function(n){var t=ri[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=/^(?:pop|shift)$/.test(n);An.prototype[n]=function(){var n=arguments;if(e&&!this.__chain__){var u=this.value();return t.apply(ff(u)?u:[],n)}return this[r](function(r){return t.apply(ff(r)?r:[],n)});
-}}),mt(Un.prototype,function(n,t){var r=An[t];if(r){var e=r.name+"";oi.call(Gi,e)||(Gi[e]=[]),Gi[e].push({name:t,func:r})}}),Gi[Jr(T,2).name]=[{name:"wrapper",func:T}],Un.prototype.clone=function(){var n=new Un(this.__wrapped__);return n.__actions__=Ur(this.__actions__),n.__dir__=this.__dir__,n.__filtered__=this.__filtered__,n.__iteratees__=Ur(this.__iteratees__),n.__takeCount__=this.__takeCount__,n.__views__=Ur(this.__views__),n},Un.prototype.reverse=function(){if(this.__filtered__){var n=new Un(this);
-n.__dir__=-1,n.__filtered__=true}else n=this.clone(),n.__dir__*=-1;return n},Un.prototype.value=function(){var n,t=this.__wrapped__.value(),r=this.__dir__,e=ff(t),u=0>r,i=e?t.length:0;n=i;for(var o=this.__views__,f=0,c=-1,a=o.length;++c<a;){var l=o[c],s=l.size;switch(l.type){case"drop":f+=s;break;case"dropRight":n-=s;break;case"take":n=Ci(n,f+s);break;case"takeRight":f=Ui(f,n-s)}}if(n={start:f,end:n},o=n.start,f=n.end,n=f-o,o=u?f:o-1,f=this.__iteratees__,c=f.length,a=0,l=Ci(n,this.__takeCount__),!e||!u&&i==n&&l==n)return wr(t,this.__actions__);
-e=[];n:for(;n--&&a<l;){for(o+=r,u=-1,i=t[o];++u<c;){var h=f[u],s=h.type,h=(0,h.iteratee)(i);if(2==s)i=h;else if(!h){if(1==s)continue n;break n}}e[a++]=i}return e},An.prototype.at=To,An.prototype.chain=function(){return Ye(this)},An.prototype.commit=function(){return new On(this.value(),this.__chain__)},An.prototype.next=function(){this.__values__===T&&(this.__values__=mu(this.value()));var n=this.__index__>=this.__values__.length;return{done:n,value:n?T:this.__values__[this.__index__++]}},An.prototype.plant=function(n){
-for(var t,r=this;r instanceof En;){var e=Fe(r);e.__index__=0,e.__values__=T,t?u.__wrapped__=e:t=e;var u=e,r=r.__wrapped__}return u.__wrapped__=n,t},An.prototype.reverse=function(){var n=this.__wrapped__;return n instanceof Un?(this.__actions__.length&&(n=new Un(this)),n=n.reverse(),n.__actions__.push({func:Qe,args:[Ge],thisArg:T}),new On(n,this.__chain__)):this.thru(Ge)},An.prototype.toJSON=An.prototype.valueOf=An.prototype.value=function(){return wr(this.__wrapped__,this.__actions__)},An.prototype.first=An.prototype.head,
-wi&&(An.prototype[wi]=Xe),An}();typeof define=="function"&&typeof define.amd=="object"&&define.amd?($n._=rt, define(function(){return rt})):Nn?((Nn.exports=rt)._=rt,Fn._=rt):$n._=rt}).call(this);
\ No newline at end of file
diff --git a/src/vendor/lodash/lodash.min.js b/src/vendor/lodash/lodash.min.js
new file mode 100644
index 0000000..4219da7
--- /dev/null
+++ b/src/vendor/lodash/lodash.min.js
@@ -0,0 +1,140 @@
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
+(function(){function n(n,t,r){switch(r.length){case 0:return n.call(t);case 1:return n.call(t,r[0]);case 2:return n.call(t,r[0],r[1]);case 3:return n.call(t,r[0],r[1],r[2])}return n.apply(t,r)}function t(n,t,r,e){for(var u=-1,i=null==n?0:n.length;++u<i;){var o=n[u];t(e,o,r(o),n)}return e}function r(n,t){for(var r=-1,e=null==n?0:n.length;++r<e&&t(n[r],r,n)!==!1;);return n}function e(n,t){for(var r=null==n?0:n.length;r--&&t(n[r],r,n)!==!1;);return n}function u(n,t){for(var r=-1,e=null==n?0:n.length;++r<e;)if(!t(n[r],r,n))return!1;
+return!0}function i(n,t){for(var r=-1,e=null==n?0:n.length,u=0,i=[];++r<e;){var o=n[r];t(o,r,n)&&(i[u++]=o)}return i}function o(n,t){return!!(null==n?0:n.length)&&y(n,t,0)>-1}function f(n,t,r){for(var e=-1,u=null==n?0:n.length;++e<u;)if(r(t,n[e]))return!0;return!1}function c(n,t){for(var r=-1,e=null==n?0:n.length,u=Array(e);++r<e;)u[r]=t(n[r],r,n);return u}function a(n,t){for(var r=-1,e=t.length,u=n.length;++r<e;)n[u+r]=t[r];return n}function l(n,t,r,e){var u=-1,i=null==n?0:n.length;for(e&&i&&(r=n[++u]);++u<i;)r=t(r,n[u],u,n);
+return r}function s(n,t,r,e){var u=null==n?0:n.length;for(e&&u&&(r=n[--u]);u--;)r=t(r,n[u],u,n);return r}function h(n,t){for(var r=-1,e=null==n?0:n.length;++r<e;)if(t(n[r],r,n))return!0;return!1}function p(n){return n.split("")}function _(n){return n.match($t)||[]}function v(n,t,r){var e;return r(n,function(n,r,u){if(t(n,r,u))return e=r,!1}),e}function g(n,t,r,e){for(var u=n.length,i=r+(e?1:-1);e?i--:++i<u;)if(t(n[i],i,n))return i;return-1}function y(n,t,r){return t===t?Z(n,t,r):g(n,b,r)}function d(n,t,r,e){
+for(var u=r-1,i=n.length;++u<i;)if(e(n[u],t))return u;return-1}function b(n){return n!==n}function w(n,t){var r=null==n?0:n.length;return r?k(n,t)/r:Cn}function m(n){return function(t){return null==t?X:t[n]}}function x(n){return function(t){return null==n?X:n[t]}}function j(n,t,r,e,u){return u(n,function(n,u,i){r=e?(e=!1,n):t(r,n,u,i)}),r}function A(n,t){var r=n.length;for(n.sort(t);r--;)n[r]=n[r].value;return n}function k(n,t){for(var r,e=-1,u=n.length;++e<u;){var i=t(n[e]);i!==X&&(r=r===X?i:r+i);
+}return r}function O(n,t){for(var r=-1,e=Array(n);++r<n;)e[r]=t(r);return e}function I(n,t){return c(t,function(t){return[t,n[t]]})}function R(n){return n?n.slice(0,H(n)+1).replace(Lt,""):n}function z(n){return function(t){return n(t)}}function E(n,t){return c(t,function(t){return n[t]})}function S(n,t){return n.has(t)}function W(n,t){for(var r=-1,e=n.length;++r<e&&y(t,n[r],0)>-1;);return r}function L(n,t){for(var r=n.length;r--&&y(t,n[r],0)>-1;);return r}function C(n,t){for(var r=n.length,e=0;r--;)n[r]===t&&++e;
+return e}function U(n){return"\\"+Yr[n]}function B(n,t){return null==n?X:n[t]}function T(n){return Nr.test(n)}function $(n){return Pr.test(n)}function D(n){for(var t,r=[];!(t=n.next()).done;)r.push(t.value);return r}function M(n){var t=-1,r=Array(n.size);return n.forEach(function(n,e){r[++t]=[e,n]}),r}function F(n,t){return function(r){return n(t(r))}}function N(n,t){for(var r=-1,e=n.length,u=0,i=[];++r<e;){var o=n[r];o!==t&&o!==cn||(n[r]=cn,i[u++]=r)}return i}function P(n){var t=-1,r=Array(n.size);
+return n.forEach(function(n){r[++t]=n}),r}function q(n){var t=-1,r=Array(n.size);return n.forEach(function(n){r[++t]=[n,n]}),r}function Z(n,t,r){for(var e=r-1,u=n.length;++e<u;)if(n[e]===t)return e;return-1}function K(n,t,r){for(var e=r+1;e--;)if(n[e]===t)return e;return e}function V(n){return T(n)?J(n):_e(n)}function G(n){return T(n)?Y(n):p(n)}function H(n){for(var t=n.length;t--&&Ct.test(n.charAt(t)););return t}function J(n){for(var t=Mr.lastIndex=0;Mr.test(n);)++t;return t}function Y(n){return n.match(Mr)||[];
+}function Q(n){return n.match(Fr)||[]}var X,nn="4.17.21",tn=200,rn="Unsupported core-js use. Try https://npms.io/search?q=ponyfill.",en="Expected a function",un="Invalid `variable` option passed into `_.template`",on="__lodash_hash_undefined__",fn=500,cn="__lodash_placeholder__",an=1,ln=2,sn=4,hn=1,pn=2,_n=1,vn=2,gn=4,yn=8,dn=16,bn=32,wn=64,mn=128,xn=256,jn=512,An=30,kn="...",On=800,In=16,Rn=1,zn=2,En=3,Sn=1/0,Wn=9007199254740991,Ln=1.7976931348623157e308,Cn=NaN,Un=4294967295,Bn=Un-1,Tn=Un>>>1,$n=[["ary",mn],["bind",_n],["bindKey",vn],["curry",yn],["curryRight",dn],["flip",jn],["partial",bn],["partialRight",wn],["rearg",xn]],Dn="[object Arguments]",Mn="[object Array]",Fn="[object AsyncFunction]",Nn="[object Boolean]",Pn="[object Date]",qn="[object DOMException]",Zn="[object Error]",Kn="[object Function]",Vn="[object GeneratorFunction]",Gn="[object Map]",Hn="[object Number]",Jn="[object Null]",Yn="[object Object]",Qn="[object Promise]",Xn="[object Proxy]",nt="[object RegExp]",tt="[object Set]",rt="[object String]",et="[object Symbol]",ut="[object Undefined]",it="[object WeakMap]",ot="[object WeakSet]",ft="[object ArrayBuffer]",ct="[object DataView]",at="[object Float32Array]",lt="[object Float64Array]",st="[object Int8Array]",ht="[object Int16Array]",pt="[object Int32Array]",_t="[object Uint8Array]",vt="[object Uint8ClampedArray]",gt="[object Uint16Array]",yt="[object Uint32Array]",dt=/\b__p \+= '';/g,bt=/\b(__p \+=) '' \+/g,wt=/(__e\(.*?\)|\b__t\)) \+\n'';/g,mt=/&(?:amp|lt|gt|quot|#39);/g,xt=/[&<>"']/g,jt=RegExp(mt.source),At=RegExp(xt.source),kt=/<%-([\s\S]+?)%>/g,Ot=/<%([\s\S]+?)%>/g,It=/<%=([\s\S]+?)%>/g,Rt=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,zt=/^\w*$/,Et=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,St=/[\\^$.*+?()[\]{}|]/g,Wt=RegExp(St.source),Lt=/^\s+/,Ct=/\s/,Ut=/\{(?:\n\/\* \[wrapped with .+\] \*\/)?\n?/,Bt=/\{\n\/\* \[wrapped with (.+)\] \*/,Tt=/,? & /,$t=/[^\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]+/g,Dt=/[()=,{}\[\]\/\s]/,Mt=/\\(\\)?/g,Ft=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,Nt=/\w*$/,Pt=/^[-+]0x[0-9a-f]+$/i,qt=/^0b[01]+$/i,Zt=/^\[object .+?Constructor\]$/,Kt=/^0o[0-7]+$/i,Vt=/^(?:0|[1-9]\d*)$/,Gt=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,Ht=/($^)/,Jt=/['\n\r\u2028\u2029\\]/g,Yt="\\ud800-\\udfff",Qt="\\u0300-\\u036f",Xt="\\ufe20-\\ufe2f",nr="\\u20d0-\\u20ff",tr=Qt+Xt+nr,rr="\\u2700-\\u27bf",er="a-z\\xdf-\\xf6\\xf8-\\xff",ur="\\xac\\xb1\\xd7\\xf7",ir="\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf",or="\\u2000-\\u206f",fr=" \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000",cr="A-Z\\xc0-\\xd6\\xd8-\\xde",ar="\\ufe0e\\ufe0f",lr=ur+ir+or+fr,sr="['\u2019]",hr="["+Yt+"]",pr="["+lr+"]",_r="["+tr+"]",vr="\\d+",gr="["+rr+"]",yr="["+er+"]",dr="[^"+Yt+lr+vr+rr+er+cr+"]",br="\\ud83c[\\udffb-\\udfff]",wr="(?:"+_r+"|"+br+")",mr="[^"+Yt+"]",xr="(?:\\ud83c[\\udde6-\\uddff]){2}",jr="[\\ud800-\\udbff][\\udc00-\\udfff]",Ar="["+cr+"]",kr="\\u200d",Or="(?:"+yr+"|"+dr+")",Ir="(?:"+Ar+"|"+dr+")",Rr="(?:"+sr+"(?:d|ll|m|re|s|t|ve))?",zr="(?:"+sr+"(?:D|LL|M|RE|S|T|VE))?",Er=wr+"?",Sr="["+ar+"]?",Wr="(?:"+kr+"(?:"+[mr,xr,jr].join("|")+")"+Sr+Er+")*",Lr="\\d*(?:1st|2nd|3rd|(?![123])\\dth)(?=\\b|[A-Z_])",Cr="\\d*(?:1ST|2ND|3RD|(?![123])\\dTH)(?=\\b|[a-z_])",Ur=Sr+Er+Wr,Br="(?:"+[gr,xr,jr].join("|")+")"+Ur,Tr="(?:"+[mr+_r+"?",_r,xr,jr,hr].join("|")+")",$r=RegExp(sr,"g"),Dr=RegExp(_r,"g"),Mr=RegExp(br+"(?="+br+")|"+Tr+Ur,"g"),Fr=RegExp([Ar+"?"+yr+"+"+Rr+"(?="+[pr,Ar,"$"].join("|")+")",Ir+"+"+zr+"(?="+[pr,Ar+Or,"$"].join("|")+")",Ar+"?"+Or+"+"+Rr,Ar+"+"+zr,Cr,Lr,vr,Br].join("|"),"g"),Nr=RegExp("["+kr+Yt+tr+ar+"]"),Pr=/[a-z][A-Z]|[A-Z]{2}[a-z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,qr=["Array","Buffer","DataView","Date","Error","Float32Array","Float64Array","Function","Int8Array","Int16Array","Int32Array","Map","Math","Object","Promise","RegExp","Set","String","Symbol","TypeError","Uint8Array","Uint8ClampedArray","Uint16Array","Uint32Array","WeakMap","_","clearTimeout","isFinite","parseInt","setTimeout"],Zr=-1,Kr={};
+Kr[at]=Kr[lt]=Kr[st]=Kr[ht]=Kr[pt]=Kr[_t]=Kr[vt]=Kr[gt]=Kr[yt]=!0,Kr[Dn]=Kr[Mn]=Kr[ft]=Kr[Nn]=Kr[ct]=Kr[Pn]=Kr[Zn]=Kr[Kn]=Kr[Gn]=Kr[Hn]=Kr[Yn]=Kr[nt]=Kr[tt]=Kr[rt]=Kr[it]=!1;var Vr={};Vr[Dn]=Vr[Mn]=Vr[ft]=Vr[ct]=Vr[Nn]=Vr[Pn]=Vr[at]=Vr[lt]=Vr[st]=Vr[ht]=Vr[pt]=Vr[Gn]=Vr[Hn]=Vr[Yn]=Vr[nt]=Vr[tt]=Vr[rt]=Vr[et]=Vr[_t]=Vr[vt]=Vr[gt]=Vr[yt]=!0,Vr[Zn]=Vr[Kn]=Vr[it]=!1;var Gr={"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a",
+"\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I","\xcd":"I","\xce":"I","\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae",
+"\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss","\u0100":"A","\u0102":"A","\u0104":"A","\u0101":"a","\u0103":"a","\u0105":"a","\u0106":"C","\u0108":"C","\u010a":"C","\u010c":"C","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\u010e":"D","\u0110":"D","\u010f":"d","\u0111":"d","\u0112":"E","\u0114":"E","\u0116":"E","\u0118":"E","\u011a":"E","\u0113":"e","\u0115":"e","\u0117":"e","\u0119":"e","\u011b":"e","\u011c":"G","\u011e":"G","\u0120":"G","\u0122":"G","\u011d":"g","\u011f":"g","\u0121":"g",
+"\u0123":"g","\u0124":"H","\u0126":"H","\u0125":"h","\u0127":"h","\u0128":"I","\u012a":"I","\u012c":"I","\u012e":"I","\u0130":"I","\u0129":"i","\u012b":"i","\u012d":"i","\u012f":"i","\u0131":"i","\u0134":"J","\u0135":"j","\u0136":"K","\u0137":"k","\u0138":"k","\u0139":"L","\u013b":"L","\u013d":"L","\u013f":"L","\u0141":"L","\u013a":"l","\u013c":"l","\u013e":"l","\u0140":"l","\u0142":"l","\u0143":"N","\u0145":"N","\u0147":"N","\u014a":"N","\u0144":"n","\u0146":"n","\u0148":"n","\u014b":"n","\u014c":"O",
+"\u014e":"O","\u0150":"O","\u014d":"o","\u014f":"o","\u0151":"o","\u0154":"R","\u0156":"R","\u0158":"R","\u0155":"r","\u0157":"r","\u0159":"r","\u015a":"S","\u015c":"S","\u015e":"S","\u0160":"S","\u015b":"s","\u015d":"s","\u015f":"s","\u0161":"s","\u0162":"T","\u0164":"T","\u0166":"T","\u0163":"t","\u0165":"t","\u0167":"t","\u0168":"U","\u016a":"U","\u016c":"U","\u016e":"U","\u0170":"U","\u0172":"U","\u0169":"u","\u016b":"u","\u016d":"u","\u016f":"u","\u0171":"u","\u0173":"u","\u0174":"W","\u0175":"w",
+"\u0176":"Y","\u0177":"y","\u0178":"Y","\u0179":"Z","\u017b":"Z","\u017d":"Z","\u017a":"z","\u017c":"z","\u017e":"z","\u0132":"IJ","\u0133":"ij","\u0152":"Oe","\u0153":"oe","\u0149":"'n","\u017f":"s"},Hr={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},Jr={"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'"},Yr={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},Qr=parseFloat,Xr=parseInt,ne="object"==typeof global&&global&&global.Object===Object&&global,te="object"==typeof self&&self&&self.Object===Object&&self,re=ne||te||Function("return this")(),ee="object"==typeof exports&&exports&&!exports.nodeType&&exports,ue=ee&&"object"==typeof module&&module&&!module.nodeType&&module,ie=ue&&ue.exports===ee,oe=ie&&ne.process,fe=function(){
+try{var n=ue&&ue.require&&ue.require("util").types;return n?n:oe&&oe.binding&&oe.binding("util")}catch(n){}}(),ce=fe&&fe.isArrayBuffer,ae=fe&&fe.isDate,le=fe&&fe.isMap,se=fe&&fe.isRegExp,he=fe&&fe.isSet,pe=fe&&fe.isTypedArray,_e=m("length"),ve=x(Gr),ge=x(Hr),ye=x(Jr),de=function p(x){function Z(n){if(cc(n)&&!bh(n)&&!(n instanceof Ct)){if(n instanceof Y)return n;if(bl.call(n,"__wrapped__"))return eo(n)}return new Y(n)}function J(){}function Y(n,t){this.__wrapped__=n,this.__actions__=[],this.__chain__=!!t,
+this.__index__=0,this.__values__=X}function Ct(n){this.__wrapped__=n,this.__actions__=[],this.__dir__=1,this.__filtered__=!1,this.__iteratees__=[],this.__takeCount__=Un,this.__views__=[]}function $t(){var n=new Ct(this.__wrapped__);return n.__actions__=Tu(this.__actions__),n.__dir__=this.__dir__,n.__filtered__=this.__filtered__,n.__iteratees__=Tu(this.__iteratees__),n.__takeCount__=this.__takeCount__,n.__views__=Tu(this.__views__),n}function Yt(){if(this.__filtered__){var n=new Ct(this);n.__dir__=-1,
+n.__filtered__=!0}else n=this.clone(),n.__dir__*=-1;return n}function Qt(){var n=this.__wrapped__.value(),t=this.__dir__,r=bh(n),e=t<0,u=r?n.length:0,i=Oi(0,u,this.__views__),o=i.start,f=i.end,c=f-o,a=e?f:o-1,l=this.__iteratees__,s=l.length,h=0,p=Hl(c,this.__takeCount__);if(!r||!e&&u==c&&p==c)return wu(n,this.__actions__);var _=[];n:for(;c--&&h<p;){a+=t;for(var v=-1,g=n[a];++v<s;){var y=l[v],d=y.iteratee,b=y.type,w=d(g);if(b==zn)g=w;else if(!w){if(b==Rn)continue n;break n}}_[h++]=g}return _}function Xt(n){
+var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function nr(){this.__data__=is?is(null):{},this.size=0}function tr(n){var t=this.has(n)&&delete this.__data__[n];return this.size-=t?1:0,t}function rr(n){var t=this.__data__;if(is){var r=t[n];return r===on?X:r}return bl.call(t,n)?t[n]:X}function er(n){var t=this.__data__;return is?t[n]!==X:bl.call(t,n)}function ur(n,t){var r=this.__data__;return this.size+=this.has(n)?0:1,r[n]=is&&t===X?on:t,this}function ir(n){
+var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function or(){this.__data__=[],this.size=0}function fr(n){var t=this.__data__,r=Wr(t,n);return!(r<0)&&(r==t.length-1?t.pop():Ll.call(t,r,1),--this.size,!0)}function cr(n){var t=this.__data__,r=Wr(t,n);return r<0?X:t[r][1]}function ar(n){return Wr(this.__data__,n)>-1}function lr(n,t){var r=this.__data__,e=Wr(r,n);return e<0?(++this.size,r.push([n,t])):r[e][1]=t,this}function sr(n){var t=-1,r=null==n?0:n.length;for(this.clear();++t<r;){
+var e=n[t];this.set(e[0],e[1])}}function hr(){this.size=0,this.__data__={hash:new Xt,map:new(ts||ir),string:new Xt}}function pr(n){var t=xi(this,n).delete(n);return this.size-=t?1:0,t}function _r(n){return xi(this,n).get(n)}function vr(n){return xi(this,n).has(n)}function gr(n,t){var r=xi(this,n),e=r.size;return r.set(n,t),this.size+=r.size==e?0:1,this}function yr(n){var t=-1,r=null==n?0:n.length;for(this.__data__=new sr;++t<r;)this.add(n[t])}function dr(n){return this.__data__.set(n,on),this}function br(n){
+return this.__data__.has(n)}function wr(n){this.size=(this.__data__=new ir(n)).size}function mr(){this.__data__=new ir,this.size=0}function xr(n){var t=this.__data__,r=t.delete(n);return this.size=t.size,r}function jr(n){return this.__data__.get(n)}function Ar(n){return this.__data__.has(n)}function kr(n,t){var r=this.__data__;if(r instanceof ir){var e=r.__data__;if(!ts||e.length<tn-1)return e.push([n,t]),this.size=++r.size,this;r=this.__data__=new sr(e)}return r.set(n,t),this.size=r.size,this}function Or(n,t){
+var r=bh(n),e=!r&&dh(n),u=!r&&!e&&mh(n),i=!r&&!e&&!u&&Oh(n),o=r||e||u||i,f=o?O(n.length,hl):[],c=f.length;for(var a in n)!t&&!bl.call(n,a)||o&&("length"==a||u&&("offset"==a||"parent"==a)||i&&("buffer"==a||"byteLength"==a||"byteOffset"==a)||Ci(a,c))||f.push(a);return f}function Ir(n){var t=n.length;return t?n[tu(0,t-1)]:X}function Rr(n,t){return Xi(Tu(n),Mr(t,0,n.length))}function zr(n){return Xi(Tu(n))}function Er(n,t,r){(r===X||Gf(n[t],r))&&(r!==X||t in n)||Br(n,t,r)}function Sr(n,t,r){var e=n[t];
+bl.call(n,t)&&Gf(e,r)&&(r!==X||t in n)||Br(n,t,r)}function Wr(n,t){for(var r=n.length;r--;)if(Gf(n[r][0],t))return r;return-1}function Lr(n,t,r,e){return ys(n,function(n,u,i){t(e,n,r(n),i)}),e}function Cr(n,t){return n&&$u(t,Pc(t),n)}function Ur(n,t){return n&&$u(t,qc(t),n)}function Br(n,t,r){"__proto__"==t&&Tl?Tl(n,t,{configurable:!0,enumerable:!0,value:r,writable:!0}):n[t]=r}function Tr(n,t){for(var r=-1,e=t.length,u=il(e),i=null==n;++r<e;)u[r]=i?X:Mc(n,t[r]);return u}function Mr(n,t,r){return n===n&&(r!==X&&(n=n<=r?n:r),
+t!==X&&(n=n>=t?n:t)),n}function Fr(n,t,e,u,i,o){var f,c=t&an,a=t&ln,l=t&sn;if(e&&(f=i?e(n,u,i,o):e(n)),f!==X)return f;if(!fc(n))return n;var s=bh(n);if(s){if(f=zi(n),!c)return Tu(n,f)}else{var h=zs(n),p=h==Kn||h==Vn;if(mh(n))return Iu(n,c);if(h==Yn||h==Dn||p&&!i){if(f=a||p?{}:Ei(n),!c)return a?Mu(n,Ur(f,n)):Du(n,Cr(f,n))}else{if(!Vr[h])return i?n:{};f=Si(n,h,c)}}o||(o=new wr);var _=o.get(n);if(_)return _;o.set(n,f),kh(n)?n.forEach(function(r){f.add(Fr(r,t,e,r,n,o))}):jh(n)&&n.forEach(function(r,u){
+f.set(u,Fr(r,t,e,u,n,o))});var v=l?a?di:yi:a?qc:Pc,g=s?X:v(n);return r(g||n,function(r,u){g&&(u=r,r=n[u]),Sr(f,u,Fr(r,t,e,u,n,o))}),f}function Nr(n){var t=Pc(n);return function(r){return Pr(r,n,t)}}function Pr(n,t,r){var e=r.length;if(null==n)return!e;for(n=ll(n);e--;){var u=r[e],i=t[u],o=n[u];if(o===X&&!(u in n)||!i(o))return!1}return!0}function Gr(n,t,r){if("function"!=typeof n)throw new pl(en);return Ws(function(){n.apply(X,r)},t)}function Hr(n,t,r,e){var u=-1,i=o,a=!0,l=n.length,s=[],h=t.length;
+if(!l)return s;r&&(t=c(t,z(r))),e?(i=f,a=!1):t.length>=tn&&(i=S,a=!1,t=new yr(t));n:for(;++u<l;){var p=n[u],_=null==r?p:r(p);if(p=e||0!==p?p:0,a&&_===_){for(var v=h;v--;)if(t[v]===_)continue n;s.push(p)}else i(t,_,e)||s.push(p)}return s}function Jr(n,t){var r=!0;return ys(n,function(n,e,u){return r=!!t(n,e,u)}),r}function Yr(n,t,r){for(var e=-1,u=n.length;++e<u;){var i=n[e],o=t(i);if(null!=o&&(f===X?o===o&&!bc(o):r(o,f)))var f=o,c=i}return c}function ne(n,t,r,e){var u=n.length;for(r=kc(r),r<0&&(r=-r>u?0:u+r),
+e=e===X||e>u?u:kc(e),e<0&&(e+=u),e=r>e?0:Oc(e);r<e;)n[r++]=t;return n}function te(n,t){var r=[];return ys(n,function(n,e,u){t(n,e,u)&&r.push(n)}),r}function ee(n,t,r,e,u){var i=-1,o=n.length;for(r||(r=Li),u||(u=[]);++i<o;){var f=n[i];t>0&&r(f)?t>1?ee(f,t-1,r,e,u):a(u,f):e||(u[u.length]=f)}return u}function ue(n,t){return n&&bs(n,t,Pc)}function oe(n,t){return n&&ws(n,t,Pc)}function fe(n,t){return i(t,function(t){return uc(n[t])})}function _e(n,t){t=ku(t,n);for(var r=0,e=t.length;null!=n&&r<e;)n=n[no(t[r++])];
+return r&&r==e?n:X}function de(n,t,r){var e=t(n);return bh(n)?e:a(e,r(n))}function we(n){return null==n?n===X?ut:Jn:Bl&&Bl in ll(n)?ki(n):Ki(n)}function me(n,t){return n>t}function xe(n,t){return null!=n&&bl.call(n,t)}function je(n,t){return null!=n&&t in ll(n)}function Ae(n,t,r){return n>=Hl(t,r)&&n<Gl(t,r)}function ke(n,t,r){for(var e=r?f:o,u=n[0].length,i=n.length,a=i,l=il(i),s=1/0,h=[];a--;){var p=n[a];a&&t&&(p=c(p,z(t))),s=Hl(p.length,s),l[a]=!r&&(t||u>=120&&p.length>=120)?new yr(a&&p):X}p=n[0];
+var _=-1,v=l[0];n:for(;++_<u&&h.length<s;){var g=p[_],y=t?t(g):g;if(g=r||0!==g?g:0,!(v?S(v,y):e(h,y,r))){for(a=i;--a;){var d=l[a];if(!(d?S(d,y):e(n[a],y,r)))continue n}v&&v.push(y),h.push(g)}}return h}function Oe(n,t,r,e){return ue(n,function(n,u,i){t(e,r(n),u,i)}),e}function Ie(t,r,e){r=ku(r,t),t=Gi(t,r);var u=null==t?t:t[no(jo(r))];return null==u?X:n(u,t,e)}function Re(n){return cc(n)&&we(n)==Dn}function ze(n){return cc(n)&&we(n)==ft}function Ee(n){return cc(n)&&we(n)==Pn}function Se(n,t,r,e,u){
+return n===t||(null==n||null==t||!cc(n)&&!cc(t)?n!==n&&t!==t:We(n,t,r,e,Se,u))}function We(n,t,r,e,u,i){var o=bh(n),f=bh(t),c=o?Mn:zs(n),a=f?Mn:zs(t);c=c==Dn?Yn:c,a=a==Dn?Yn:a;var l=c==Yn,s=a==Yn,h=c==a;if(h&&mh(n)){if(!mh(t))return!1;o=!0,l=!1}if(h&&!l)return i||(i=new wr),o||Oh(n)?pi(n,t,r,e,u,i):_i(n,t,c,r,e,u,i);if(!(r&hn)){var p=l&&bl.call(n,"__wrapped__"),_=s&&bl.call(t,"__wrapped__");if(p||_){var v=p?n.value():n,g=_?t.value():t;return i||(i=new wr),u(v,g,r,e,i)}}return!!h&&(i||(i=new wr),vi(n,t,r,e,u,i));
+}function Le(n){return cc(n)&&zs(n)==Gn}function Ce(n,t,r,e){var u=r.length,i=u,o=!e;if(null==n)return!i;for(n=ll(n);u--;){var f=r[u];if(o&&f[2]?f[1]!==n[f[0]]:!(f[0]in n))return!1}for(;++u<i;){f=r[u];var c=f[0],a=n[c],l=f[1];if(o&&f[2]){if(a===X&&!(c in n))return!1}else{var s=new wr;if(e)var h=e(a,l,c,n,t,s);if(!(h===X?Se(l,a,hn|pn,e,s):h))return!1}}return!0}function Ue(n){return!(!fc(n)||Di(n))&&(uc(n)?kl:Zt).test(to(n))}function Be(n){return cc(n)&&we(n)==nt}function Te(n){return cc(n)&&zs(n)==tt;
+}function $e(n){return cc(n)&&oc(n.length)&&!!Kr[we(n)]}function De(n){return"function"==typeof n?n:null==n?La:"object"==typeof n?bh(n)?Ze(n[0],n[1]):qe(n):Fa(n)}function Me(n){if(!Mi(n))return Vl(n);var t=[];for(var r in ll(n))bl.call(n,r)&&"constructor"!=r&&t.push(r);return t}function Fe(n){if(!fc(n))return Zi(n);var t=Mi(n),r=[];for(var e in n)("constructor"!=e||!t&&bl.call(n,e))&&r.push(e);return r}function Ne(n,t){return n<t}function Pe(n,t){var r=-1,e=Hf(n)?il(n.length):[];return ys(n,function(n,u,i){
+e[++r]=t(n,u,i)}),e}function qe(n){var t=ji(n);return 1==t.length&&t[0][2]?Ni(t[0][0],t[0][1]):function(r){return r===n||Ce(r,n,t)}}function Ze(n,t){return Bi(n)&&Fi(t)?Ni(no(n),t):function(r){var e=Mc(r,n);return e===X&&e===t?Nc(r,n):Se(t,e,hn|pn)}}function Ke(n,t,r,e,u){n!==t&&bs(t,function(i,o){if(u||(u=new wr),fc(i))Ve(n,t,o,r,Ke,e,u);else{var f=e?e(Ji(n,o),i,o+"",n,t,u):X;f===X&&(f=i),Er(n,o,f)}},qc)}function Ve(n,t,r,e,u,i,o){var f=Ji(n,r),c=Ji(t,r),a=o.get(c);if(a)return Er(n,r,a),X;var l=i?i(f,c,r+"",n,t,o):X,s=l===X;
+if(s){var h=bh(c),p=!h&&mh(c),_=!h&&!p&&Oh(c);l=c,h||p||_?bh(f)?l=f:Jf(f)?l=Tu(f):p?(s=!1,l=Iu(c,!0)):_?(s=!1,l=Wu(c,!0)):l=[]:gc(c)||dh(c)?(l=f,dh(f)?l=Rc(f):fc(f)&&!uc(f)||(l=Ei(c))):s=!1}s&&(o.set(c,l),u(l,c,e,i,o),o.delete(c)),Er(n,r,l)}function Ge(n,t){var r=n.length;if(r)return t+=t<0?r:0,Ci(t,r)?n[t]:X}function He(n,t,r){t=t.length?c(t,function(n){return bh(n)?function(t){return _e(t,1===n.length?n[0]:n)}:n}):[La];var e=-1;return t=c(t,z(mi())),A(Pe(n,function(n,r,u){return{criteria:c(t,function(t){
+return t(n)}),index:++e,value:n}}),function(n,t){return Cu(n,t,r)})}function Je(n,t){return Ye(n,t,function(t,r){return Nc(n,r)})}function Ye(n,t,r){for(var e=-1,u=t.length,i={};++e<u;){var o=t[e],f=_e(n,o);r(f,o)&&fu(i,ku(o,n),f)}return i}function Qe(n){return function(t){return _e(t,n)}}function Xe(n,t,r,e){var u=e?d:y,i=-1,o=t.length,f=n;for(n===t&&(t=Tu(t)),r&&(f=c(n,z(r)));++i<o;)for(var a=0,l=t[i],s=r?r(l):l;(a=u(f,s,a,e))>-1;)f!==n&&Ll.call(f,a,1),Ll.call(n,a,1);return n}function nu(n,t){for(var r=n?t.length:0,e=r-1;r--;){
+var u=t[r];if(r==e||u!==i){var i=u;Ci(u)?Ll.call(n,u,1):yu(n,u)}}return n}function tu(n,t){return n+Nl(Ql()*(t-n+1))}function ru(n,t,r,e){for(var u=-1,i=Gl(Fl((t-n)/(r||1)),0),o=il(i);i--;)o[e?i:++u]=n,n+=r;return o}function eu(n,t){var r="";if(!n||t<1||t>Wn)return r;do t%2&&(r+=n),t=Nl(t/2),t&&(n+=n);while(t);return r}function uu(n,t){return Ls(Vi(n,t,La),n+"")}function iu(n){return Ir(ra(n))}function ou(n,t){var r=ra(n);return Xi(r,Mr(t,0,r.length))}function fu(n,t,r,e){if(!fc(n))return n;t=ku(t,n);
+for(var u=-1,i=t.length,o=i-1,f=n;null!=f&&++u<i;){var c=no(t[u]),a=r;if("__proto__"===c||"constructor"===c||"prototype"===c)return n;if(u!=o){var l=f[c];a=e?e(l,c,f):X,a===X&&(a=fc(l)?l:Ci(t[u+1])?[]:{})}Sr(f,c,a),f=f[c]}return n}function cu(n){return Xi(ra(n))}function au(n,t,r){var e=-1,u=n.length;t<0&&(t=-t>u?0:u+t),r=r>u?u:r,r<0&&(r+=u),u=t>r?0:r-t>>>0,t>>>=0;for(var i=il(u);++e<u;)i[e]=n[e+t];return i}function lu(n,t){var r;return ys(n,function(n,e,u){return r=t(n,e,u),!r}),!!r}function su(n,t,r){
+var e=0,u=null==n?e:n.length;if("number"==typeof t&&t===t&&u<=Tn){for(;e<u;){var i=e+u>>>1,o=n[i];null!==o&&!bc(o)&&(r?o<=t:o<t)?e=i+1:u=i}return u}return hu(n,t,La,r)}function hu(n,t,r,e){var u=0,i=null==n?0:n.length;if(0===i)return 0;t=r(t);for(var o=t!==t,f=null===t,c=bc(t),a=t===X;u<i;){var l=Nl((u+i)/2),s=r(n[l]),h=s!==X,p=null===s,_=s===s,v=bc(s);if(o)var g=e||_;else g=a?_&&(e||h):f?_&&h&&(e||!p):c?_&&h&&!p&&(e||!v):!p&&!v&&(e?s<=t:s<t);g?u=l+1:i=l}return Hl(i,Bn)}function pu(n,t){for(var r=-1,e=n.length,u=0,i=[];++r<e;){
+var o=n[r],f=t?t(o):o;if(!r||!Gf(f,c)){var c=f;i[u++]=0===o?0:o}}return i}function _u(n){return"number"==typeof n?n:bc(n)?Cn:+n}function vu(n){if("string"==typeof n)return n;if(bh(n))return c(n,vu)+"";if(bc(n))return vs?vs.call(n):"";var t=n+"";return"0"==t&&1/n==-Sn?"-0":t}function gu(n,t,r){var e=-1,u=o,i=n.length,c=!0,a=[],l=a;if(r)c=!1,u=f;else if(i>=tn){var s=t?null:ks(n);if(s)return P(s);c=!1,u=S,l=new yr}else l=t?[]:a;n:for(;++e<i;){var h=n[e],p=t?t(h):h;if(h=r||0!==h?h:0,c&&p===p){for(var _=l.length;_--;)if(l[_]===p)continue n;
+t&&l.push(p),a.push(h)}else u(l,p,r)||(l!==a&&l.push(p),a.push(h))}return a}function yu(n,t){return t=ku(t,n),n=Gi(n,t),null==n||delete n[no(jo(t))]}function du(n,t,r,e){return fu(n,t,r(_e(n,t)),e)}function bu(n,t,r,e){for(var u=n.length,i=e?u:-1;(e?i--:++i<u)&&t(n[i],i,n););return r?au(n,e?0:i,e?i+1:u):au(n,e?i+1:0,e?u:i)}function wu(n,t){var r=n;return r instanceof Ct&&(r=r.value()),l(t,function(n,t){return t.func.apply(t.thisArg,a([n],t.args))},r)}function mu(n,t,r){var e=n.length;if(e<2)return e?gu(n[0]):[];
+for(var u=-1,i=il(e);++u<e;)for(var o=n[u],f=-1;++f<e;)f!=u&&(i[u]=Hr(i[u]||o,n[f],t,r));return gu(ee(i,1),t,r)}function xu(n,t,r){for(var e=-1,u=n.length,i=t.length,o={};++e<u;){r(o,n[e],e<i?t[e]:X)}return o}function ju(n){return Jf(n)?n:[]}function Au(n){return"function"==typeof n?n:La}function ku(n,t){return bh(n)?n:Bi(n,t)?[n]:Cs(Ec(n))}function Ou(n,t,r){var e=n.length;return r=r===X?e:r,!t&&r>=e?n:au(n,t,r)}function Iu(n,t){if(t)return n.slice();var r=n.length,e=zl?zl(r):new n.constructor(r);
+return n.copy(e),e}function Ru(n){var t=new n.constructor(n.byteLength);return new Rl(t).set(new Rl(n)),t}function zu(n,t){return new n.constructor(t?Ru(n.buffer):n.buffer,n.byteOffset,n.byteLength)}function Eu(n){var t=new n.constructor(n.source,Nt.exec(n));return t.lastIndex=n.lastIndex,t}function Su(n){return _s?ll(_s.call(n)):{}}function Wu(n,t){return new n.constructor(t?Ru(n.buffer):n.buffer,n.byteOffset,n.length)}function Lu(n,t){if(n!==t){var r=n!==X,e=null===n,u=n===n,i=bc(n),o=t!==X,f=null===t,c=t===t,a=bc(t);
+if(!f&&!a&&!i&&n>t||i&&o&&c&&!f&&!a||e&&o&&c||!r&&c||!u)return 1;if(!e&&!i&&!a&&n<t||a&&r&&u&&!e&&!i||f&&r&&u||!o&&u||!c)return-1}return 0}function Cu(n,t,r){for(var e=-1,u=n.criteria,i=t.criteria,o=u.length,f=r.length;++e<o;){var c=Lu(u[e],i[e]);if(c){if(e>=f)return c;return c*("desc"==r[e]?-1:1)}}return n.index-t.index}function Uu(n,t,r,e){for(var u=-1,i=n.length,o=r.length,f=-1,c=t.length,a=Gl(i-o,0),l=il(c+a),s=!e;++f<c;)l[f]=t[f];for(;++u<o;)(s||u<i)&&(l[r[u]]=n[u]);for(;a--;)l[f++]=n[u++];return l;
+}function Bu(n,t,r,e){for(var u=-1,i=n.length,o=-1,f=r.length,c=-1,a=t.length,l=Gl(i-f,0),s=il(l+a),h=!e;++u<l;)s[u]=n[u];for(var p=u;++c<a;)s[p+c]=t[c];for(;++o<f;)(h||u<i)&&(s[p+r[o]]=n[u++]);return s}function Tu(n,t){var r=-1,e=n.length;for(t||(t=il(e));++r<e;)t[r]=n[r];return t}function $u(n,t,r,e){var u=!r;r||(r={});for(var i=-1,o=t.length;++i<o;){var f=t[i],c=e?e(r[f],n[f],f,r,n):X;c===X&&(c=n[f]),u?Br(r,f,c):Sr(r,f,c)}return r}function Du(n,t){return $u(n,Is(n),t)}function Mu(n,t){return $u(n,Rs(n),t);
+}function Fu(n,r){return function(e,u){var i=bh(e)?t:Lr,o=r?r():{};return i(e,n,mi(u,2),o)}}function Nu(n){return uu(function(t,r){var e=-1,u=r.length,i=u>1?r[u-1]:X,o=u>2?r[2]:X;for(i=n.length>3&&"function"==typeof i?(u--,i):X,o&&Ui(r[0],r[1],o)&&(i=u<3?X:i,u=1),t=ll(t);++e<u;){var f=r[e];f&&n(t,f,e,i)}return t})}function Pu(n,t){return function(r,e){if(null==r)return r;if(!Hf(r))return n(r,e);for(var u=r.length,i=t?u:-1,o=ll(r);(t?i--:++i<u)&&e(o[i],i,o)!==!1;);return r}}function qu(n){return function(t,r,e){
+for(var u=-1,i=ll(t),o=e(t),f=o.length;f--;){var c=o[n?f:++u];if(r(i[c],c,i)===!1)break}return t}}function Zu(n,t,r){function e(){return(this&&this!==re&&this instanceof e?i:n).apply(u?r:this,arguments)}var u=t&_n,i=Gu(n);return e}function Ku(n){return function(t){t=Ec(t);var r=T(t)?G(t):X,e=r?r[0]:t.charAt(0),u=r?Ou(r,1).join(""):t.slice(1);return e[n]()+u}}function Vu(n){return function(t){return l(Ra(ca(t).replace($r,"")),n,"")}}function Gu(n){return function(){var t=arguments;switch(t.length){
+case 0:return new n;case 1:return new n(t[0]);case 2:return new n(t[0],t[1]);case 3:return new n(t[0],t[1],t[2]);case 4:return new n(t[0],t[1],t[2],t[3]);case 5:return new n(t[0],t[1],t[2],t[3],t[4]);case 6:return new n(t[0],t[1],t[2],t[3],t[4],t[5]);case 7:return new n(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}var r=gs(n.prototype),e=n.apply(r,t);return fc(e)?e:r}}function Hu(t,r,e){function u(){for(var o=arguments.length,f=il(o),c=o,a=wi(u);c--;)f[c]=arguments[c];var l=o<3&&f[0]!==a&&f[o-1]!==a?[]:N(f,a);
+return o-=l.length,o<e?oi(t,r,Qu,u.placeholder,X,f,l,X,X,e-o):n(this&&this!==re&&this instanceof u?i:t,this,f)}var i=Gu(t);return u}function Ju(n){return function(t,r,e){var u=ll(t);if(!Hf(t)){var i=mi(r,3);t=Pc(t),r=function(n){return i(u[n],n,u)}}var o=n(t,r,e);return o>-1?u[i?t[o]:o]:X}}function Yu(n){return gi(function(t){var r=t.length,e=r,u=Y.prototype.thru;for(n&&t.reverse();e--;){var i=t[e];if("function"!=typeof i)throw new pl(en);if(u&&!o&&"wrapper"==bi(i))var o=new Y([],!0)}for(e=o?e:r;++e<r;){
+i=t[e];var f=bi(i),c="wrapper"==f?Os(i):X;o=c&&$i(c[0])&&c[1]==(mn|yn|bn|xn)&&!c[4].length&&1==c[9]?o[bi(c[0])].apply(o,c[3]):1==i.length&&$i(i)?o[f]():o.thru(i)}return function(){var n=arguments,e=n[0];if(o&&1==n.length&&bh(e))return o.plant(e).value();for(var u=0,i=r?t[u].apply(this,n):e;++u<r;)i=t[u].call(this,i);return i}})}function Qu(n,t,r,e,u,i,o,f,c,a){function l(){for(var y=arguments.length,d=il(y),b=y;b--;)d[b]=arguments[b];if(_)var w=wi(l),m=C(d,w);if(e&&(d=Uu(d,e,u,_)),i&&(d=Bu(d,i,o,_)),
+y-=m,_&&y<a){return oi(n,t,Qu,l.placeholder,r,d,N(d,w),f,c,a-y)}var x=h?r:this,j=p?x[n]:n;return y=d.length,f?d=Hi(d,f):v&&y>1&&d.reverse(),s&&c<y&&(d.length=c),this&&this!==re&&this instanceof l&&(j=g||Gu(j)),j.apply(x,d)}var s=t&mn,h=t&_n,p=t&vn,_=t&(yn|dn),v=t&jn,g=p?X:Gu(n);return l}function Xu(n,t){return function(r,e){return Oe(r,n,t(e),{})}}function ni(n,t){return function(r,e){var u;if(r===X&&e===X)return t;if(r!==X&&(u=r),e!==X){if(u===X)return e;"string"==typeof r||"string"==typeof e?(r=vu(r),
+e=vu(e)):(r=_u(r),e=_u(e)),u=n(r,e)}return u}}function ti(t){return gi(function(r){return r=c(r,z(mi())),uu(function(e){var u=this;return t(r,function(t){return n(t,u,e)})})})}function ri(n,t){t=t===X?" ":vu(t);var r=t.length;if(r<2)return r?eu(t,n):t;var e=eu(t,Fl(n/V(t)));return T(t)?Ou(G(e),0,n).join(""):e.slice(0,n)}function ei(t,r,e,u){function i(){for(var r=-1,c=arguments.length,a=-1,l=u.length,s=il(l+c),h=this&&this!==re&&this instanceof i?f:t;++a<l;)s[a]=u[a];for(;c--;)s[a++]=arguments[++r];
+return n(h,o?e:this,s)}var o=r&_n,f=Gu(t);return i}function ui(n){return function(t,r,e){return e&&"number"!=typeof e&&Ui(t,r,e)&&(r=e=X),t=Ac(t),r===X?(r=t,t=0):r=Ac(r),e=e===X?t<r?1:-1:Ac(e),ru(t,r,e,n)}}function ii(n){return function(t,r){return"string"==typeof t&&"string"==typeof r||(t=Ic(t),r=Ic(r)),n(t,r)}}function oi(n,t,r,e,u,i,o,f,c,a){var l=t&yn,s=l?o:X,h=l?X:o,p=l?i:X,_=l?X:i;t|=l?bn:wn,t&=~(l?wn:bn),t&gn||(t&=~(_n|vn));var v=[n,t,u,p,s,_,h,f,c,a],g=r.apply(X,v);return $i(n)&&Ss(g,v),g.placeholder=e,
+Yi(g,n,t)}function fi(n){var t=al[n];return function(n,r){if(n=Ic(n),r=null==r?0:Hl(kc(r),292),r&&Zl(n)){var e=(Ec(n)+"e").split("e");return e=(Ec(t(e[0]+"e"+(+e[1]+r)))+"e").split("e"),+(e[0]+"e"+(+e[1]-r))}return t(n)}}function ci(n){return function(t){var r=zs(t);return r==Gn?M(t):r==tt?q(t):I(t,n(t))}}function ai(n,t,r,e,u,i,o,f){var c=t&vn;if(!c&&"function"!=typeof n)throw new pl(en);var a=e?e.length:0;if(a||(t&=~(bn|wn),e=u=X),o=o===X?o:Gl(kc(o),0),f=f===X?f:kc(f),a-=u?u.length:0,t&wn){var l=e,s=u;
+e=u=X}var h=c?X:Os(n),p=[n,t,r,e,u,l,s,i,o,f];if(h&&qi(p,h),n=p[0],t=p[1],r=p[2],e=p[3],u=p[4],f=p[9]=p[9]===X?c?0:n.length:Gl(p[9]-a,0),!f&&t&(yn|dn)&&(t&=~(yn|dn)),t&&t!=_n)_=t==yn||t==dn?Hu(n,t,f):t!=bn&&t!=(_n|bn)||u.length?Qu.apply(X,p):ei(n,t,r,e);else var _=Zu(n,t,r);return Yi((h?ms:Ss)(_,p),n,t)}function li(n,t,r,e){return n===X||Gf(n,gl[r])&&!bl.call(e,r)?t:n}function si(n,t,r,e,u,i){return fc(n)&&fc(t)&&(i.set(t,n),Ke(n,t,X,si,i),i.delete(t)),n}function hi(n){return gc(n)?X:n}function pi(n,t,r,e,u,i){
+var o=r&hn,f=n.length,c=t.length;if(f!=c&&!(o&&c>f))return!1;var a=i.get(n),l=i.get(t);if(a&&l)return a==t&&l==n;var s=-1,p=!0,_=r&pn?new yr:X;for(i.set(n,t),i.set(t,n);++s<f;){var v=n[s],g=t[s];if(e)var y=o?e(g,v,s,t,n,i):e(v,g,s,n,t,i);if(y!==X){if(y)continue;p=!1;break}if(_){if(!h(t,function(n,t){if(!S(_,t)&&(v===n||u(v,n,r,e,i)))return _.push(t)})){p=!1;break}}else if(v!==g&&!u(v,g,r,e,i)){p=!1;break}}return i.delete(n),i.delete(t),p}function _i(n,t,r,e,u,i,o){switch(r){case ct:if(n.byteLength!=t.byteLength||n.byteOffset!=t.byteOffset)return!1;
+n=n.buffer,t=t.buffer;case ft:return!(n.byteLength!=t.byteLength||!i(new Rl(n),new Rl(t)));case Nn:case Pn:case Hn:return Gf(+n,+t);case Zn:return n.name==t.name&&n.message==t.message;case nt:case rt:return n==t+"";case Gn:var f=M;case tt:var c=e&hn;if(f||(f=P),n.size!=t.size&&!c)return!1;var a=o.get(n);if(a)return a==t;e|=pn,o.set(n,t);var l=pi(f(n),f(t),e,u,i,o);return o.delete(n),l;case et:if(_s)return _s.call(n)==_s.call(t)}return!1}function vi(n,t,r,e,u,i){var o=r&hn,f=yi(n),c=f.length;if(c!=yi(t).length&&!o)return!1;
+for(var a=c;a--;){var l=f[a];if(!(o?l in t:bl.call(t,l)))return!1}var s=i.get(n),h=i.get(t);if(s&&h)return s==t&&h==n;var p=!0;i.set(n,t),i.set(t,n);for(var _=o;++a<c;){l=f[a];var v=n[l],g=t[l];if(e)var y=o?e(g,v,l,t,n,i):e(v,g,l,n,t,i);if(!(y===X?v===g||u(v,g,r,e,i):y)){p=!1;break}_||(_="constructor"==l)}if(p&&!_){var d=n.constructor,b=t.constructor;d!=b&&"constructor"in n&&"constructor"in t&&!("function"==typeof d&&d instanceof d&&"function"==typeof b&&b instanceof b)&&(p=!1)}return i.delete(n),
+i.delete(t),p}function gi(n){return Ls(Vi(n,X,_o),n+"")}function yi(n){return de(n,Pc,Is)}function di(n){return de(n,qc,Rs)}function bi(n){for(var t=n.name+"",r=fs[t],e=bl.call(fs,t)?r.length:0;e--;){var u=r[e],i=u.func;if(null==i||i==n)return u.name}return t}function wi(n){return(bl.call(Z,"placeholder")?Z:n).placeholder}function mi(){var n=Z.iteratee||Ca;return n=n===Ca?De:n,arguments.length?n(arguments[0],arguments[1]):n}function xi(n,t){var r=n.__data__;return Ti(t)?r["string"==typeof t?"string":"hash"]:r.map;
+}function ji(n){for(var t=Pc(n),r=t.length;r--;){var e=t[r],u=n[e];t[r]=[e,u,Fi(u)]}return t}function Ai(n,t){var r=B(n,t);return Ue(r)?r:X}function ki(n){var t=bl.call(n,Bl),r=n[Bl];try{n[Bl]=X;var e=!0}catch(n){}var u=xl.call(n);return e&&(t?n[Bl]=r:delete n[Bl]),u}function Oi(n,t,r){for(var e=-1,u=r.length;++e<u;){var i=r[e],o=i.size;switch(i.type){case"drop":n+=o;break;case"dropRight":t-=o;break;case"take":t=Hl(t,n+o);break;case"takeRight":n=Gl(n,t-o)}}return{start:n,end:t}}function Ii(n){var t=n.match(Bt);
+return t?t[1].split(Tt):[]}function Ri(n,t,r){t=ku(t,n);for(var e=-1,u=t.length,i=!1;++e<u;){var o=no(t[e]);if(!(i=null!=n&&r(n,o)))break;n=n[o]}return i||++e!=u?i:(u=null==n?0:n.length,!!u&&oc(u)&&Ci(o,u)&&(bh(n)||dh(n)))}function zi(n){var t=n.length,r=new n.constructor(t);return t&&"string"==typeof n[0]&&bl.call(n,"index")&&(r.index=n.index,r.input=n.input),r}function Ei(n){return"function"!=typeof n.constructor||Mi(n)?{}:gs(El(n))}function Si(n,t,r){var e=n.constructor;switch(t){case ft:return Ru(n);
+case Nn:case Pn:return new e(+n);case ct:return zu(n,r);case at:case lt:case st:case ht:case pt:case _t:case vt:case gt:case yt:return Wu(n,r);case Gn:return new e;case Hn:case rt:return new e(n);case nt:return Eu(n);case tt:return new e;case et:return Su(n)}}function Wi(n,t){var r=t.length;if(!r)return n;var e=r-1;return t[e]=(r>1?"& ":"")+t[e],t=t.join(r>2?", ":" "),n.replace(Ut,"{\n/* [wrapped with "+t+"] */\n")}function Li(n){return bh(n)||dh(n)||!!(Cl&&n&&n[Cl])}function Ci(n,t){var r=typeof n;
+return t=null==t?Wn:t,!!t&&("number"==r||"symbol"!=r&&Vt.test(n))&&n>-1&&n%1==0&&n<t}function Ui(n,t,r){if(!fc(r))return!1;var e=typeof t;return!!("number"==e?Hf(r)&&Ci(t,r.length):"string"==e&&t in r)&&Gf(r[t],n)}function Bi(n,t){if(bh(n))return!1;var r=typeof n;return!("number"!=r&&"symbol"!=r&&"boolean"!=r&&null!=n&&!bc(n))||(zt.test(n)||!Rt.test(n)||null!=t&&n in ll(t))}function Ti(n){var t=typeof n;return"string"==t||"number"==t||"symbol"==t||"boolean"==t?"__proto__"!==n:null===n}function $i(n){
+var t=bi(n),r=Z[t];if("function"!=typeof r||!(t in Ct.prototype))return!1;if(n===r)return!0;var e=Os(r);return!!e&&n===e[0]}function Di(n){return!!ml&&ml in n}function Mi(n){var t=n&&n.constructor;return n===("function"==typeof t&&t.prototype||gl)}function Fi(n){return n===n&&!fc(n)}function Ni(n,t){return function(r){return null!=r&&(r[n]===t&&(t!==X||n in ll(r)))}}function Pi(n){var t=Cf(n,function(n){return r.size===fn&&r.clear(),n}),r=t.cache;return t}function qi(n,t){var r=n[1],e=t[1],u=r|e,i=u<(_n|vn|mn),o=e==mn&&r==yn||e==mn&&r==xn&&n[7].length<=t[8]||e==(mn|xn)&&t[7].length<=t[8]&&r==yn;
+if(!i&&!o)return n;e&_n&&(n[2]=t[2],u|=r&_n?0:gn);var f=t[3];if(f){var c=n[3];n[3]=c?Uu(c,f,t[4]):f,n[4]=c?N(n[3],cn):t[4]}return f=t[5],f&&(c=n[5],n[5]=c?Bu(c,f,t[6]):f,n[6]=c?N(n[5],cn):t[6]),f=t[7],f&&(n[7]=f),e&mn&&(n[8]=null==n[8]?t[8]:Hl(n[8],t[8])),null==n[9]&&(n[9]=t[9]),n[0]=t[0],n[1]=u,n}function Zi(n){var t=[];if(null!=n)for(var r in ll(n))t.push(r);return t}function Ki(n){return xl.call(n)}function Vi(t,r,e){return r=Gl(r===X?t.length-1:r,0),function(){for(var u=arguments,i=-1,o=Gl(u.length-r,0),f=il(o);++i<o;)f[i]=u[r+i];
+i=-1;for(var c=il(r+1);++i<r;)c[i]=u[i];return c[r]=e(f),n(t,this,c)}}function Gi(n,t){return t.length<2?n:_e(n,au(t,0,-1))}function Hi(n,t){for(var r=n.length,e=Hl(t.length,r),u=Tu(n);e--;){var i=t[e];n[e]=Ci(i,r)?u[i]:X}return n}function Ji(n,t){if(("constructor"!==t||"function"!=typeof n[t])&&"__proto__"!=t)return n[t]}function Yi(n,t,r){var e=t+"";return Ls(n,Wi(e,ro(Ii(e),r)))}function Qi(n){var t=0,r=0;return function(){var e=Jl(),u=In-(e-r);if(r=e,u>0){if(++t>=On)return arguments[0]}else t=0;
+return n.apply(X,arguments)}}function Xi(n,t){var r=-1,e=n.length,u=e-1;for(t=t===X?e:t;++r<t;){var i=tu(r,u),o=n[i];n[i]=n[r],n[r]=o}return n.length=t,n}function no(n){if("string"==typeof n||bc(n))return n;var t=n+"";return"0"==t&&1/n==-Sn?"-0":t}function to(n){if(null!=n){try{return dl.call(n)}catch(n){}try{return n+""}catch(n){}}return""}function ro(n,t){return r($n,function(r){var e="_."+r[0];t&r[1]&&!o(n,e)&&n.push(e)}),n.sort()}function eo(n){if(n instanceof Ct)return n.clone();var t=new Y(n.__wrapped__,n.__chain__);
+return t.__actions__=Tu(n.__actions__),t.__index__=n.__index__,t.__values__=n.__values__,t}function uo(n,t,r){t=(r?Ui(n,t,r):t===X)?1:Gl(kc(t),0);var e=null==n?0:n.length;if(!e||t<1)return[];for(var u=0,i=0,o=il(Fl(e/t));u<e;)o[i++]=au(n,u,u+=t);return o}function io(n){for(var t=-1,r=null==n?0:n.length,e=0,u=[];++t<r;){var i=n[t];i&&(u[e++]=i)}return u}function oo(){var n=arguments.length;if(!n)return[];for(var t=il(n-1),r=arguments[0],e=n;e--;)t[e-1]=arguments[e];return a(bh(r)?Tu(r):[r],ee(t,1));
+}function fo(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===X?1:kc(t),au(n,t<0?0:t,e)):[]}function co(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===X?1:kc(t),t=e-t,au(n,0,t<0?0:t)):[]}function ao(n,t){return n&&n.length?bu(n,mi(t,3),!0,!0):[]}function lo(n,t){return n&&n.length?bu(n,mi(t,3),!0):[]}function so(n,t,r,e){var u=null==n?0:n.length;return u?(r&&"number"!=typeof r&&Ui(n,t,r)&&(r=0,e=u),ne(n,t,r,e)):[]}function ho(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=null==r?0:kc(r);
+return u<0&&(u=Gl(e+u,0)),g(n,mi(t,3),u)}function po(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=e-1;return r!==X&&(u=kc(r),u=r<0?Gl(e+u,0):Hl(u,e-1)),g(n,mi(t,3),u,!0)}function _o(n){return(null==n?0:n.length)?ee(n,1):[]}function vo(n){return(null==n?0:n.length)?ee(n,Sn):[]}function go(n,t){return(null==n?0:n.length)?(t=t===X?1:kc(t),ee(n,t)):[]}function yo(n){for(var t=-1,r=null==n?0:n.length,e={};++t<r;){var u=n[t];e[u[0]]=u[1]}return e}function bo(n){return n&&n.length?n[0]:X}function wo(n,t,r){
+var e=null==n?0:n.length;if(!e)return-1;var u=null==r?0:kc(r);return u<0&&(u=Gl(e+u,0)),y(n,t,u)}function mo(n){return(null==n?0:n.length)?au(n,0,-1):[]}function xo(n,t){return null==n?"":Kl.call(n,t)}function jo(n){var t=null==n?0:n.length;return t?n[t-1]:X}function Ao(n,t,r){var e=null==n?0:n.length;if(!e)return-1;var u=e;return r!==X&&(u=kc(r),u=u<0?Gl(e+u,0):Hl(u,e-1)),t===t?K(n,t,u):g(n,b,u,!0)}function ko(n,t){return n&&n.length?Ge(n,kc(t)):X}function Oo(n,t){return n&&n.length&&t&&t.length?Xe(n,t):n;
+}function Io(n,t,r){return n&&n.length&&t&&t.length?Xe(n,t,mi(r,2)):n}function Ro(n,t,r){return n&&n.length&&t&&t.length?Xe(n,t,X,r):n}function zo(n,t){var r=[];if(!n||!n.length)return r;var e=-1,u=[],i=n.length;for(t=mi(t,3);++e<i;){var o=n[e];t(o,e,n)&&(r.push(o),u.push(e))}return nu(n,u),r}function Eo(n){return null==n?n:Xl.call(n)}function So(n,t,r){var e=null==n?0:n.length;return e?(r&&"number"!=typeof r&&Ui(n,t,r)?(t=0,r=e):(t=null==t?0:kc(t),r=r===X?e:kc(r)),au(n,t,r)):[]}function Wo(n,t){
+return su(n,t)}function Lo(n,t,r){return hu(n,t,mi(r,2))}function Co(n,t){var r=null==n?0:n.length;if(r){var e=su(n,t);if(e<r&&Gf(n[e],t))return e}return-1}function Uo(n,t){return su(n,t,!0)}function Bo(n,t,r){return hu(n,t,mi(r,2),!0)}function To(n,t){if(null==n?0:n.length){var r=su(n,t,!0)-1;if(Gf(n[r],t))return r}return-1}function $o(n){return n&&n.length?pu(n):[]}function Do(n,t){return n&&n.length?pu(n,mi(t,2)):[]}function Mo(n){var t=null==n?0:n.length;return t?au(n,1,t):[]}function Fo(n,t,r){
+return n&&n.length?(t=r||t===X?1:kc(t),au(n,0,t<0?0:t)):[]}function No(n,t,r){var e=null==n?0:n.length;return e?(t=r||t===X?1:kc(t),t=e-t,au(n,t<0?0:t,e)):[]}function Po(n,t){return n&&n.length?bu(n,mi(t,3),!1,!0):[]}function qo(n,t){return n&&n.length?bu(n,mi(t,3)):[]}function Zo(n){return n&&n.length?gu(n):[]}function Ko(n,t){return n&&n.length?gu(n,mi(t,2)):[]}function Vo(n,t){return t="function"==typeof t?t:X,n&&n.length?gu(n,X,t):[]}function Go(n){if(!n||!n.length)return[];var t=0;return n=i(n,function(n){
+if(Jf(n))return t=Gl(n.length,t),!0}),O(t,function(t){return c(n,m(t))})}function Ho(t,r){if(!t||!t.length)return[];var e=Go(t);return null==r?e:c(e,function(t){return n(r,X,t)})}function Jo(n,t){return xu(n||[],t||[],Sr)}function Yo(n,t){return xu(n||[],t||[],fu)}function Qo(n){var t=Z(n);return t.__chain__=!0,t}function Xo(n,t){return t(n),n}function nf(n,t){return t(n)}function tf(){return Qo(this)}function rf(){return new Y(this.value(),this.__chain__)}function ef(){this.__values__===X&&(this.__values__=jc(this.value()));
+var n=this.__index__>=this.__values__.length;return{done:n,value:n?X:this.__values__[this.__index__++]}}function uf(){return this}function of(n){for(var t,r=this;r instanceof J;){var e=eo(r);e.__index__=0,e.__values__=X,t?u.__wrapped__=e:t=e;var u=e;r=r.__wrapped__}return u.__wrapped__=n,t}function ff(){var n=this.__wrapped__;if(n instanceof Ct){var t=n;return this.__actions__.length&&(t=new Ct(this)),t=t.reverse(),t.__actions__.push({func:nf,args:[Eo],thisArg:X}),new Y(t,this.__chain__)}return this.thru(Eo);
+}function cf(){return wu(this.__wrapped__,this.__actions__)}function af(n,t,r){var e=bh(n)?u:Jr;return r&&Ui(n,t,r)&&(t=X),e(n,mi(t,3))}function lf(n,t){return(bh(n)?i:te)(n,mi(t,3))}function sf(n,t){return ee(yf(n,t),1)}function hf(n,t){return ee(yf(n,t),Sn)}function pf(n,t,r){return r=r===X?1:kc(r),ee(yf(n,t),r)}function _f(n,t){return(bh(n)?r:ys)(n,mi(t,3))}function vf(n,t){return(bh(n)?e:ds)(n,mi(t,3))}function gf(n,t,r,e){n=Hf(n)?n:ra(n),r=r&&!e?kc(r):0;var u=n.length;return r<0&&(r=Gl(u+r,0)),
+dc(n)?r<=u&&n.indexOf(t,r)>-1:!!u&&y(n,t,r)>-1}function yf(n,t){return(bh(n)?c:Pe)(n,mi(t,3))}function df(n,t,r,e){return null==n?[]:(bh(t)||(t=null==t?[]:[t]),r=e?X:r,bh(r)||(r=null==r?[]:[r]),He(n,t,r))}function bf(n,t,r){var e=bh(n)?l:j,u=arguments.length<3;return e(n,mi(t,4),r,u,ys)}function wf(n,t,r){var e=bh(n)?s:j,u=arguments.length<3;return e(n,mi(t,4),r,u,ds)}function mf(n,t){return(bh(n)?i:te)(n,Uf(mi(t,3)))}function xf(n){return(bh(n)?Ir:iu)(n)}function jf(n,t,r){return t=(r?Ui(n,t,r):t===X)?1:kc(t),
+(bh(n)?Rr:ou)(n,t)}function Af(n){return(bh(n)?zr:cu)(n)}function kf(n){if(null==n)return 0;if(Hf(n))return dc(n)?V(n):n.length;var t=zs(n);return t==Gn||t==tt?n.size:Me(n).length}function Of(n,t,r){var e=bh(n)?h:lu;return r&&Ui(n,t,r)&&(t=X),e(n,mi(t,3))}function If(n,t){if("function"!=typeof t)throw new pl(en);return n=kc(n),function(){if(--n<1)return t.apply(this,arguments)}}function Rf(n,t,r){return t=r?X:t,t=n&&null==t?n.length:t,ai(n,mn,X,X,X,X,t)}function zf(n,t){var r;if("function"!=typeof t)throw new pl(en);
+return n=kc(n),function(){return--n>0&&(r=t.apply(this,arguments)),n<=1&&(t=X),r}}function Ef(n,t,r){t=r?X:t;var e=ai(n,yn,X,X,X,X,X,t);return e.placeholder=Ef.placeholder,e}function Sf(n,t,r){t=r?X:t;var e=ai(n,dn,X,X,X,X,X,t);return e.placeholder=Sf.placeholder,e}function Wf(n,t,r){function e(t){var r=h,e=p;return h=p=X,d=t,v=n.apply(e,r)}function u(n){return d=n,g=Ws(f,t),b?e(n):v}function i(n){var r=n-y,e=n-d,u=t-r;return w?Hl(u,_-e):u}function o(n){var r=n-y,e=n-d;return y===X||r>=t||r<0||w&&e>=_;
+}function f(){var n=fh();return o(n)?c(n):(g=Ws(f,i(n)),X)}function c(n){return g=X,m&&h?e(n):(h=p=X,v)}function a(){g!==X&&As(g),d=0,h=y=p=g=X}function l(){return g===X?v:c(fh())}function s(){var n=fh(),r=o(n);if(h=arguments,p=this,y=n,r){if(g===X)return u(y);if(w)return As(g),g=Ws(f,t),e(y)}return g===X&&(g=Ws(f,t)),v}var h,p,_,v,g,y,d=0,b=!1,w=!1,m=!0;if("function"!=typeof n)throw new pl(en);return t=Ic(t)||0,fc(r)&&(b=!!r.leading,w="maxWait"in r,_=w?Gl(Ic(r.maxWait)||0,t):_,m="trailing"in r?!!r.trailing:m),
+s.cancel=a,s.flush=l,s}function Lf(n){return ai(n,jn)}function Cf(n,t){if("function"!=typeof n||null!=t&&"function"!=typeof t)throw new pl(en);var r=function(){var e=arguments,u=t?t.apply(this,e):e[0],i=r.cache;if(i.has(u))return i.get(u);var o=n.apply(this,e);return r.cache=i.set(u,o)||i,o};return r.cache=new(Cf.Cache||sr),r}function Uf(n){if("function"!=typeof n)throw new pl(en);return function(){var t=arguments;switch(t.length){case 0:return!n.call(this);case 1:return!n.call(this,t[0]);case 2:
+return!n.call(this,t[0],t[1]);case 3:return!n.call(this,t[0],t[1],t[2])}return!n.apply(this,t)}}function Bf(n){return zf(2,n)}function Tf(n,t){if("function"!=typeof n)throw new pl(en);return t=t===X?t:kc(t),uu(n,t)}function $f(t,r){if("function"!=typeof t)throw new pl(en);return r=null==r?0:Gl(kc(r),0),uu(function(e){var u=e[r],i=Ou(e,0,r);return u&&a(i,u),n(t,this,i)})}function Df(n,t,r){var e=!0,u=!0;if("function"!=typeof n)throw new pl(en);return fc(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),
+Wf(n,t,{leading:e,maxWait:t,trailing:u})}function Mf(n){return Rf(n,1)}function Ff(n,t){return ph(Au(t),n)}function Nf(){if(!arguments.length)return[];var n=arguments[0];return bh(n)?n:[n]}function Pf(n){return Fr(n,sn)}function qf(n,t){return t="function"==typeof t?t:X,Fr(n,sn,t)}function Zf(n){return Fr(n,an|sn)}function Kf(n,t){return t="function"==typeof t?t:X,Fr(n,an|sn,t)}function Vf(n,t){return null==t||Pr(n,t,Pc(t))}function Gf(n,t){return n===t||n!==n&&t!==t}function Hf(n){return null!=n&&oc(n.length)&&!uc(n);
+}function Jf(n){return cc(n)&&Hf(n)}function Yf(n){return n===!0||n===!1||cc(n)&&we(n)==Nn}function Qf(n){return cc(n)&&1===n.nodeType&&!gc(n)}function Xf(n){if(null==n)return!0;if(Hf(n)&&(bh(n)||"string"==typeof n||"function"==typeof n.splice||mh(n)||Oh(n)||dh(n)))return!n.length;var t=zs(n);if(t==Gn||t==tt)return!n.size;if(Mi(n))return!Me(n).length;for(var r in n)if(bl.call(n,r))return!1;return!0}function nc(n,t){return Se(n,t)}function tc(n,t,r){r="function"==typeof r?r:X;var e=r?r(n,t):X;return e===X?Se(n,t,X,r):!!e;
+}function rc(n){if(!cc(n))return!1;var t=we(n);return t==Zn||t==qn||"string"==typeof n.message&&"string"==typeof n.name&&!gc(n)}function ec(n){return"number"==typeof n&&Zl(n)}function uc(n){if(!fc(n))return!1;var t=we(n);return t==Kn||t==Vn||t==Fn||t==Xn}function ic(n){return"number"==typeof n&&n==kc(n)}function oc(n){return"number"==typeof n&&n>-1&&n%1==0&&n<=Wn}function fc(n){var t=typeof n;return null!=n&&("object"==t||"function"==t)}function cc(n){return null!=n&&"object"==typeof n}function ac(n,t){
+return n===t||Ce(n,t,ji(t))}function lc(n,t,r){return r="function"==typeof r?r:X,Ce(n,t,ji(t),r)}function sc(n){return vc(n)&&n!=+n}function hc(n){if(Es(n))throw new fl(rn);return Ue(n)}function pc(n){return null===n}function _c(n){return null==n}function vc(n){return"number"==typeof n||cc(n)&&we(n)==Hn}function gc(n){if(!cc(n)||we(n)!=Yn)return!1;var t=El(n);if(null===t)return!0;var r=bl.call(t,"constructor")&&t.constructor;return"function"==typeof r&&r instanceof r&&dl.call(r)==jl}function yc(n){
+return ic(n)&&n>=-Wn&&n<=Wn}function dc(n){return"string"==typeof n||!bh(n)&&cc(n)&&we(n)==rt}function bc(n){return"symbol"==typeof n||cc(n)&&we(n)==et}function wc(n){return n===X}function mc(n){return cc(n)&&zs(n)==it}function xc(n){return cc(n)&&we(n)==ot}function jc(n){if(!n)return[];if(Hf(n))return dc(n)?G(n):Tu(n);if(Ul&&n[Ul])return D(n[Ul]());var t=zs(n);return(t==Gn?M:t==tt?P:ra)(n)}function Ac(n){if(!n)return 0===n?n:0;if(n=Ic(n),n===Sn||n===-Sn){return(n<0?-1:1)*Ln}return n===n?n:0}function kc(n){
+var t=Ac(n),r=t%1;return t===t?r?t-r:t:0}function Oc(n){return n?Mr(kc(n),0,Un):0}function Ic(n){if("number"==typeof n)return n;if(bc(n))return Cn;if(fc(n)){var t="function"==typeof n.valueOf?n.valueOf():n;n=fc(t)?t+"":t}if("string"!=typeof n)return 0===n?n:+n;n=R(n);var r=qt.test(n);return r||Kt.test(n)?Xr(n.slice(2),r?2:8):Pt.test(n)?Cn:+n}function Rc(n){return $u(n,qc(n))}function zc(n){return n?Mr(kc(n),-Wn,Wn):0===n?n:0}function Ec(n){return null==n?"":vu(n)}function Sc(n,t){var r=gs(n);return null==t?r:Cr(r,t);
+}function Wc(n,t){return v(n,mi(t,3),ue)}function Lc(n,t){return v(n,mi(t,3),oe)}function Cc(n,t){return null==n?n:bs(n,mi(t,3),qc)}function Uc(n,t){return null==n?n:ws(n,mi(t,3),qc)}function Bc(n,t){return n&&ue(n,mi(t,3))}function Tc(n,t){return n&&oe(n,mi(t,3))}function $c(n){return null==n?[]:fe(n,Pc(n))}function Dc(n){return null==n?[]:fe(n,qc(n))}function Mc(n,t,r){var e=null==n?X:_e(n,t);return e===X?r:e}function Fc(n,t){return null!=n&&Ri(n,t,xe)}function Nc(n,t){return null!=n&&Ri(n,t,je);
+}function Pc(n){return Hf(n)?Or(n):Me(n)}function qc(n){return Hf(n)?Or(n,!0):Fe(n)}function Zc(n,t){var r={};return t=mi(t,3),ue(n,function(n,e,u){Br(r,t(n,e,u),n)}),r}function Kc(n,t){var r={};return t=mi(t,3),ue(n,function(n,e,u){Br(r,e,t(n,e,u))}),r}function Vc(n,t){return Gc(n,Uf(mi(t)))}function Gc(n,t){if(null==n)return{};var r=c(di(n),function(n){return[n]});return t=mi(t),Ye(n,r,function(n,r){return t(n,r[0])})}function Hc(n,t,r){t=ku(t,n);var e=-1,u=t.length;for(u||(u=1,n=X);++e<u;){var i=null==n?X:n[no(t[e])];
+i===X&&(e=u,i=r),n=uc(i)?i.call(n):i}return n}function Jc(n,t,r){return null==n?n:fu(n,t,r)}function Yc(n,t,r,e){return e="function"==typeof e?e:X,null==n?n:fu(n,t,r,e)}function Qc(n,t,e){var u=bh(n),i=u||mh(n)||Oh(n);if(t=mi(t,4),null==e){var o=n&&n.constructor;e=i?u?new o:[]:fc(n)&&uc(o)?gs(El(n)):{}}return(i?r:ue)(n,function(n,r,u){return t(e,n,r,u)}),e}function Xc(n,t){return null==n||yu(n,t)}function na(n,t,r){return null==n?n:du(n,t,Au(r))}function ta(n,t,r,e){return e="function"==typeof e?e:X,
+null==n?n:du(n,t,Au(r),e)}function ra(n){return null==n?[]:E(n,Pc(n))}function ea(n){return null==n?[]:E(n,qc(n))}function ua(n,t,r){return r===X&&(r=t,t=X),r!==X&&(r=Ic(r),r=r===r?r:0),t!==X&&(t=Ic(t),t=t===t?t:0),Mr(Ic(n),t,r)}function ia(n,t,r){return t=Ac(t),r===X?(r=t,t=0):r=Ac(r),n=Ic(n),Ae(n,t,r)}function oa(n,t,r){if(r&&"boolean"!=typeof r&&Ui(n,t,r)&&(t=r=X),r===X&&("boolean"==typeof t?(r=t,t=X):"boolean"==typeof n&&(r=n,n=X)),n===X&&t===X?(n=0,t=1):(n=Ac(n),t===X?(t=n,n=0):t=Ac(t)),n>t){
+var e=n;n=t,t=e}if(r||n%1||t%1){var u=Ql();return Hl(n+u*(t-n+Qr("1e-"+((u+"").length-1))),t)}return tu(n,t)}function fa(n){return Qh(Ec(n).toLowerCase())}function ca(n){return n=Ec(n),n&&n.replace(Gt,ve).replace(Dr,"")}function aa(n,t,r){n=Ec(n),t=vu(t);var e=n.length;r=r===X?e:Mr(kc(r),0,e);var u=r;return r-=t.length,r>=0&&n.slice(r,u)==t}function la(n){return n=Ec(n),n&&At.test(n)?n.replace(xt,ge):n}function sa(n){return n=Ec(n),n&&Wt.test(n)?n.replace(St,"\\$&"):n}function ha(n,t,r){n=Ec(n),t=kc(t);
+var e=t?V(n):0;if(!t||e>=t)return n;var u=(t-e)/2;return ri(Nl(u),r)+n+ri(Fl(u),r)}function pa(n,t,r){n=Ec(n),t=kc(t);var e=t?V(n):0;return t&&e<t?n+ri(t-e,r):n}function _a(n,t,r){n=Ec(n),t=kc(t);var e=t?V(n):0;return t&&e<t?ri(t-e,r)+n:n}function va(n,t,r){return r||null==t?t=0:t&&(t=+t),Yl(Ec(n).replace(Lt,""),t||0)}function ga(n,t,r){return t=(r?Ui(n,t,r):t===X)?1:kc(t),eu(Ec(n),t)}function ya(){var n=arguments,t=Ec(n[0]);return n.length<3?t:t.replace(n[1],n[2])}function da(n,t,r){return r&&"number"!=typeof r&&Ui(n,t,r)&&(t=r=X),
+(r=r===X?Un:r>>>0)?(n=Ec(n),n&&("string"==typeof t||null!=t&&!Ah(t))&&(t=vu(t),!t&&T(n))?Ou(G(n),0,r):n.split(t,r)):[]}function ba(n,t,r){return n=Ec(n),r=null==r?0:Mr(kc(r),0,n.length),t=vu(t),n.slice(r,r+t.length)==t}function wa(n,t,r){var e=Z.templateSettings;r&&Ui(n,t,r)&&(t=X),n=Ec(n),t=Sh({},t,e,li);var u,i,o=Sh({},t.imports,e.imports,li),f=Pc(o),c=E(o,f),a=0,l=t.interpolate||Ht,s="__p += '",h=sl((t.escape||Ht).source+"|"+l.source+"|"+(l===It?Ft:Ht).source+"|"+(t.evaluate||Ht).source+"|$","g"),p="//# sourceURL="+(bl.call(t,"sourceURL")?(t.sourceURL+"").replace(/\s/g," "):"lodash.templateSources["+ ++Zr+"]")+"\n";
+n.replace(h,function(t,r,e,o,f,c){return e||(e=o),s+=n.slice(a,c).replace(Jt,U),r&&(u=!0,s+="' +\n__e("+r+") +\n'"),f&&(i=!0,s+="';\n"+f+";\n__p += '"),e&&(s+="' +\n((__t = ("+e+")) == null ? '' : __t) +\n'"),a=c+t.length,t}),s+="';\n";var _=bl.call(t,"variable")&&t.variable;if(_){if(Dt.test(_))throw new fl(un)}else s="with (obj) {\n"+s+"\n}\n";s=(i?s.replace(dt,""):s).replace(bt,"$1").replace(wt,"$1;"),s="function("+(_||"obj")+") {\n"+(_?"":"obj || (obj = {});\n")+"var __t, __p = ''"+(u?", __e = _.escape":"")+(i?", __j = Array.prototype.join;\nfunction print() { __p += __j.call(arguments, '') }\n":";\n")+s+"return __p\n}";
+var v=Xh(function(){return cl(f,p+"return "+s).apply(X,c)});if(v.source=s,rc(v))throw v;return v}function ma(n){return Ec(n).toLowerCase()}function xa(n){return Ec(n).toUpperCase()}function ja(n,t,r){if(n=Ec(n),n&&(r||t===X))return R(n);if(!n||!(t=vu(t)))return n;var e=G(n),u=G(t);return Ou(e,W(e,u),L(e,u)+1).join("")}function Aa(n,t,r){if(n=Ec(n),n&&(r||t===X))return n.slice(0,H(n)+1);if(!n||!(t=vu(t)))return n;var e=G(n);return Ou(e,0,L(e,G(t))+1).join("")}function ka(n,t,r){if(n=Ec(n),n&&(r||t===X))return n.replace(Lt,"");
+if(!n||!(t=vu(t)))return n;var e=G(n);return Ou(e,W(e,G(t))).join("")}function Oa(n,t){var r=An,e=kn;if(fc(t)){var u="separator"in t?t.separator:u;r="length"in t?kc(t.length):r,e="omission"in t?vu(t.omission):e}n=Ec(n);var i=n.length;if(T(n)){var o=G(n);i=o.length}if(r>=i)return n;var f=r-V(e);if(f<1)return e;var c=o?Ou(o,0,f).join(""):n.slice(0,f);if(u===X)return c+e;if(o&&(f+=c.length-f),Ah(u)){if(n.slice(f).search(u)){var a,l=c;for(u.global||(u=sl(u.source,Ec(Nt.exec(u))+"g")),u.lastIndex=0;a=u.exec(l);)var s=a.index;
+c=c.slice(0,s===X?f:s)}}else if(n.indexOf(vu(u),f)!=f){var h=c.lastIndexOf(u);h>-1&&(c=c.slice(0,h))}return c+e}function Ia(n){return n=Ec(n),n&&jt.test(n)?n.replace(mt,ye):n}function Ra(n,t,r){return n=Ec(n),t=r?X:t,t===X?$(n)?Q(n):_(n):n.match(t)||[]}function za(t){var r=null==t?0:t.length,e=mi();return t=r?c(t,function(n){if("function"!=typeof n[1])throw new pl(en);return[e(n[0]),n[1]]}):[],uu(function(e){for(var u=-1;++u<r;){var i=t[u];if(n(i[0],this,e))return n(i[1],this,e)}})}function Ea(n){
+return Nr(Fr(n,an))}function Sa(n){return function(){return n}}function Wa(n,t){return null==n||n!==n?t:n}function La(n){return n}function Ca(n){return De("function"==typeof n?n:Fr(n,an))}function Ua(n){return qe(Fr(n,an))}function Ba(n,t){return Ze(n,Fr(t,an))}function Ta(n,t,e){var u=Pc(t),i=fe(t,u);null!=e||fc(t)&&(i.length||!u.length)||(e=t,t=n,n=this,i=fe(t,Pc(t)));var o=!(fc(e)&&"chain"in e&&!e.chain),f=uc(n);return r(i,function(r){var e=t[r];n[r]=e,f&&(n.prototype[r]=function(){var t=this.__chain__;
+if(o||t){var r=n(this.__wrapped__);return(r.__actions__=Tu(this.__actions__)).push({func:e,args:arguments,thisArg:n}),r.__chain__=t,r}return e.apply(n,a([this.value()],arguments))})}),n}function $a(){return re._===this&&(re._=Al),this}function Da(){}function Ma(n){return n=kc(n),uu(function(t){return Ge(t,n)})}function Fa(n){return Bi(n)?m(no(n)):Qe(n)}function Na(n){return function(t){return null==n?X:_e(n,t)}}function Pa(){return[]}function qa(){return!1}function Za(){return{}}function Ka(){return"";
+}function Va(){return!0}function Ga(n,t){if(n=kc(n),n<1||n>Wn)return[];var r=Un,e=Hl(n,Un);t=mi(t),n-=Un;for(var u=O(e,t);++r<n;)t(r);return u}function Ha(n){return bh(n)?c(n,no):bc(n)?[n]:Tu(Cs(Ec(n)))}function Ja(n){var t=++wl;return Ec(n)+t}function Ya(n){return n&&n.length?Yr(n,La,me):X}function Qa(n,t){return n&&n.length?Yr(n,mi(t,2),me):X}function Xa(n){return w(n,La)}function nl(n,t){return w(n,mi(t,2))}function tl(n){return n&&n.length?Yr(n,La,Ne):X}function rl(n,t){return n&&n.length?Yr(n,mi(t,2),Ne):X;
+}function el(n){return n&&n.length?k(n,La):0}function ul(n,t){return n&&n.length?k(n,mi(t,2)):0}x=null==x?re:be.defaults(re.Object(),x,be.pick(re,qr));var il=x.Array,ol=x.Date,fl=x.Error,cl=x.Function,al=x.Math,ll=x.Object,sl=x.RegExp,hl=x.String,pl=x.TypeError,_l=il.prototype,vl=cl.prototype,gl=ll.prototype,yl=x["__core-js_shared__"],dl=vl.toString,bl=gl.hasOwnProperty,wl=0,ml=function(){var n=/[^.]+$/.exec(yl&&yl.keys&&yl.keys.IE_PROTO||"");return n?"Symbol(src)_1."+n:""}(),xl=gl.toString,jl=dl.call(ll),Al=re._,kl=sl("^"+dl.call(bl).replace(St,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Ol=ie?x.Buffer:X,Il=x.Symbol,Rl=x.Uint8Array,zl=Ol?Ol.allocUnsafe:X,El=F(ll.getPrototypeOf,ll),Sl=ll.create,Wl=gl.propertyIsEnumerable,Ll=_l.splice,Cl=Il?Il.isConcatSpreadable:X,Ul=Il?Il.iterator:X,Bl=Il?Il.toStringTag:X,Tl=function(){
+try{var n=Ai(ll,"defineProperty");return n({},"",{}),n}catch(n){}}(),$l=x.clearTimeout!==re.clearTimeout&&x.clearTimeout,Dl=ol&&ol.now!==re.Date.now&&ol.now,Ml=x.setTimeout!==re.setTimeout&&x.setTimeout,Fl=al.ceil,Nl=al.floor,Pl=ll.getOwnPropertySymbols,ql=Ol?Ol.isBuffer:X,Zl=x.isFinite,Kl=_l.join,Vl=F(ll.keys,ll),Gl=al.max,Hl=al.min,Jl=ol.now,Yl=x.parseInt,Ql=al.random,Xl=_l.reverse,ns=Ai(x,"DataView"),ts=Ai(x,"Map"),rs=Ai(x,"Promise"),es=Ai(x,"Set"),us=Ai(x,"WeakMap"),is=Ai(ll,"create"),os=us&&new us,fs={},cs=to(ns),as=to(ts),ls=to(rs),ss=to(es),hs=to(us),ps=Il?Il.prototype:X,_s=ps?ps.valueOf:X,vs=ps?ps.toString:X,gs=function(){
+function n(){}return function(t){if(!fc(t))return{};if(Sl)return Sl(t);n.prototype=t;var r=new n;return n.prototype=X,r}}();Z.templateSettings={escape:kt,evaluate:Ot,interpolate:It,variable:"",imports:{_:Z}},Z.prototype=J.prototype,Z.prototype.constructor=Z,Y.prototype=gs(J.prototype),Y.prototype.constructor=Y,Ct.prototype=gs(J.prototype),Ct.prototype.constructor=Ct,Xt.prototype.clear=nr,Xt.prototype.delete=tr,Xt.prototype.get=rr,Xt.prototype.has=er,Xt.prototype.set=ur,ir.prototype.clear=or,ir.prototype.delete=fr,
+ir.prototype.get=cr,ir.prototype.has=ar,ir.prototype.set=lr,sr.prototype.clear=hr,sr.prototype.delete=pr,sr.prototype.get=_r,sr.prototype.has=vr,sr.prototype.set=gr,yr.prototype.add=yr.prototype.push=dr,yr.prototype.has=br,wr.prototype.clear=mr,wr.prototype.delete=xr,wr.prototype.get=jr,wr.prototype.has=Ar,wr.prototype.set=kr;var ys=Pu(ue),ds=Pu(oe,!0),bs=qu(),ws=qu(!0),ms=os?function(n,t){return os.set(n,t),n}:La,xs=Tl?function(n,t){return Tl(n,"toString",{configurable:!0,enumerable:!1,value:Sa(t),
+writable:!0})}:La,js=uu,As=$l||function(n){return re.clearTimeout(n)},ks=es&&1/P(new es([,-0]))[1]==Sn?function(n){return new es(n)}:Da,Os=os?function(n){return os.get(n)}:Da,Is=Pl?function(n){return null==n?[]:(n=ll(n),i(Pl(n),function(t){return Wl.call(n,t)}))}:Pa,Rs=Pl?function(n){for(var t=[];n;)a(t,Is(n)),n=El(n);return t}:Pa,zs=we;(ns&&zs(new ns(new ArrayBuffer(1)))!=ct||ts&&zs(new ts)!=Gn||rs&&zs(rs.resolve())!=Qn||es&&zs(new es)!=tt||us&&zs(new us)!=it)&&(zs=function(n){var t=we(n),r=t==Yn?n.constructor:X,e=r?to(r):"";
+if(e)switch(e){case cs:return ct;case as:return Gn;case ls:return Qn;case ss:return tt;case hs:return it}return t});var Es=yl?uc:qa,Ss=Qi(ms),Ws=Ml||function(n,t){return re.setTimeout(n,t)},Ls=Qi(xs),Cs=Pi(function(n){var t=[];return 46===n.charCodeAt(0)&&t.push(""),n.replace(Et,function(n,r,e,u){t.push(e?u.replace(Mt,"$1"):r||n)}),t}),Us=uu(function(n,t){return Jf(n)?Hr(n,ee(t,1,Jf,!0)):[]}),Bs=uu(function(n,t){var r=jo(t);return Jf(r)&&(r=X),Jf(n)?Hr(n,ee(t,1,Jf,!0),mi(r,2)):[]}),Ts=uu(function(n,t){
+var r=jo(t);return Jf(r)&&(r=X),Jf(n)?Hr(n,ee(t,1,Jf,!0),X,r):[]}),$s=uu(function(n){var t=c(n,ju);return t.length&&t[0]===n[0]?ke(t):[]}),Ds=uu(function(n){var t=jo(n),r=c(n,ju);return t===jo(r)?t=X:r.pop(),r.length&&r[0]===n[0]?ke(r,mi(t,2)):[]}),Ms=uu(function(n){var t=jo(n),r=c(n,ju);return t="function"==typeof t?t:X,t&&r.pop(),r.length&&r[0]===n[0]?ke(r,X,t):[]}),Fs=uu(Oo),Ns=gi(function(n,t){var r=null==n?0:n.length,e=Tr(n,t);return nu(n,c(t,function(n){return Ci(n,r)?+n:n}).sort(Lu)),e}),Ps=uu(function(n){
+return gu(ee(n,1,Jf,!0))}),qs=uu(function(n){var t=jo(n);return Jf(t)&&(t=X),gu(ee(n,1,Jf,!0),mi(t,2))}),Zs=uu(function(n){var t=jo(n);return t="function"==typeof t?t:X,gu(ee(n,1,Jf,!0),X,t)}),Ks=uu(function(n,t){return Jf(n)?Hr(n,t):[]}),Vs=uu(function(n){return mu(i(n,Jf))}),Gs=uu(function(n){var t=jo(n);return Jf(t)&&(t=X),mu(i(n,Jf),mi(t,2))}),Hs=uu(function(n){var t=jo(n);return t="function"==typeof t?t:X,mu(i(n,Jf),X,t)}),Js=uu(Go),Ys=uu(function(n){var t=n.length,r=t>1?n[t-1]:X;return r="function"==typeof r?(n.pop(),
+r):X,Ho(n,r)}),Qs=gi(function(n){var t=n.length,r=t?n[0]:0,e=this.__wrapped__,u=function(t){return Tr(t,n)};return!(t>1||this.__actions__.length)&&e instanceof Ct&&Ci(r)?(e=e.slice(r,+r+(t?1:0)),e.__actions__.push({func:nf,args:[u],thisArg:X}),new Y(e,this.__chain__).thru(function(n){return t&&!n.length&&n.push(X),n})):this.thru(u)}),Xs=Fu(function(n,t,r){bl.call(n,r)?++n[r]:Br(n,r,1)}),nh=Ju(ho),th=Ju(po),rh=Fu(function(n,t,r){bl.call(n,r)?n[r].push(t):Br(n,r,[t])}),eh=uu(function(t,r,e){var u=-1,i="function"==typeof r,o=Hf(t)?il(t.length):[];
+return ys(t,function(t){o[++u]=i?n(r,t,e):Ie(t,r,e)}),o}),uh=Fu(function(n,t,r){Br(n,r,t)}),ih=Fu(function(n,t,r){n[r?0:1].push(t)},function(){return[[],[]]}),oh=uu(function(n,t){if(null==n)return[];var r=t.length;return r>1&&Ui(n,t[0],t[1])?t=[]:r>2&&Ui(t[0],t[1],t[2])&&(t=[t[0]]),He(n,ee(t,1),[])}),fh=Dl||function(){return re.Date.now()},ch=uu(function(n,t,r){var e=_n;if(r.length){var u=N(r,wi(ch));e|=bn}return ai(n,e,t,r,u)}),ah=uu(function(n,t,r){var e=_n|vn;if(r.length){var u=N(r,wi(ah));e|=bn;
+}return ai(t,e,n,r,u)}),lh=uu(function(n,t){return Gr(n,1,t)}),sh=uu(function(n,t,r){return Gr(n,Ic(t)||0,r)});Cf.Cache=sr;var hh=js(function(t,r){r=1==r.length&&bh(r[0])?c(r[0],z(mi())):c(ee(r,1),z(mi()));var e=r.length;return uu(function(u){for(var i=-1,o=Hl(u.length,e);++i<o;)u[i]=r[i].call(this,u[i]);return n(t,this,u)})}),ph=uu(function(n,t){return ai(n,bn,X,t,N(t,wi(ph)))}),_h=uu(function(n,t){return ai(n,wn,X,t,N(t,wi(_h)))}),vh=gi(function(n,t){return ai(n,xn,X,X,X,t)}),gh=ii(me),yh=ii(function(n,t){
+return n>=t}),dh=Re(function(){return arguments}())?Re:function(n){return cc(n)&&bl.call(n,"callee")&&!Wl.call(n,"callee")},bh=il.isArray,wh=ce?z(ce):ze,mh=ql||qa,xh=ae?z(ae):Ee,jh=le?z(le):Le,Ah=se?z(se):Be,kh=he?z(he):Te,Oh=pe?z(pe):$e,Ih=ii(Ne),Rh=ii(function(n,t){return n<=t}),zh=Nu(function(n,t){if(Mi(t)||Hf(t))return $u(t,Pc(t),n),X;for(var r in t)bl.call(t,r)&&Sr(n,r,t[r])}),Eh=Nu(function(n,t){$u(t,qc(t),n)}),Sh=Nu(function(n,t,r,e){$u(t,qc(t),n,e)}),Wh=Nu(function(n,t,r,e){$u(t,Pc(t),n,e);
+}),Lh=gi(Tr),Ch=uu(function(n,t){n=ll(n);var r=-1,e=t.length,u=e>2?t[2]:X;for(u&&Ui(t[0],t[1],u)&&(e=1);++r<e;)for(var i=t[r],o=qc(i),f=-1,c=o.length;++f<c;){var a=o[f],l=n[a];(l===X||Gf(l,gl[a])&&!bl.call(n,a))&&(n[a]=i[a])}return n}),Uh=uu(function(t){return t.push(X,si),n(Mh,X,t)}),Bh=Xu(function(n,t,r){null!=t&&"function"!=typeof t.toString&&(t=xl.call(t)),n[t]=r},Sa(La)),Th=Xu(function(n,t,r){null!=t&&"function"!=typeof t.toString&&(t=xl.call(t)),bl.call(n,t)?n[t].push(r):n[t]=[r]},mi),$h=uu(Ie),Dh=Nu(function(n,t,r){
+Ke(n,t,r)}),Mh=Nu(function(n,t,r,e){Ke(n,t,r,e)}),Fh=gi(function(n,t){var r={};if(null==n)return r;var e=!1;t=c(t,function(t){return t=ku(t,n),e||(e=t.length>1),t}),$u(n,di(n),r),e&&(r=Fr(r,an|ln|sn,hi));for(var u=t.length;u--;)yu(r,t[u]);return r}),Nh=gi(function(n,t){return null==n?{}:Je(n,t)}),Ph=ci(Pc),qh=ci(qc),Zh=Vu(function(n,t,r){return t=t.toLowerCase(),n+(r?fa(t):t)}),Kh=Vu(function(n,t,r){return n+(r?"-":"")+t.toLowerCase()}),Vh=Vu(function(n,t,r){return n+(r?" ":"")+t.toLowerCase()}),Gh=Ku("toLowerCase"),Hh=Vu(function(n,t,r){
+return n+(r?"_":"")+t.toLowerCase()}),Jh=Vu(function(n,t,r){return n+(r?" ":"")+Qh(t)}),Yh=Vu(function(n,t,r){return n+(r?" ":"")+t.toUpperCase()}),Qh=Ku("toUpperCase"),Xh=uu(function(t,r){try{return n(t,X,r)}catch(n){return rc(n)?n:new fl(n)}}),np=gi(function(n,t){return r(t,function(t){t=no(t),Br(n,t,ch(n[t],n))}),n}),tp=Yu(),rp=Yu(!0),ep=uu(function(n,t){return function(r){return Ie(r,n,t)}}),up=uu(function(n,t){return function(r){return Ie(n,r,t)}}),ip=ti(c),op=ti(u),fp=ti(h),cp=ui(),ap=ui(!0),lp=ni(function(n,t){
+return n+t},0),sp=fi("ceil"),hp=ni(function(n,t){return n/t},1),pp=fi("floor"),_p=ni(function(n,t){return n*t},1),vp=fi("round"),gp=ni(function(n,t){return n-t},0);return Z.after=If,Z.ary=Rf,Z.assign=zh,Z.assignIn=Eh,Z.assignInWith=Sh,Z.assignWith=Wh,Z.at=Lh,Z.before=zf,Z.bind=ch,Z.bindAll=np,Z.bindKey=ah,Z.castArray=Nf,Z.chain=Qo,Z.chunk=uo,Z.compact=io,Z.concat=oo,Z.cond=za,Z.conforms=Ea,Z.constant=Sa,Z.countBy=Xs,Z.create=Sc,Z.curry=Ef,Z.curryRight=Sf,Z.debounce=Wf,Z.defaults=Ch,Z.defaultsDeep=Uh,
+Z.defer=lh,Z.delay=sh,Z.difference=Us,Z.differenceBy=Bs,Z.differenceWith=Ts,Z.drop=fo,Z.dropRight=co,Z.dropRightWhile=ao,Z.dropWhile=lo,Z.fill=so,Z.filter=lf,Z.flatMap=sf,Z.flatMapDeep=hf,Z.flatMapDepth=pf,Z.flatten=_o,Z.flattenDeep=vo,Z.flattenDepth=go,Z.flip=Lf,Z.flow=tp,Z.flowRight=rp,Z.fromPairs=yo,Z.functions=$c,Z.functionsIn=Dc,Z.groupBy=rh,Z.initial=mo,Z.intersection=$s,Z.intersectionBy=Ds,Z.intersectionWith=Ms,Z.invert=Bh,Z.invertBy=Th,Z.invokeMap=eh,Z.iteratee=Ca,Z.keyBy=uh,Z.keys=Pc,Z.keysIn=qc,
+Z.map=yf,Z.mapKeys=Zc,Z.mapValues=Kc,Z.matches=Ua,Z.matchesProperty=Ba,Z.memoize=Cf,Z.merge=Dh,Z.mergeWith=Mh,Z.method=ep,Z.methodOf=up,Z.mixin=Ta,Z.negate=Uf,Z.nthArg=Ma,Z.omit=Fh,Z.omitBy=Vc,Z.once=Bf,Z.orderBy=df,Z.over=ip,Z.overArgs=hh,Z.overEvery=op,Z.overSome=fp,Z.partial=ph,Z.partialRight=_h,Z.partition=ih,Z.pick=Nh,Z.pickBy=Gc,Z.property=Fa,Z.propertyOf=Na,Z.pull=Fs,Z.pullAll=Oo,Z.pullAllBy=Io,Z.pullAllWith=Ro,Z.pullAt=Ns,Z.range=cp,Z.rangeRight=ap,Z.rearg=vh,Z.reject=mf,Z.remove=zo,Z.rest=Tf,
+Z.reverse=Eo,Z.sampleSize=jf,Z.set=Jc,Z.setWith=Yc,Z.shuffle=Af,Z.slice=So,Z.sortBy=oh,Z.sortedUniq=$o,Z.sortedUniqBy=Do,Z.split=da,Z.spread=$f,Z.tail=Mo,Z.take=Fo,Z.takeRight=No,Z.takeRightWhile=Po,Z.takeWhile=qo,Z.tap=Xo,Z.throttle=Df,Z.thru=nf,Z.toArray=jc,Z.toPairs=Ph,Z.toPairsIn=qh,Z.toPath=Ha,Z.toPlainObject=Rc,Z.transform=Qc,Z.unary=Mf,Z.union=Ps,Z.unionBy=qs,Z.unionWith=Zs,Z.uniq=Zo,Z.uniqBy=Ko,Z.uniqWith=Vo,Z.unset=Xc,Z.unzip=Go,Z.unzipWith=Ho,Z.update=na,Z.updateWith=ta,Z.values=ra,Z.valuesIn=ea,
+Z.without=Ks,Z.words=Ra,Z.wrap=Ff,Z.xor=Vs,Z.xorBy=Gs,Z.xorWith=Hs,Z.zip=Js,Z.zipObject=Jo,Z.zipObjectDeep=Yo,Z.zipWith=Ys,Z.entries=Ph,Z.entriesIn=qh,Z.extend=Eh,Z.extendWith=Sh,Ta(Z,Z),Z.add=lp,Z.attempt=Xh,Z.camelCase=Zh,Z.capitalize=fa,Z.ceil=sp,Z.clamp=ua,Z.clone=Pf,Z.cloneDeep=Zf,Z.cloneDeepWith=Kf,Z.cloneWith=qf,Z.conformsTo=Vf,Z.deburr=ca,Z.defaultTo=Wa,Z.divide=hp,Z.endsWith=aa,Z.eq=Gf,Z.escape=la,Z.escapeRegExp=sa,Z.every=af,Z.find=nh,Z.findIndex=ho,Z.findKey=Wc,Z.findLast=th,Z.findLastIndex=po,
+Z.findLastKey=Lc,Z.floor=pp,Z.forEach=_f,Z.forEachRight=vf,Z.forIn=Cc,Z.forInRight=Uc,Z.forOwn=Bc,Z.forOwnRight=Tc,Z.get=Mc,Z.gt=gh,Z.gte=yh,Z.has=Fc,Z.hasIn=Nc,Z.head=bo,Z.identity=La,Z.includes=gf,Z.indexOf=wo,Z.inRange=ia,Z.invoke=$h,Z.isArguments=dh,Z.isArray=bh,Z.isArrayBuffer=wh,Z.isArrayLike=Hf,Z.isArrayLikeObject=Jf,Z.isBoolean=Yf,Z.isBuffer=mh,Z.isDate=xh,Z.isElement=Qf,Z.isEmpty=Xf,Z.isEqual=nc,Z.isEqualWith=tc,Z.isError=rc,Z.isFinite=ec,Z.isFunction=uc,Z.isInteger=ic,Z.isLength=oc,Z.isMap=jh,
+Z.isMatch=ac,Z.isMatchWith=lc,Z.isNaN=sc,Z.isNative=hc,Z.isNil=_c,Z.isNull=pc,Z.isNumber=vc,Z.isObject=fc,Z.isObjectLike=cc,Z.isPlainObject=gc,Z.isRegExp=Ah,Z.isSafeInteger=yc,Z.isSet=kh,Z.isString=dc,Z.isSymbol=bc,Z.isTypedArray=Oh,Z.isUndefined=wc,Z.isWeakMap=mc,Z.isWeakSet=xc,Z.join=xo,Z.kebabCase=Kh,Z.last=jo,Z.lastIndexOf=Ao,Z.lowerCase=Vh,Z.lowerFirst=Gh,Z.lt=Ih,Z.lte=Rh,Z.max=Ya,Z.maxBy=Qa,Z.mean=Xa,Z.meanBy=nl,Z.min=tl,Z.minBy=rl,Z.stubArray=Pa,Z.stubFalse=qa,Z.stubObject=Za,Z.stubString=Ka,
+Z.stubTrue=Va,Z.multiply=_p,Z.nth=ko,Z.noConflict=$a,Z.noop=Da,Z.now=fh,Z.pad=ha,Z.padEnd=pa,Z.padStart=_a,Z.parseInt=va,Z.random=oa,Z.reduce=bf,Z.reduceRight=wf,Z.repeat=ga,Z.replace=ya,Z.result=Hc,Z.round=vp,Z.runInContext=p,Z.sample=xf,Z.size=kf,Z.snakeCase=Hh,Z.some=Of,Z.sortedIndex=Wo,Z.sortedIndexBy=Lo,Z.sortedIndexOf=Co,Z.sortedLastIndex=Uo,Z.sortedLastIndexBy=Bo,Z.sortedLastIndexOf=To,Z.startCase=Jh,Z.startsWith=ba,Z.subtract=gp,Z.sum=el,Z.sumBy=ul,Z.template=wa,Z.times=Ga,Z.toFinite=Ac,Z.toInteger=kc,
+Z.toLength=Oc,Z.toLower=ma,Z.toNumber=Ic,Z.toSafeInteger=zc,Z.toString=Ec,Z.toUpper=xa,Z.trim=ja,Z.trimEnd=Aa,Z.trimStart=ka,Z.truncate=Oa,Z.unescape=Ia,Z.uniqueId=Ja,Z.upperCase=Yh,Z.upperFirst=Qh,Z.each=_f,Z.eachRight=vf,Z.first=bo,Ta(Z,function(){var n={};return ue(Z,function(t,r){bl.call(Z.prototype,r)||(n[r]=t)}),n}(),{chain:!1}),Z.VERSION=nn,r(["bind","bindKey","curry","curryRight","partial","partialRight"],function(n){Z[n].placeholder=Z}),r(["drop","take"],function(n,t){Ct.prototype[n]=function(r){
+r=r===X?1:Gl(kc(r),0);var e=this.__filtered__&&!t?new Ct(this):this.clone();return e.__filtered__?e.__takeCount__=Hl(r,e.__takeCount__):e.__views__.push({size:Hl(r,Un),type:n+(e.__dir__<0?"Right":"")}),e},Ct.prototype[n+"Right"]=function(t){return this.reverse()[n](t).reverse()}}),r(["filter","map","takeWhile"],function(n,t){var r=t+1,e=r==Rn||r==En;Ct.prototype[n]=function(n){var t=this.clone();return t.__iteratees__.push({iteratee:mi(n,3),type:r}),t.__filtered__=t.__filtered__||e,t}}),r(["head","last"],function(n,t){
+var r="take"+(t?"Right":"");Ct.prototype[n]=function(){return this[r](1).value()[0]}}),r(["initial","tail"],function(n,t){var r="drop"+(t?"":"Right");Ct.prototype[n]=function(){return this.__filtered__?new Ct(this):this[r](1)}}),Ct.prototype.compact=function(){return this.filter(La)},Ct.prototype.find=function(n){return this.filter(n).head()},Ct.prototype.findLast=function(n){return this.reverse().find(n)},Ct.prototype.invokeMap=uu(function(n,t){return"function"==typeof n?new Ct(this):this.map(function(r){
+return Ie(r,n,t)})}),Ct.prototype.reject=function(n){return this.filter(Uf(mi(n)))},Ct.prototype.slice=function(n,t){n=kc(n);var r=this;return r.__filtered__&&(n>0||t<0)?new Ct(r):(n<0?r=r.takeRight(-n):n&&(r=r.drop(n)),t!==X&&(t=kc(t),r=t<0?r.dropRight(-t):r.take(t-n)),r)},Ct.prototype.takeRightWhile=function(n){return this.reverse().takeWhile(n).reverse()},Ct.prototype.toArray=function(){return this.take(Un)},ue(Ct.prototype,function(n,t){var r=/^(?:filter|find|map|reject)|While$/.test(t),e=/^(?:head|last)$/.test(t),u=Z[e?"take"+("last"==t?"Right":""):t],i=e||/^find/.test(t);
+u&&(Z.prototype[t]=function(){var t=this.__wrapped__,o=e?[1]:arguments,f=t instanceof Ct,c=o[0],l=f||bh(t),s=function(n){var t=u.apply(Z,a([n],o));return e&&h?t[0]:t};l&&r&&"function"==typeof c&&1!=c.length&&(f=l=!1);var h=this.__chain__,p=!!this.__actions__.length,_=i&&!h,v=f&&!p;if(!i&&l){t=v?t:new Ct(this);var g=n.apply(t,o);return g.__actions__.push({func:nf,args:[s],thisArg:X}),new Y(g,h)}return _&&v?n.apply(this,o):(g=this.thru(s),_?e?g.value()[0]:g.value():g)})}),r(["pop","push","shift","sort","splice","unshift"],function(n){
+var t=_l[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=/^(?:pop|shift)$/.test(n);Z.prototype[n]=function(){var n=arguments;if(e&&!this.__chain__){var u=this.value();return t.apply(bh(u)?u:[],n)}return this[r](function(r){return t.apply(bh(r)?r:[],n)})}}),ue(Ct.prototype,function(n,t){var r=Z[t];if(r){var e=r.name+"";bl.call(fs,e)||(fs[e]=[]),fs[e].push({name:t,func:r})}}),fs[Qu(X,vn).name]=[{name:"wrapper",func:X}],Ct.prototype.clone=$t,Ct.prototype.reverse=Yt,Ct.prototype.value=Qt,Z.prototype.at=Qs,
+Z.prototype.chain=tf,Z.prototype.commit=rf,Z.prototype.next=ef,Z.prototype.plant=of,Z.prototype.reverse=ff,Z.prototype.toJSON=Z.prototype.valueOf=Z.prototype.value=cf,Z.prototype.first=Z.prototype.head,Ul&&(Z.prototype[Ul]=uf),Z},be=de();"function"==typeof define&&"object"==typeof define.amd&&define.amd?(re._=be,define(function(){return be})):ue?((ue.exports=be)._=be,ee._=be):re._=be}).call(this);
\ No newline at end of file