From d3be997b8f7fbc68819cd53fcfeab8b8200027d6 Mon Sep 17 00:00:00 2001
From: xing <fthvgb1>
Date: Thu, 2 Mar 2023 21:16:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/theme/twentyfifteen/posts/detail.gohtml  | 2 +-
 internal/theme/twentyfifteen/twentyfifteen.go     | 5 +----
 internal/theme/twentyseventeen/twentyseventeen.go | 2 +-
 internal/theme/wp/index.go                        | 3 ++-
 internal/theme/wp/wp.go                           | 4 ++--
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/internal/theme/twentyfifteen/posts/detail.gohtml b/internal/theme/twentyfifteen/posts/detail.gohtml
index 7fdc3af..91a09c1 100644
--- a/internal/theme/twentyfifteen/posts/detail.gohtml
+++ b/internal/theme/twentyfifteen/posts/detail.gohtml
@@ -1,7 +1,7 @@
 {{template "layout/base" .}}
 
 {{define "content"}}
-    {{ if gt .post.Id 0}}
+    {{ if and .post gt .post.Id 0}}
         <div id="primary" class="content-area">
             <main id="main" class="site-main">
                 <article id="post-{{.post.Id}}"
diff --git a/internal/theme/twentyfifteen/twentyfifteen.go b/internal/theme/twentyfifteen/twentyfifteen.go
index 6aeee21..d5dd23e 100644
--- a/internal/theme/twentyfifteen/twentyfifteen.go
+++ b/internal/theme/twentyfifteen/twentyfifteen.go
@@ -37,10 +37,7 @@ func Hook(h *wp.Handle) {
 func dispatch(next wp.HandleFn[*wp.Handle], h *wp.Handle) {
 	h.WidgetAreaData()
 	h.GetPassword()
-	h.PushHeadScript(
-		wp.NewComponents(CalCustomBackGround, 10),
-		wp.NewComponents(colorSchemeCss, 10),
-	)
+	h.PushGroupHeadScript(10, CalCustomBackGround, colorSchemeCss)
 	h.PushHandleFn(constraints.AllStats, wp.NewHandleFn(customHeader, 10))
 	switch h.Scene() {
 	case constraints.Detail:
diff --git a/internal/theme/twentyseventeen/twentyseventeen.go b/internal/theme/twentyseventeen/twentyseventeen.go
index 148d5bd..441167a 100644
--- a/internal/theme/twentyseventeen/twentyseventeen.go
+++ b/internal/theme/twentyseventeen/twentyseventeen.go
@@ -47,7 +47,7 @@ func Hook(h *wp.Handle) {
 func ready(next wp.HandleFn[*wp.Handle], h *wp.Handle) {
 	h.WidgetAreaData()
 	h.GetPassword()
-	h.PushHandleFn(constraints.AllStats, wp.NewHandleFn(calClass, 15))
+	h.PushHandleFn(constraints.AllStats, wp.NewHandleFn(calClass, 20))
 	errHandle := wp.NewHandleFn(errorsHandle, 100)
 	h.PushHandleFn(constraints.Error404, errHandle)
 	h.PushHandleFn(constraints.ParamError, errHandle)
diff --git a/internal/theme/wp/index.go b/internal/theme/wp/index.go
index cfa4f77..5ea5a80 100644
--- a/internal/theme/wp/index.go
+++ b/internal/theme/wp/index.go
@@ -137,7 +137,7 @@ func (i *IndexHandle) ExecPostsPlugin(calls ...func(*models.Posts)) {
 	}
 	plugin := GetListPostPlugins(pluginConf, postsPlugins)
 
-	i.ginH["posts"] = slice.Map(i.Posts, PluginFn[models.Posts](plugin, i.Handle, Defaults(calls...)))
+	i.Posts = slice.Map(i.Posts, PluginFn[models.Posts](plugin, i.Handle, Defaults(calls...)))
 
 }
 
@@ -146,6 +146,7 @@ func (i *IndexHandle) Render() {
 		i.ExecPostsPlugin()
 		i.Pagination()
 	}, 10))
+	i.ginH["posts"] = i.Posts
 	i.Handle.Render()
 }
 
diff --git a/internal/theme/wp/wp.go b/internal/theme/wp/wp.go
index 5177e64..d1168e4 100644
--- a/internal/theme/wp/wp.go
+++ b/internal/theme/wp/wp.go
@@ -202,12 +202,12 @@ func (h *Handle) Render() {
 	h.PreTemplate()
 	h.AddComponent("customLogo", CalCustomLogo)
 
-	h.PushHeadScript(Components{CalSiteIcon, 100}, Components{CalCustomCss, 0})
+	h.PushGroupHeadScript(0, CalSiteIcon, CalCustomCss)
 
 	h.PushHandleFn(constraints.AllStats, NewHandleFn(func(h *Handle) {
 		h.CalMultipleComponents()
 		h.CalBodyClass()
-	}, 5), NewHandleFn(func(h *Handle) {
+	}, 10), NewHandleFn(func(h *Handle) {
 		h.C.HTML(h.Code, h.templ, h.ginH)
 	}, 0))