Merge pull request #11 from zsjy/dev

Dev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "halo-theme-dream2.0-plus",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "梦之城，童话梦境，动漫类型博客主题。",
   "main": "index.js",
   "author": "nineya",

settings.yaml

@@ -88,6 +88,12 @@ spec:
               value: true
             - label: 隐藏
               value: false
+        - $formkit: text
+          label: 头像服务镜像地址
+          help: '用于替换头像服务镜像地址，无须输入结尾的"/"。'
+          name: providerMirror
+          value: "https://cravatar.cn"
+          validation: required
     - group: basic_style
       label: '基础样式'
       formSchema:

templates/links.html

@@ -49,12 +49,22 @@
         </div>
         <div class="card card-content comment-wrapper-z-index" id="comment-wrapper" th:if="${enableComment}">
             <h3 class="comment-title">评论</h3>
+            <th:block th:if="${theme.config.enhance.enable_pjax}">
                 <comment-widget
                         group="content.halo.run"
                         kind="SinglePage"
                         version="v1alpha1"
                         th:name="${theme.config.page_config.link_comment_id}"
+                        with-replies="false"
                 ></comment-widget>
+            </th:block>
+            <th:block th:unless="${theme.config.enhance.enable_pjax}">
+                <halo:comment
+                        group="content.halo.run"
+                        kind="SinglePage"
+                        th:attr="name=${theme.config.page_config.link_comment_id}"
+                />
+            </th:block>
         </div>
     </th:block>
 </th:block>

templates/main/article.html

@@ -92,11 +92,21 @@
 
     <div class="card card-content comment-wrapper-z-index" id="comment-wrapper" th:if="${enableComment}">
         <h3 class="comment-title">评论</h3>
+        <th:block th:if="${theme.config.enhance.enable_pjax}">
             <comment-widget
                     group="content.halo.run"
                     th:kind="${type}"
                     version="v1alpha1"
                     th:name="${post.metadata.name}"
+                    with-replies="false"
             ></comment-widget>
+        </th:block>
+        <th:block th:unless="${theme.config.enhance.enable_pjax}">
+            <halo:comment
+                    group="content.halo.run"
+                    th:kind="${type}"
+                    th:attr="name=${post.metadata.name}"
+            />
+        </th:block>
     </div>
 </th:block>

templates/moments.html

@@ -57,12 +57,22 @@
         </div>
       </div>
       <div class="journal-comment comment-wrapper-z-index" th:if="${enableComment}">
+        <th:block th:if="${theme.config.enhance.enable_pjax}">
           <comment-widget
                   group="moment.halo.run"
                   kind="Moment"
                   version="v1alpha1"
                   th:name="${moment.metadata.name}"
+                  with-replies="false"
           ></comment-widget>
+        </th:block>
+        <th:block th:unless="${theme.config.enhance.enable_pjax}">
+          <halo:comment
+                  group="moment.halo.run"
+                  kind="Moment"
+                  th:attr="name=${moment.metadata.name}"
+          />
+        </th:block>
       </div>
     </div>
     <th:block th:replace="~{main/pagination :: pagination (${moments}, '/moments')}"/>

templates/widget/recent_comments.html

@@ -9,10 +9,14 @@
     <div th:unless="${isEmpty}" class="card-content">
         <ul class="widget-comment">
             <li class="item" th:each="comment : ${comments}">
-                <div class="user">
+                <div class="user"
-                    <img width="35" height="35" th:unless="${#strings.isEmpty(comment.owner.avatar)}" class="avatar" th:src="${comment.owner.avatar}"
+                     th:with="
+                     emailHash = ${comment.spec.owner.annotations['email-hash']},
+                     userA = ${comment.owner.avatar},
+                     img = ${#strings.isEmpty(userA) && !#strings.isEmpty(emailHash) ? theme.config.basic_info.providerMirror+'/avatar/'+emailHash : userA}">
+                    <img width="35" height="35" th:unless="${#strings.isEmpty(img)}" class="avatar" th:src="${img}"
                          th:alt="${comment.owner.displayName}">
-                    <div th:if="${#strings.isEmpty(comment.owner.avatar)}" class="no-avatar">
+                    <div th:if="${#strings.isEmpty(img)}" class="no-avatar">
                         <span class="avatar-info">[[${#strings.substring(comment.owner.displayName, 0, 1)}]]</span>
                     </div>
                     <div class="info">

theme.yaml

@@ -30,7 +30,7 @@ spec:
   settingName: theme-dream2-plus-setting
   configMapName: theme-dream2-plus-configMap
   # 版本号
-  version: 1.2.0
+  version: 1.2.1
   # 最低支持的 Halo 版本
   require: ">=2.12.0"
   # 许可