diff --git a/kernel/av/layout.go b/kernel/av/layout.go
index db867d501..720470f8e 100644
--- a/kernel/av/layout.go
+++ b/kernel/av/layout.go
@@ -50,6 +50,7 @@ type BaseInstanceField struct {
 	Name   string  `json:"name"`   // 字段名
 	Type   KeyType `json:"type"`   // 字段类型
 	Icon   string  `json:"icon"`   // 字段图标
+	Wrap   bool    `json:"wrap"`   // 是否换行
 	Hidden bool    `json:"hidden"` // 是否隐藏
 	Desc   string  `json:"desc"`   // 字段描述
 
diff --git a/kernel/av/layout_gallery.go b/kernel/av/layout_gallery.go
index 86761c549..b3b976008 100644
--- a/kernel/av/layout_gallery.go
+++ b/kernel/av/layout_gallery.go
@@ -73,6 +73,7 @@ const (
 type ViewGalleryCardField struct {
 	ID string `json:"id"` // 字段 ID
 
+	Wrap   bool   `json:"wrap"`           // 是否换行
 	Hidden bool   `json:"hidden"`         // 是否隐藏
 	Desc   string `json:"desc,omitempty"` // 字段描述
 }
diff --git a/kernel/av/layout_table.go b/kernel/av/layout_table.go
index 220e4f10a..672d357d1 100644
--- a/kernel/av/layout_table.go
+++ b/kernel/av/layout_table.go
@@ -67,7 +67,6 @@ type Table struct {
 type TableColumn struct {
 	*BaseInstanceField
 
-	Wrap  bool        `json:"wrap"`  // 是否换行
 	Pin   bool        `json:"pin"`   // 是否固定
 	Width string      `json:"width"` // 列宽度
 	Calc  *ColumnCalc `json:"calc"`  // 计算
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index bd2a209a2..5621abfa8 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -68,7 +68,6 @@ func changeAttrViewLayout(operation *Operation) (err error) {
 		return
 	}
 
-	view.LayoutType = newLayout
 	switch newLayout {
 	case av.LayoutTypeTable:
 		if nil != view.Table {
@@ -102,6 +101,7 @@ func changeAttrViewLayout(operation *Operation) (err error) {
 		}
 	}
 
+	view.LayoutType = newLayout
 	err = av.SaveAttributeView(attrView)
 	return
 }
@@ -1859,6 +1859,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
 		for _, field := range masterView.Gallery.CardFields {
 			view.Gallery.CardFields = append(view.Gallery.CardFields, &av.ViewGalleryCardField{
 				ID:     field.ID,
+				Wrap:   field.Wrap,
 				Hidden: field.Hidden,
 				Desc:   field.Desc,
 			})
diff --git a/kernel/sql/av_table.go b/kernel/sql/av_table.go
index 4dd5d9117..955f16a14 100644
--- a/kernel/sql/av_table.go
+++ b/kernel/sql/av_table.go
@@ -55,6 +55,7 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
 				Name:         key.Name,
 				Type:         key.Type,
 				Icon:         key.Icon,
+				Wrap:         col.Wrap,
 				Hidden:       col.Hidden,
 				Desc:         key.Desc,
 				Options:      key.Options,
@@ -64,7 +65,6 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
 				Rollup:       key.Rollup,
 				Date:         key.Date,
 			},
-			Wrap:  col.Wrap,
 			Width: col.Width,
 			Pin:   col.Pin,
 			Calc:  col.Calc,