From 92aca83c2c5d5b38a20629e39e29dd76886e647a Mon Sep 17 00:00:00 2001
From: "1152958806@qq.com" <1152958806@qq.com>
Date: Thu, 12 Oct 2023 00:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96loading=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/modules/layouts/layout.html | 17 -----------------
 templates/modules/loading-box.html    | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html
index 4189a2ae..db6df69e 100644
--- a/templates/modules/layouts/layout.html
+++ b/templates/modules/layouts/layout.html
@@ -68,23 +68,6 @@
     <!-- todo head 中有它的 css，应该可以写一块，并改成后台可配置的功能，代码中应该还有他的 js -->
     <script src="https://lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/node-snackbar/0.1.16/snackbar.min.js"></script>
 
-    <script th:if="${theme.config.other.loadingBoxs.loadingBoxEnable} and not ${#strings.isEmpty(theme.config.other.loadingBoxs.loadingBoxImg)}">
-        var preloader = {
-            endLoading: () => {
-                //- document.body.style.overflow = 'auto';
-                document.getElementById('loading-box').classList.add("loaded")
-            },
-            initLoading: () => {
-                //- document.body.style.overflow = '';
-                document.getElementById('loading-box').classList.remove("loaded")
-            }
-        }
-        window.addEventListener('load', preloader.endLoading())
-        setTimeout(function () {
-            preloader.endLoading();
-        }, 3000)
-
-    </script>
     <div class="js-pjax">
         <!-- 动态标题 -->
         <script th:replace="~{modules/common/diytitle :: diytitle}"></script>
diff --git a/templates/modules/loading-box.html b/templates/modules/loading-box.html
index 4c4c8495..42e4e60d 100644
--- a/templates/modules/loading-box.html
+++ b/templates/modules/loading-box.html
@@ -85,6 +85,22 @@
             <div class="loading-image-dot"></div>
         </div>
     </div>
+    <script>
+        var preloader = {
+            endLoading: () => {
+                //- document.body.style.overflow = 'auto';
+                document.getElementById('loading-box').classList.add("loaded")
+            },
+            initLoading: () => {
+                //- document.body.style.overflow = '';
+                document.getElementById('loading-box').classList.remove("loaded")
+            }
+        }
+        window.addEventListener('load', preloader.endLoading())
+        setTimeout(function () {
+            preloader.endLoading();
+        }, 3000)
+    </script>
 
 </th:block>