Merge pull request #25 from zsjy/dev

Dev

package.json

@@ -53,6 +53,7 @@
   },
   "dependencies": {
     "html2canvas": "^1.4.1",
-    "qrcode": "^1.5.1"
+    "qrcode": "^1.5.1",
+    "remixicon": "^4.3.0"
   }
 }

templates/common/head.html

@@ -26,7 +26,7 @@
   <link rel="canonical" th:href="${#strings.isEmpty(canonical) ? '' : #strings.startsWith(canonical,'http') ? canonical : (#strings.endsWith(canonical,'/') ? #strings.substringBefore(site.url, '/') : site.url + canonical)}"/>
 
   <link rel="preload stylesheet" as="style" th:href="@{/assets/css/theme.min.css(mew=${theme.spec.version})}">
-  <link rel="preload stylesheet" as="style" th:href="@{/assets/lib/remixicon@4.2.0/remixicon.min.css}">
+  <link rel="preload stylesheet" as="style" th:href="@{/assets/lib/remixicon@4.3.0/remixicon.min.css}">
   <link rel="preload stylesheet" as="style" th:href="@{/assets/css/style.min.css(mew=${theme.spec.version})}">
   <link th:if="${theme.config.basic_style.theme_style == 'celebration'}" rel="preload stylesheet" as="style" th:href="@{/assets/css/celebration.min.css(mew=${theme.spec.version})}">
 

templates/search.html

@@ -16,18 +16,23 @@
               var searchInput = document.getElementById('halo-search-form-text-input')
               var query = searchInput.value.trim()
               if (!query || query.startsWith('*')) {
-                // 阻止表单提交
                 event.preventDefault()
-                // 显示错误信息
                 Qmsg.warning(!query ? '请输入内容' : '不能输入星号（*）作为内容开头')
                 return
               }
               if(DreamConfig.pjax_state) {
-                // 阻止表单提交
                 event.preventDefault()
                 searchForm.setAttribute('data-pjax', '')
               }
             })
+            document.addEventListener('keydown', function(event) {
+              if (event.key === 'Enter') {
+                if (!searchForm.contains(document.activeElement)) {
+                  event.preventDefault(); // 阻止默认行为
+                  searchForm.dispatchEvent(new Event('submit')); // 触发submit事件
+                }
+              }
+            });
           })
         </script>
         <form id="halo-search-form" class="search-form-inner" method="get" action="/search" role="search">

theme.yaml

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