chore: wip

tangtanglove · tangtanglove · commit e2a627b0a9d8 · 2025-03-20T22:09:59.000+08:00
diff --git a/engine.go b/engine.go
@@ -242,8 +242,8 @@ func (p *Engine) initPaths() {
 
 						// 加载初始化数据
 						av.(interface {
-							LoadInitData(ctx *Context) interface{}
-						}).LoadInitData(&Context{})
+							New(ctx *Context) interface{}
+						}).New(&Context{})
 
 						// uri唯一标识
 						uriKey := av.(interface {
diff --git a/template/admin/resource/actions/action.go b/template/admin/resource/actions/action.go
@@ -94,7 +94,7 @@ type Action struct {
 }
 
 // 加载初始化数据
-func (p *Action) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Action) New(ctx *quark.Context) interface{} {
 	p.ActionType = "ajax"
 
 	return p
diff --git a/template/admin/resource/actions/drawer.go b/template/admin/resource/actions/drawer.go
@@ -9,7 +9,7 @@ type Drawer struct {
 }
 
 // 初始化
-func (p *Drawer) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Drawer) New(ctx *quark.Context) interface{} {
 	p.ActionType = "drawer"
 	p.Width = 520
 
diff --git a/template/admin/resource/actions/drawer_form.go b/template/admin/resource/actions/drawer_form.go
@@ -13,7 +13,7 @@ type DrawerForm struct {
 }
 
 // 初始化
-func (p *DrawerForm) LoadInitData(ctx *quark.Context) interface{} {
+func (p *DrawerForm) New(ctx *quark.Context) interface{} {
 	p.ActionType = "drawerForm"
 	p.Width = 520
 	p.Reload = "table"
diff --git a/template/admin/resource/actions/dropdown.go b/template/admin/resource/actions/dropdown.go
@@ -16,7 +16,7 @@ type Dropdown struct {
 }
 
 // 初始化
-func (p *Dropdown) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Dropdown) New(ctx *quark.Context) interface{} {
 	p.ActionType = "dropdown"
 	p.Placement = "bottomLeft"
 	p.Trigger = append(p.Trigger, "hover")
@@ -60,7 +60,7 @@ func (p *Dropdown) GetMenu(ctx *quark.Context) interface{} {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
diff --git a/template/admin/resource/actions/link.go b/template/admin/resource/actions/link.go
@@ -9,7 +9,7 @@ type Link struct {
 }
 
 // 初始化
-func (p *Link) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Link) New(ctx *quark.Context) interface{} {
 	p.ActionType = "link"
 	p.Target = "_self"
 
diff --git a/template/admin/resource/actions/modal.go b/template/admin/resource/actions/modal.go
@@ -9,7 +9,7 @@ type Modal struct {
 }
 
 // 初始化
-func (p *Modal) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Modal) New(ctx *quark.Context) interface{} {
 	p.ActionType = "modal"
 	p.Width = 520
 
diff --git a/template/admin/resource/actions/modal_form.go b/template/admin/resource/actions/modal_form.go
@@ -13,7 +13,7 @@ type ModalForm struct {
 }
 
 // 初始化
-func (p *ModalForm) LoadInitData(ctx *quark.Context) interface{} {
+func (p *ModalForm) New(ctx *quark.Context) interface{} {
 	p.ActionType = "modalForm"
 	p.Width = 520
 	p.Reload = "table"
diff --git a/template/admin/resource/actions/step.go b/template/admin/resource/actions/step.go
@@ -7,7 +7,7 @@ type Step struct {
 }
 
 // 初始化
-func (p *Step) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Step) New(ctx *quark.Context) interface{} {
 	p.ActionType = "step"
 	p.Name = []string{"上一步", "下一步"}
 	return p
diff --git a/template/admin/resource/requests/action.go b/template/admin/resource/requests/action.go
@@ -30,7 +30,7 @@ func (p *ActionRequest) Handle(ctx *quark.Context) error {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
@@ -93,7 +93,7 @@ func (p *ActionRequest) Values(ctx *quark.Context) error {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
diff --git a/template/admin/resource/resolves_actions.go b/template/admin/resource/resolves_actions.go
@@ -29,7 +29,7 @@ func (p *Template) IndexTableActions(ctx *quark.Context) interface{} {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
@@ -61,7 +61,7 @@ func (p *Template) IndexTableRowActions(ctx *quark.Context) interface{} {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
@@ -91,7 +91,7 @@ func (p *Template) IndexTableAlertActions(ctx *quark.Context) interface{} {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
@@ -121,7 +121,7 @@ func (p *Template) FormActions(ctx *quark.Context) []interface{} {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
@@ -151,7 +151,7 @@ func (p *Template) FormExtraActions(ctx *quark.Context) interface{} {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
@@ -181,7 +181,7 @@ func (p *Template) DetailActions(ctx *quark.Context) []interface{} {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
@@ -211,7 +211,7 @@ func (p *Template) DetailExtraActions(ctx *quark.Context) interface{} {
 		actionInstance := v.(types.Actioner)
 
 		// 初始化模版
-		actionInstance.LoadInitData(ctx)
+		actionInstance.New(ctx)
 
 		// 初始化
 		actionInstance.Init(ctx)
diff --git a/template/admin/resource/resolves_searches.go b/template/admin/resource/resolves_searches.go
@@ -44,7 +44,7 @@ func (p *Template) IndexSearches(ctx *quark.Context) interface{} {
 		searchInstance := v.(types.Searcher)
 
 		// 初始化模版
-		searchInstance.LoadInitData(ctx)
+		searchInstance.New(ctx)
 
 		// 初始化
 		searchInstance.Init(ctx)
diff --git a/template/admin/resource/searches/cascader.go b/template/admin/resource/searches/cascader.go
@@ -11,7 +11,7 @@ type Cascader struct {
 }
 
 // 加载初始化数据
-func (p *Cascader) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Cascader) New(ctx *quark.Context) interface{} {
 	p.Component = "cascaderField"
 
 	return p
diff --git a/template/admin/resource/searches/date.go b/template/admin/resource/searches/date.go
@@ -7,7 +7,7 @@ type Date struct {
 }
 
 // 加载初始化数据
-func (p *Date) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Date) New(ctx *quark.Context) interface{} {
 	p.Component = "dateField"
 
 	return p
diff --git a/template/admin/resource/searches/date_range.go b/template/admin/resource/searches/date_range.go
@@ -7,7 +7,7 @@ type DateRange struct {
 }
 
 // 加载初始化数据
-func (p *DateRange) LoadInitData(ctx *quark.Context) interface{} {
+func (p *DateRange) New(ctx *quark.Context) interface{} {
 	p.Component = "dateRangeField"
 
 	return p
diff --git a/template/admin/resource/searches/datetime.go b/template/admin/resource/searches/datetime.go
@@ -7,7 +7,7 @@ type Datetime struct {
 }
 
 // 加载初始化数据
-func (p *Datetime) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Datetime) New(ctx *quark.Context) interface{} {
 	p.Component = "datetimeField"
 
 	return p
diff --git a/template/admin/resource/searches/datetime_range.go b/template/admin/resource/searches/datetime_range.go
@@ -7,7 +7,7 @@ type DatetimeRange struct {
 }
 
 // 加载初始化数据
-func (p *DatetimeRange) LoadInitData(ctx *quark.Context) interface{} {
+func (p *DatetimeRange) New(ctx *quark.Context) interface{} {
 	p.Component = "datetimeRangeField"
 
 	return p
diff --git a/template/admin/resource/searches/radio.go b/template/admin/resource/searches/radio.go
@@ -11,7 +11,7 @@ type Radio struct {
 }
 
 // 加载初始化数据
-func (p *Radio) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Radio) New(ctx *quark.Context) interface{} {
 	p.Component = "radioField"
 	return p
 }
diff --git a/template/admin/resource/searches/search.go b/template/admin/resource/searches/search.go
@@ -17,7 +17,7 @@ type Search struct {
 }
 
 // 加载初始化数据
-func (p *Search) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Search) New(ctx *quark.Context) interface{} {
 	p.Component = "textField"
 
 	return p
diff --git a/template/admin/resource/searches/select.go b/template/admin/resource/searches/select.go
@@ -11,7 +11,7 @@ type Select struct {
 }
 
 // 加载初始化数据
-func (p *Select) LoadInitData(ctx *quark.Context) interface{} {
+func (p *Select) New(ctx *quark.Context) interface{} {
 	p.Component = "selectField"
 	return p
 }
diff --git a/template/admin/resource/searches/tree_select.go b/template/admin/resource/searches/tree_select.go
@@ -11,7 +11,7 @@ type TreeSelect struct {
 }
 
 // 加载初始化数据
-func (p *TreeSelect) LoadInitData(ctx *quark.Context) interface{} {
+func (p *TreeSelect) New(ctx *quark.Context) interface{} {
 	p.Component = "treeSelectField"
 
 	return p
diff --git a/template/admin/resource/types/actioner.go b/template/admin/resource/types/actioner.go
@@ -5,7 +5,7 @@ import "github.com/quarkcloudio/quark-go/v3"
 type Actioner interface {
 
 	// 加载初始化数据
-	LoadInitData(ctx *quark.Context) interface{}
+	New(ctx *quark.Context) interface{}
 
 	// 初始化
 	Init(ctx *quark.Context) interface{}
diff --git a/template/admin/resource/types/searcher.go b/template/admin/resource/types/searcher.go
@@ -6,13 +6,12 @@ import (
 )
 
 type Searcher interface {
+	// 加载初始化数据
+	New(ctx *quark.Context) interface{}
 
 	// 初始化
 	Init(ctx *quark.Context) interface{}
 
-	// 加载初始化数据
-	LoadInitData(ctx *quark.Context) interface{}
-
 	// 获取字段名
 	GetColumn(search interface{}) string
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ type Action struct {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`// 加载初始化数据`
`97`		`-func (p Action) LoadInitData(ctx quark.Context) interface{} {`
	`97`	`+func (p Action) New(ctx quark.Context) interface{} {`
`98`	`98`	`p.ActionType = "ajax"`
`99`	`99`
`100`	`100`	`return p`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ type Drawer struct {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`// 初始化`
`12`		`-func (p Drawer) LoadInitData(ctx quark.Context) interface{} {`
	`12`	`+func (p Drawer) New(ctx quark.Context) interface{} {`
`13`	`13`	`p.ActionType = "drawer"`
`14`	`14`	`p.Width = 520`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ type DrawerForm struct {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`// 初始化`
`16`		`-func (p DrawerForm) LoadInitData(ctx quark.Context) interface{} {`
	`16`	`+func (p DrawerForm) New(ctx quark.Context) interface{} {`
`17`	`17`	`p.ActionType = "drawerForm"`
`18`	`18`	`p.Width = 520`
`19`	`19`	`p.Reload = "table"`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ type Link struct {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`// 初始化`
`12`		`-func (p Link) LoadInitData(ctx quark.Context) interface{} {`
	`12`	`+func (p Link) New(ctx quark.Context) interface{} {`
`13`	`13`	`p.ActionType = "link"`
`14`	`14`	`p.Target = "_self"`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ type Modal struct {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`// 初始化`
`12`		`-func (p Modal) LoadInitData(ctx quark.Context) interface{} {`
	`12`	`+func (p Modal) New(ctx quark.Context) interface{} {`
`13`	`13`	`p.ActionType = "modal"`
`14`	`14`	`p.Width = 520`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ type ModalForm struct {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`// 初始化`
`16`		`-func (p ModalForm) LoadInitData(ctx quark.Context) interface{} {`
	`16`	`+func (p ModalForm) New(ctx quark.Context) interface{} {`
`17`	`17`	`p.ActionType = "modalForm"`
`18`	`18`	`p.Width = 520`
`19`	`19`	`p.Reload = "table"`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ type Step struct {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`// 初始化`
`10`		`-func (p Step) LoadInitData(ctx quark.Context) interface{} {`
	`10`	`+func (p Step) New(ctx quark.Context) interface{} {`
`11`	`11`	`p.ActionType = "step"`
`12`	`12`	`p.Name = []string{"上一步", "下一步"}`
`13`	`13`	`return p`