chore: 优化代码、新增订单详情组件

Author: tangtanglove

engine.go

@@ -22,7 +22,7 @@ const (
 	AppName = "QuarkGo"
 
 	// 版本号
-	Version = "3.8.2"
+	Version = "3.8.3"
 
 	// 包名
 	PkgName = "github.com/quarkcloudio/quark-go/v3"

template/admin/component/descriptions/field.go

@@ -12,22 +12,17 @@ type Field struct {
 // 初始化
 func (p *Field) Init() *Field {
 	p.Component = "descriptionField"
-
 	p.SetKey(component.DEFAULT_KEY, component.DEFAULT_CRYPT)
-
 	return p
 }
 
 // text组件
 func (p *Field) Text(params ...string) *fields.Text {
-
 	fields := &fields.Text{}
-
 	if len(params) == 1 {
 		fields = fields.Init().SetDataIndex(params[0]).SetLabel(params[0])
 	} else {
 		fields = fields.Init().SetDataIndex(params[0]).SetLabel(params[1])
 	}
-
 	return fields
 }

template/admin/component/order/info.go

@@ -0,0 +1,71 @@
+package order
+
+import "github.com/quarkcloudio/quark-go/v3/template/admin/component/component"
+
+type Info struct {
+	component.Element
+	Title      string      `json:"title"`
+	Column     int         `json:"column"`
+	Layout     string      `json:"layout"`
+	Colon      bool        `json:"colon"`
+	DataIndex  string      `json:"dataIndex"`
+	Items      []Item      `json:"items"`
+	DataSource interface{} `json:"dataSource"`
+}
+
+// 初始化组件
+func NewInfo() *Info {
+	return (&Info{}).Init()
+}
+
+// 初始化
+func (p *Info) Init() *Info {
+	p.Component = "info"
+	p.Column = 5
+	p.Colon = true
+	p.Layout = "horizontal"
+	p.SetKey(component.DEFAULT_KEY, component.DEFAULT_CRYPT)
+	return p
+}
+
+// 设置标题
+func (p *Info) SetTitle(title string) *Info {
+	p.Title = title
+	return p
+}
+
+// 设置列数量
+func (p *Info) SetColumn(column int) *Info {
+	p.Column = column
+	return p
+}
+
+// 设置布局 vertical 或者 horizontal
+func (p *Info) SetLayout(layout string) *Info {
+	p.Layout = layout
+	return p
+}
+
+// 是否有冒号分割
+func (p *Info) SetColon(colon bool) *Info {
+	p.Colon = colon
+	return p
+}
+
+// 设置数据索引
+func (p *Info) SetDataIndex(dataIndex string) *Info {
+	p.DataIndex = dataIndex
+	return p
+}
+
+// 设置展示项
+func (p *Info) SetItems(items []Item) *Info {
+	p.Items = items
+	return p
+}
+
+// 设置数据源
+func (p *Info) SetDataSource(dataSource interface{}) *Info {
+	p.DataSource = dataSource
+	return p
+}

template/admin/component/order/order.go

@@ -0,0 +1,138 @@
+package order
+
+import "github.com/quarkcloudio/quark-go/v3/template/admin/component/component"
+
+type Component struct {
+	component.Element
+	InitApi         string  `json:"initApi"`
+	Icon            string  `json:"icon"`
+	OrderNoText     string  `json:"orderNoText"`
+	OrderNoName     string  `json:"orderNoName"`
+	OrderDetailText string  `json:"orderDetailText"`
+	OrderItemText   string  `json:"orderItemText"`
+	OrderStatusText string  `json:"orderStatusText"`
+	Info            *Info   `json:"info"`
+	DetailInfo      []*Info `json:"detailInfo"`
+	ItemInfo        *Table  `json:"itemInfo"`
+	StatusInfo      *Table  `json:"statusInfo"`
+}
+
+type Column struct {
+	Title     string `json:"title"`
+	DataIndex string `json:"dataIndex"`
+	ValueType string `json:"valueType"`
+}
+
+type Item struct {
+	Key   string `json:"key"`
+	Label string `json:"label"`
+}
+
+// 初始化组件
+func New() *Component {
+	return (&Component{}).Init()
+}
+
+//  NewColumn("name", "标题") 或者 NewColumn("name", "标题", "image")
+func NewColumn(params ...string) Column {
+	column := Column{}
+	if len(params) == 2 {
+		column.DataIndex = params[0]
+		column.Title = params[1]
+		column.ValueType = "text"
+	}
+	if len(params) == 3 {
+		column.DataIndex = params[0]
+		column.Title = params[1]
+		column.ValueType = params[2]
+	}
+	return column
+}
+
+func NewItem(key string, label string) Item {
+	return Item{key, label}
+}
+
+// 初始化
+func (p *Component) Init() *Component {
+	p.Component = "order"
+	p.OrderNoName = "order_no"
+	p.OrderNoText = "订单号"
+	p.OrderDetailText = "订单信息"
+	p.OrderItemText = "商品信息"
+	p.OrderStatusText = "订单记录"
+	p.SetKey(component.DEFAULT_KEY, component.DEFAULT_CRYPT)
+	return p
+}
+
+// Set style.
+func (p *Component) SetStyle(style map[string]interface{}) *Component {
+	p.Style = style
+	return p
+}
+
+// 初始化数据接口
+func (p *Component) SetInitApi(initApi string) *Component {
+	p.InitApi = initApi
+	return p
+}
+
+// 设置图标地址
+func (p *Component) SetIcon(icon string) *Component {
+	p.Icon = icon
+	return p
+}
+
+// 设置订单号展示文本
+func (p *Component) SetOrderNoText(orderNoText string) *Component {
+	p.OrderNoText = orderNoText
+	return p
+}
+
+// 设置订单信息展示文本
+func (p *Component) SetOrderDetailText(orderDetailText string) *Component {
+	p.OrderDetailText = orderDetailText
+	return p
+}
+
+// 设置商品信息展示文本
+func (p *Component) SetOrderItemText(orderItemText string) *Component {
+	p.OrderItemText = orderItemText
+	return p
+}
+
+// 设置订单记录展示文本
+func (p *Component) SetOrderStatusText(orderStatusText string) *Component {
+	p.OrderStatusText = orderStatusText
+	return p
+}
+
+// 设置订单号name
+func (p *Component) SetOrderNoName(orderNoName string) *Component {
+	p.OrderNoName = orderNoName
+	return p
+}
+
+// 设置订单基本信息
+func (p *Component) SetInfo(info *Info) *Component {
+	p.Info = info
+	return p
+}
+
+// 设置订单信息
+func (p *Component) SetDetailInfo(detailInfo []*Info) *Component {
+	p.DetailInfo = detailInfo
+	return p
+}
+
+// 设置商品信息
+func (p *Component) SetItemInfo(itemInfo *Table) *Component {
+	p.ItemInfo = itemInfo
+	return p
+}
+
+// 设置订单记录
+func (p *Component) SetStatusInfo(statusInfo *Table) *Component {
+	p.StatusInfo = statusInfo
+	return p
+}

template/admin/component/order/table.go

@@ -0,0 +1,30 @@
+package order
+
+type Table struct {
+	DataIndex  string        `json:"dataIndex"`
+	Columns    []Column      `json:"columns"`
+	DataSource []interface{} `json:"dataSource"`
+}
+
+// 初始化组件
+func NewTable() *Table {
+	return &Table{}
+}
+
+// 设置数据源
+func (p *Table) SetColumn(columns []Column) *Table {
+	p.Columns = columns
+	return p
+}
+
+// 设置数据索引
+func (p *Table) SetDataIndex(dataIndex string) *Table {
+	p.DataIndex = dataIndex
+	return p
+}
+
+// 设置数据源
+func (p *Table) SetDataSource(dataSource []interface{}) *Table {
+	p.DataSource = dataSource
+	return p
+}

template/admin/resource/requests/store.go

@@ -93,5 +93,5 @@ func (p *StoreRequest) Handle(ctx *quark.Context, data map[string]interface{}) e
 	// 保存后回调
 	err = template.AfterSaved(ctx, id, data, model)
 
-	return template.AfterSavedRedirectTo(ctx, err)
+	return template.AfterSavedRedirectTo(ctx, id, data, err)
 }

template/admin/resource/requests/update.go

@@ -89,5 +89,5 @@ func (p *UpdateRequest) Handle(ctx *quark.Context) error {
 	// 保存后回调
 	err = template.AfterSaved(ctx, int(data["id"].(float64)), data, query)
 
-	return template.AfterSavedRedirectTo(ctx, err)
+	return template.AfterSavedRedirectTo(ctx, int(data["id"].(float64)), data, err)
 }

template/admin/resource/resource_form.go

@@ -151,7 +151,7 @@ func (p *Template) AfterSaved(ctx *quark.Context, id int, data map[string]interf
 }
 
 // 保存数据后跳转回调
-func (p *Template) AfterSavedRedirectTo(ctx *quark.Context, err error) error {
+func (p *Template) AfterSavedRedirectTo(ctx *quark.Context, id int, data map[string]interface{}, err error) error {
 
 	// 返回错误信息
 	if err != nil {

template/admin/resource/types/resourcer.go

@@ -247,7 +247,7 @@ type Resourcer interface {
 	AfterSaved(ctx *quark.Context, id int, data map[string]interface{}, result *gorm.DB) error
 
 	// 保存数据后跳转回调
-	AfterSavedRedirectTo(ctx *quark.Context, err error) error
+	AfterSavedRedirectTo(ctx *quark.Context, id int, data map[string]interface{}, err error) error
 
 	// 列表页表格主体
 	IndexTableExtraRender(ctx *quark.Context) interface{}