Merge remote-tracking branch 'origin/dev' into dev

2023-07-15 22:39:54 +08:00 · 2023-07-15 22:39:54 +08:00 · ab705cc5f8
commit ab705cc5f8
parent 20bea5a5b6 55a94a2ca8
1 changed files with 2 additions and 1 deletions
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@ -89,10 +89,11 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
 			Name:    key.Name,
 			Type:    key.Type,
 			Icon:    key.Icon,
+			Options: key.Options,
 			Wrap:    col.Wrap,
 			Hidden:  col.Hidden,
 			Width:   col.Width,
-			Options: key.Options,
+			Calc:    col.Calc,
 		})
 	}