block版 分类
This commit is contained in:
parent
6f800230b0
commit
a1f36da904
10
internal/pkg/constraints/blocks/blocks.go
Normal file
10
internal/pkg/constraints/blocks/blocks.go
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
package blocks
|
||||||
|
|
||||||
|
const (
|
||||||
|
Search = "block-search"
|
||||||
|
RecentPosts = "block-recent-posts"
|
||||||
|
RecentComments = "block-recent-comments"
|
||||||
|
Archive = "block-archives"
|
||||||
|
Categories = "block-categories"
|
||||||
|
Meta = "block-meta"
|
||||||
|
)
|
35
internal/theme/wp/components/block.go
Normal file
35
internal/theme/wp/components/block.go
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
package components
|
||||||
|
|
||||||
|
import (
|
||||||
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/theme/wp"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/theme/wp/components/block"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/wpconfig"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
var blockFn = map[string]func(*wp.Handle, string, block.ParserBlock) (func() string, error){
|
||||||
|
"core/categories": block.Category,
|
||||||
|
}
|
||||||
|
|
||||||
|
func Block(id string) func(*wp.Handle) string {
|
||||||
|
content := wpconfig.GetPHPArrayVal("widget_block", "", str.ToInteger[int64](id, 0), "content")
|
||||||
|
if content == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
v := block.ParseBlock(content)
|
||||||
|
return func(h *wp.Handle) string {
|
||||||
|
var out []string
|
||||||
|
for _, parserBlock := range v.Output {
|
||||||
|
fn, ok := blockFn[parserBlock.Name]
|
||||||
|
if ok {
|
||||||
|
s, err := fn(h, id, parserBlock)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, s())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return strings.Join(out, "\n")
|
||||||
|
}
|
||||||
|
}
|
96
internal/theme/wp/components/block/block.go
Normal file
96
internal/theme/wp/components/block/block.go
Normal file
|
@ -0,0 +1,96 @@
|
||||||
|
package block
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/dlclark/regexp2"
|
||||||
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Block struct {
|
||||||
|
Name string
|
||||||
|
Attrs string
|
||||||
|
Len int
|
||||||
|
StartOffset int
|
||||||
|
Type string
|
||||||
|
}
|
||||||
|
|
||||||
|
type BockParser struct {
|
||||||
|
Document string
|
||||||
|
Offset int
|
||||||
|
Output []ParserBlock
|
||||||
|
}
|
||||||
|
|
||||||
|
type ParserBlock struct {
|
||||||
|
Name string
|
||||||
|
Attrs string
|
||||||
|
InnerBlocks string
|
||||||
|
InnerHtml string
|
||||||
|
InnerContent string
|
||||||
|
}
|
||||||
|
|
||||||
|
var block = regexp2.MustCompile(`<!--\s+(?<closer>/)?wp:(?<namespace>[a-z][a-z0-9_-]*\/)?(?<name>[a-z][a-z0-9_-]*)\s+(?<attrs>{(?:(?:[^}]+|}+(?=})|(?!}\s+\/?-->).)*)?}\s+)?(?<void>\/)?-->`, regexp2.IgnoreCase|regexp2.Singleline)
|
||||||
|
|
||||||
|
func ParseBlock(content string) (r BockParser) {
|
||||||
|
m, err := block.FindStringMatch(content)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
r.Document = content
|
||||||
|
for m != nil {
|
||||||
|
if m.GroupCount() < 1 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
b := token(m.Groups())
|
||||||
|
bb := ParserBlock{}
|
||||||
|
bb.Name = b.Name
|
||||||
|
bb.Attrs = b.Attrs
|
||||||
|
r.Output = append(r.Output, bb)
|
||||||
|
m, _ = block.FindNextMatch(m)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func token(g []regexp2.Group) (b Block) {
|
||||||
|
if len(g) < 1 {
|
||||||
|
b.Type = "no-more-tokens"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var closer, name, void, nameSpace = "", "", "", ""
|
||||||
|
for i, group := range g {
|
||||||
|
v := group.String()
|
||||||
|
if v == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
switch i {
|
||||||
|
case 0:
|
||||||
|
b.Len = group.Length
|
||||||
|
b.StartOffset = group.Index
|
||||||
|
case 1:
|
||||||
|
closer = v
|
||||||
|
case 2:
|
||||||
|
nameSpace = v
|
||||||
|
case 3:
|
||||||
|
name = v
|
||||||
|
case 4:
|
||||||
|
b.Attrs = v
|
||||||
|
case 5:
|
||||||
|
void = v
|
||||||
|
default:
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if nameSpace == "" {
|
||||||
|
nameSpace = "core/"
|
||||||
|
}
|
||||||
|
b.Name = str.Join(nameSpace, name)
|
||||||
|
if void != "" {
|
||||||
|
b.Type = "void-block"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if closer != "" {
|
||||||
|
b.Type = "block-closer"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
b.Type = "block-opener"
|
||||||
|
return b
|
||||||
|
}
|
25
internal/theme/wp/components/block/block_test.go
Normal file
25
internal/theme/wp/components/block/block_test.go
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
package block
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestParseBlock(t *testing.T) {
|
||||||
|
type args struct {
|
||||||
|
s string
|
||||||
|
}
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
args args
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "t1",
|
||||||
|
args: args{
|
||||||
|
s: `<!-- wp:categories {"showPostCounts":true,"showEmpty":true} /-->`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
ParseBlock(tt.args.s)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
165
internal/theme/wp/components/block/category.go
Normal file
165
internal/theme/wp/components/block/category.go
Normal file
|
@ -0,0 +1,165 @@
|
||||||
|
package block
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"github.com/fthvgb1/wp-go/helper/maps"
|
||||||
|
"github.com/fthvgb1/wp-go/helper/number"
|
||||||
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/cmd/reload"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
||||||
|
constraints2 "github.com/fthvgb1/wp-go/internal/pkg/constraints"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints/blocks"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/pkg/logs"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/pkg/models"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/theme/wp"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/theme/wp/components/widget"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
func categoryConf() map[any]any {
|
||||||
|
return map[any]any{
|
||||||
|
"count": int64(0),
|
||||||
|
"dropdown": int64(0),
|
||||||
|
"hierarchical": int64(0),
|
||||||
|
"title": "分类",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func categoryDefaultArgs() map[string]string {
|
||||||
|
return map[string]string{
|
||||||
|
"{$before_widget}": `<section id="block-%v" class="%s">`,
|
||||||
|
"{$after_widget}": `</section>`,
|
||||||
|
"{$name}": "cat",
|
||||||
|
"{$class}": "postform",
|
||||||
|
"{$selectId}": "cat",
|
||||||
|
"{$required}": "",
|
||||||
|
"{$show_option_none}": "选择分类",
|
||||||
|
"{$title}": "",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseAttr(attr map[any]any) string {
|
||||||
|
var attrs []string
|
||||||
|
class := maps.GetAnyAnyValWithDefaults(attr, "", "className")
|
||||||
|
classes := strings.Split(class, " ")
|
||||||
|
fontsize := maps.GetAnyAnyValWithDefaults(attr, "", "fontSize")
|
||||||
|
if fontsize != "" {
|
||||||
|
classes = append(classes, fmt.Sprintf("has-%s-font-size", fontsize))
|
||||||
|
}
|
||||||
|
style := maps.GetAnyAnyValWithDefaults[map[any]any](attr, nil, "style", "typography")
|
||||||
|
if len(style) > 0 {
|
||||||
|
styless := maps.AnyAnyMap(style, func(k, v any) (string, string, bool) {
|
||||||
|
kk, ok := k.(string)
|
||||||
|
if !ok {
|
||||||
|
return "", "", false
|
||||||
|
}
|
||||||
|
vv, ok := v.(string)
|
||||||
|
if !ok {
|
||||||
|
return "", "", false
|
||||||
|
}
|
||||||
|
return kk, vv, true
|
||||||
|
})
|
||||||
|
styles := maps.FilterToSlice(styless, func(k string, v string) (string, bool) {
|
||||||
|
k = str.CamelCaseTo(k, '-')
|
||||||
|
return str.Join(k, ":", v), true
|
||||||
|
})
|
||||||
|
attrs = append(attrs, fmt.Sprintf(`style="%s;"`, strings.Join(styles, ";")))
|
||||||
|
}
|
||||||
|
attrs = append(attrs, fmt.Sprintf(`class="%s"`, strings.Join(classes, " ")))
|
||||||
|
return strings.Join(attrs, " ")
|
||||||
|
}
|
||||||
|
|
||||||
|
func Category(h *wp.Handle, id string, blockParser ParserBlock) (func() string, error) {
|
||||||
|
counter := number.Counters[int]()
|
||||||
|
var con any
|
||||||
|
err := json.Unmarshal([]byte(blockParser.Attrs), &con)
|
||||||
|
if err != nil {
|
||||||
|
logs.ErrPrintln(err, "解析category attr错误", blockParser.Attrs)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var conf map[any]any
|
||||||
|
switch con.(type) {
|
||||||
|
case map[any]any:
|
||||||
|
conf = con.(map[any]any)
|
||||||
|
case map[string]any:
|
||||||
|
conf = maps.StrAnyToAnyAny(con.(map[string]any))
|
||||||
|
}
|
||||||
|
conf = maps.FilterZeroMerge(categoryConf(), conf)
|
||||||
|
|
||||||
|
if maps.GetAnyAnyValWithDefaults(conf, false, "showPostCounts") {
|
||||||
|
conf["count"] = int64(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if maps.GetAnyAnyValWithDefaults(conf, false, "displayAsDropdown") {
|
||||||
|
conf["dropdown"] = int64(1)
|
||||||
|
}
|
||||||
|
if maps.GetAnyAnyValWithDefaults(conf, false, "showHierarchy") {
|
||||||
|
conf["hierarchical"] = int64(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if maps.GetAnyAnyValWithDefaults(conf, false, "showEmpty") {
|
||||||
|
h.C.Set("showEmpty", true)
|
||||||
|
}
|
||||||
|
if maps.GetAnyAnyValWithDefaults(conf, false, "showOnlyTopLevel") {
|
||||||
|
h.C.Set("showOnlyTopLevel", true)
|
||||||
|
}
|
||||||
|
args := maps.FilterZeroMerge(categoryDefaultArgs(), wp.GetComponentsArgs[map[string]string](h, blocks.Categories, nil))
|
||||||
|
return func() string {
|
||||||
|
return category(h, id, counter, args, conf)
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func category(h *wp.Handle, id string, counter number.Counter[int], args map[string]string, conf map[any]any) string {
|
||||||
|
var out = ""
|
||||||
|
categories := cache.CategoriesTags(h.C, constraints2.Category)
|
||||||
|
class := []string{"widget", "widget_block", "widget_categories"}
|
||||||
|
classx := maps.GetAnyAnyValWithDefaults(conf, "", "className")
|
||||||
|
classes := strings.Split(classx, " ")
|
||||||
|
classes = append(classes, "wp-block-categories")
|
||||||
|
if conf["dropdown"].(int64) == 1 {
|
||||||
|
classes = append(classes, "wp-block-categories-dropdown")
|
||||||
|
conf["className"] = strings.Join(classes, " ")
|
||||||
|
out = dropdown(h, categories, counter(), args, conf)
|
||||||
|
} else {
|
||||||
|
classes = append(classes, "wp-block-categories-list")
|
||||||
|
conf["className"] = strings.Join(classes, " ")
|
||||||
|
out = categoryUl(h, categories, conf)
|
||||||
|
}
|
||||||
|
before := fmt.Sprintf(args["{$before_widget}"], id, strings.Join(class, " "))
|
||||||
|
return str.Join(before, out, args["{$after_widget}"])
|
||||||
|
}
|
||||||
|
|
||||||
|
func categoryUl(h *wp.Handle, categories []models.TermsMy, conf map[any]any) string {
|
||||||
|
s := str.NewBuilder()
|
||||||
|
li := widget.CategoryLi(h, conf, categories)
|
||||||
|
attrs := reload.GetAnyValBys("block-category-attr", conf, parseAttr)
|
||||||
|
s.Sprintf(`<ul %s>%s</ul>`, attrs, li)
|
||||||
|
return s.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func dropdown(h *wp.Handle, categories []models.TermsMy, id int, args map[string]string, conf map[any]any) string {
|
||||||
|
s := str.NewBuilder()
|
||||||
|
ids := fmt.Sprintf(`wp-block-categories-%v`, id)
|
||||||
|
args["{$selectId}"] = ids
|
||||||
|
attrs := reload.GetAnyValBys("block-category-attr", conf, parseAttr)
|
||||||
|
selects := widget.DropdownCategories(h, args, conf, categories)
|
||||||
|
s.Sprintf(`<div %s><label class="screen-reader-text" for="%s">%s</label>%s%s</div>`, attrs, ids, args["{$title}"], selects, strings.ReplaceAll(categoryDropdownScript, "{$id}", ids))
|
||||||
|
return s.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
var categoryDropdownScript = `
|
||||||
|
<script type='text/javascript'>
|
||||||
|
/* <![CDATA[ */
|
||||||
|
( function() {
|
||||||
|
const dropdown = document.getElementById( '{$id}' );
|
||||||
|
function onCatChange() {
|
||||||
|
if ( dropdown.options[ dropdown.selectedIndex ].value > 0 ) {
|
||||||
|
location.href = "/?cat=" + dropdown.options[ dropdown.selectedIndex ].value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dropdown.onchange = onCatChange;
|
||||||
|
})();
|
||||||
|
/* ]]> */
|
||||||
|
</script>
|
||||||
|
`
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"github.com/fthvgb1/wp-go/helper/maps"
|
"github.com/fthvgb1/wp-go/helper/maps"
|
||||||
"github.com/fthvgb1/wp-go/helper/slice"
|
"github.com/fthvgb1/wp-go/helper/slice"
|
||||||
str "github.com/fthvgb1/wp-go/helper/strings"
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/cmd/reload"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/models"
|
"github.com/fthvgb1/wp-go/internal/pkg/models"
|
||||||
|
@ -47,11 +48,19 @@ func archivesConfig() map[any]any {
|
||||||
}
|
}
|
||||||
|
|
||||||
func Archive(h *wp.Handle) string {
|
func Archive(h *wp.Handle) string {
|
||||||
|
args := reload.GetAnyValBys("widget-archive-args", h, func(h *wp.Handle) map[string]string {
|
||||||
archiveArgs := archiveArgs()
|
archiveArgs := archiveArgs()
|
||||||
archivesConfig := archivesConfig()
|
|
||||||
args := wp.GetComponentsArgs(h, widgets.Archive, archiveArgs)
|
args := wp.GetComponentsArgs(h, widgets.Archive, archiveArgs)
|
||||||
args = maps.FilterZeroMerge(archiveArgs, args)
|
args = maps.FilterZeroMerge(archiveArgs, args)
|
||||||
|
return args
|
||||||
|
})
|
||||||
|
|
||||||
|
conf := reload.GetAnyValBys("widget-archive-conf", h, func(h *wp.Handle) map[any]any {
|
||||||
|
archivesConfig := archivesConfig()
|
||||||
conf := wpconfig.GetPHPArrayVal("widget_archives", archivesConfig, int64(2))
|
conf := wpconfig.GetPHPArrayVal("widget_archives", archivesConfig, int64(2))
|
||||||
|
return conf
|
||||||
|
})
|
||||||
|
|
||||||
args["{$title}"] = str.Join(args["{$before_title}"], conf["title"].(string), args["{$after_title}"])
|
args["{$title}"] = str.Join(args["{$before_title}"], conf["title"].(string), args["{$after_title}"])
|
||||||
if id, ok := args["{$id}"]; ok && id != "" {
|
if id, ok := args["{$id}"]; ok && id != "" {
|
||||||
args["{$before_widget}"] = strings.ReplaceAll(args["{$before_widget}"], "2", args["{$id}"])
|
args["{$before_widget}"] = strings.ReplaceAll(args["{$before_widget}"], "2", args["{$id}"])
|
||||||
|
|
|
@ -6,6 +6,7 @@ import (
|
||||||
"github.com/fthvgb1/wp-go/helper/slice"
|
"github.com/fthvgb1/wp-go/helper/slice"
|
||||||
str "github.com/fthvgb1/wp-go/helper/strings"
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
"github.com/fthvgb1/wp-go/helper/tree"
|
"github.com/fthvgb1/wp-go/helper/tree"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/cmd/reload"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
||||||
|
@ -53,10 +54,17 @@ func categoryArgs() map[string]string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func Category(h *wp.Handle) string {
|
func Category(h *wp.Handle) string {
|
||||||
|
args := reload.GetAnyValBys("widget-category-args", h, func(h *wp.Handle) map[string]string {
|
||||||
args := wp.GetComponentsArgs(h, widgets.Categories, categoryArgs())
|
args := wp.GetComponentsArgs(h, widgets.Categories, categoryArgs())
|
||||||
args = maps.FilterZeroMerge(categoryArgs(), args)
|
args = maps.FilterZeroMerge(categoryArgs(), args)
|
||||||
|
return args
|
||||||
|
})
|
||||||
|
conf := reload.GetAnyValBys("widget-category-conf", h, func(a *wp.Handle) map[any]any {
|
||||||
conf := wpconfig.GetPHPArrayVal("widget_categories", categoryConfig(), int64(2))
|
conf := wpconfig.GetPHPArrayVal("widget_categories", categoryConfig(), int64(2))
|
||||||
conf = maps.FilterZeroMerge(categoryConfig(), conf)
|
conf = maps.FilterZeroMerge(categoryConfig(), conf)
|
||||||
|
return conf
|
||||||
|
})
|
||||||
|
|
||||||
args["{$title}"] = str.Join(args["{$before_title}"], conf["title"].(string), args["{$after_title}"])
|
args["{$title}"] = str.Join(args["{$before_title}"], conf["title"].(string), args["{$after_title}"])
|
||||||
t := categoryTemplate
|
t := categoryTemplate
|
||||||
dropdown := conf["dropdown"].(int64)
|
dropdown := conf["dropdown"].(int64)
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"github.com/fthvgb1/wp-go/helper/maps"
|
"github.com/fthvgb1/wp-go/helper/maps"
|
||||||
"github.com/fthvgb1/wp-go/helper/slice"
|
"github.com/fthvgb1/wp-go/helper/slice"
|
||||||
str "github.com/fthvgb1/wp-go/helper/strings"
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/cmd/reload"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
||||||
"github.com/fthvgb1/wp-go/internal/theme/wp"
|
"github.com/fthvgb1/wp-go/internal/theme/wp"
|
||||||
"github.com/fthvgb1/wp-go/internal/wpconfig"
|
"github.com/fthvgb1/wp-go/internal/wpconfig"
|
||||||
|
@ -33,9 +34,12 @@ func metaArgs() map[string]string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func Meta(h *wp.Handle) string {
|
func Meta(h *wp.Handle) string {
|
||||||
|
args := reload.GetAnyValBys("widget-meta-args", h, func(h *wp.Handle) map[string]string {
|
||||||
metaArgs := metaArgs()
|
metaArgs := metaArgs()
|
||||||
args := wp.GetComponentsArgs(h, widgets.Meta, metaArgs)
|
args := wp.GetComponentsArgs(h, widgets.Meta, metaArgs)
|
||||||
args = maps.FilterZeroMerge(metaArgs, args)
|
args = maps.FilterZeroMerge(metaArgs, args)
|
||||||
|
return args
|
||||||
|
})
|
||||||
args["{$title}"] = wpconfig.GetPHPArrayVal("widget_meta", "其它操作", int64(2), "title")
|
args["{$title}"] = wpconfig.GetPHPArrayVal("widget_meta", "其它操作", int64(2), "title")
|
||||||
if id, ok := args["{$id}"]; ok && id != "" {
|
if id, ok := args["{$id}"]; ok && id != "" {
|
||||||
args["{$before_widget}"] = strings.ReplaceAll(args["{$before_widget}"], "2", args["{$id}"])
|
args["{$before_widget}"] = strings.ReplaceAll(args["{$before_widget}"], "2", args["{$id}"])
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"github.com/fthvgb1/wp-go/helper/maps"
|
"github.com/fthvgb1/wp-go/helper/maps"
|
||||||
"github.com/fthvgb1/wp-go/helper/slice"
|
"github.com/fthvgb1/wp-go/helper/slice"
|
||||||
str "github.com/fthvgb1/wp-go/helper/strings"
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/cmd/reload"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/models"
|
"github.com/fthvgb1/wp-go/internal/pkg/models"
|
||||||
|
@ -46,12 +47,20 @@ var recentCommentsTemplate = `{$before_widget}
|
||||||
`
|
`
|
||||||
|
|
||||||
func RecentComments(h *wp.Handle) string {
|
func RecentComments(h *wp.Handle) string {
|
||||||
recentCommentsArgs := recentCommentsArgs()
|
args := reload.GetAnyValBys("widget-recent-comment-args", h, func(h *wp.Handle) map[string]string {
|
||||||
recentCommentConf := recentCommentConf()
|
commentsArgs := recentCommentsArgs()
|
||||||
args := wp.GetComponentsArgs(h, widgets.RecentComments, recentCommentsArgs)
|
args := wp.GetComponentsArgs(h, widgets.RecentComments, commentsArgs)
|
||||||
args = maps.FilterZeroMerge(recentCommentsArgs, args)
|
args = maps.FilterZeroMerge(commentsArgs, args)
|
||||||
conf := wpconfig.GetPHPArrayVal("widget_recent-comments", recentCommentConf, int64(2))
|
return args
|
||||||
conf = maps.FilterZeroMerge(recentCommentConf, conf)
|
})
|
||||||
|
|
||||||
|
conf := reload.GetAnyValBys("widget-recent-comment-conf", h, func(h *wp.Handle) map[any]any {
|
||||||
|
commentConf := recentCommentConf()
|
||||||
|
conf := wpconfig.GetPHPArrayVal("widget_recent-comments", commentConf, int64(2))
|
||||||
|
conf = maps.FilterZeroMerge(commentConf, conf)
|
||||||
|
return conf
|
||||||
|
})
|
||||||
|
|
||||||
args["{$title}"] = str.Join(args["{$before_title}"], conf["title"].(string), args["{$after_title}"])
|
args["{$title}"] = str.Join(args["{$before_title}"], conf["title"].(string), args["{$after_title}"])
|
||||||
if id, ok := args["{$id}"]; ok && id != "" {
|
if id, ok := args["{$id}"]; ok && id != "" {
|
||||||
args["{$before_widget}"] = strings.ReplaceAll(args["{$before_widget}"], "2", args["{$id}"])
|
args["{$before_widget}"] = strings.ReplaceAll(args["{$before_widget}"], "2", args["{$id}"])
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"github.com/fthvgb1/wp-go/helper/maps"
|
"github.com/fthvgb1/wp-go/helper/maps"
|
||||||
"github.com/fthvgb1/wp-go/helper/slice"
|
"github.com/fthvgb1/wp-go/helper/slice"
|
||||||
str "github.com/fthvgb1/wp-go/helper/strings"
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/cmd/reload"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
"github.com/fthvgb1/wp-go/internal/pkg/cache"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
||||||
|
@ -47,12 +48,19 @@ func recentConf() map[any]any {
|
||||||
}
|
}
|
||||||
|
|
||||||
func RecentPosts(h *wp.Handle) string {
|
func RecentPosts(h *wp.Handle) string {
|
||||||
recentPostsArgs := recentPostsArgs()
|
args := reload.GetAnyValBys("widget-recent-posts-args", h, func(h *wp.Handle) map[string]string {
|
||||||
recentConf := recentConf()
|
recent := recentPostsArgs()
|
||||||
args := wp.GetComponentsArgs(h, widgets.RecentPosts, recentPostsArgs)
|
args := wp.GetComponentsArgs(h, widgets.RecentPosts, recent)
|
||||||
args = maps.FilterZeroMerge(recentPostsArgs, args)
|
args = maps.FilterZeroMerge(recent, args)
|
||||||
conf := wpconfig.GetPHPArrayVal[map[any]any]("widget_recent-posts", recentConf, int64(2))
|
return args
|
||||||
conf = maps.FilterZeroMerge(recentConf, conf)
|
})
|
||||||
|
conf := reload.GetAnyValBys("widget-recent-posts-conf", h, func(h *wp.Handle) map[any]any {
|
||||||
|
recent := recentConf()
|
||||||
|
conf := wpconfig.GetPHPArrayVal[map[any]any]("widget_recent-posts", recent, int64(2))
|
||||||
|
conf = maps.FilterZeroMerge(recent, conf)
|
||||||
|
return conf
|
||||||
|
})
|
||||||
|
|
||||||
if id, ok := args["{$id}"]; ok && id != "" {
|
if id, ok := args["{$id}"]; ok && id != "" {
|
||||||
args["{$before_widget}"] = strings.ReplaceAll(args["{$before_widget}"], "2", args["{$id}"])
|
args["{$before_widget}"] = strings.ReplaceAll(args["{$before_widget}"], "2", args["{$id}"])
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"github.com/fthvgb1/wp-go/helper/maps"
|
"github.com/fthvgb1/wp-go/helper/maps"
|
||||||
"github.com/fthvgb1/wp-go/helper/slice"
|
"github.com/fthvgb1/wp-go/helper/slice"
|
||||||
str "github.com/fthvgb1/wp-go/helper/strings"
|
str "github.com/fthvgb1/wp-go/helper/strings"
|
||||||
|
"github.com/fthvgb1/wp-go/internal/cmd/reload"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints"
|
||||||
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
"github.com/fthvgb1/wp-go/internal/pkg/constraints/widgets"
|
||||||
"github.com/fthvgb1/wp-go/internal/theme/wp"
|
"github.com/fthvgb1/wp-go/internal/theme/wp"
|
||||||
|
@ -49,9 +50,12 @@ func searchArgs() map[string]string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func Search(h *wp.Handle) string {
|
func Search(h *wp.Handle) string {
|
||||||
searchArgs := searchArgs()
|
args := reload.GetAnyValBys("widget-search-args", h, func(h *wp.Handle) map[string]string {
|
||||||
args := wp.GetComponentsArgs(h, widgets.Search, searchArgs)
|
search := searchArgs()
|
||||||
args = maps.FilterZeroMerge(searchArgs, args)
|
args := wp.GetComponentsArgs(h, widgets.Search, search)
|
||||||
|
args = maps.FilterZeroMerge(search, args)
|
||||||
|
return args
|
||||||
|
})
|
||||||
if args["{$title}"] == "" {
|
if args["{$title}"] == "" {
|
||||||
args["{$title}"] = wpconfig.GetPHPArrayVal("widget_search", "", int64(2), "title")
|
args["{$title}"] = wpconfig.GetPHPArrayVal("widget_search", "", int64(2), "title")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user