diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index bcd1e479e..f1dbbea37 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1208,7 +1208,8 @@ }, "_attrView": { "table": "Table", - "key": "Primary Key" + "key": "Primary Key", + "select": "Select" }, "_kernel": { "0": "Query notebook failed", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index b18f3fd76..797201069 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1208,7 +1208,8 @@ }, "_attrView": { "tabla": "Tabla", - "clave": "Clave principal" + "key": "Clave principal", + "select": "Selección" }, "_kernel": { "0": "Consulta al cuaderno de notas fallido", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 8b3890563..adb80e644 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1208,7 +1208,8 @@ }, "_attrView": { "table": "Tableau", - "key": "Clé primaire" + "key": "Clé primaire", + "select": "Sélectionner" }, "_kernel": { "0": "Échec du cahier de requêtes", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 77af86eb6..d45fe3277 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1208,7 +1208,8 @@ }, "_attrView": { "table": "表格", - "key": "主鍵" + "key": "主鍵", + "select": "單選" }, "_kernel": { "0": "查詢筆記本失敗", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index f83d74dc3..b3738b36d 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1208,7 +1208,8 @@ }, "_attrView": { "table": "表格", - "key": "主键" + "key": "主键", + "select": "单选" }, "_kernel": { "0": "查询笔记本失败", diff --git a/kernel/av/av.go b/kernel/av/av.go index 7abddfdd2..d42c0f306 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -172,7 +172,7 @@ func NewTableView() (ret *View) { return } -func NewTableViewWithBlockKey(blockKeyID string) (view *View, blockKey *Key) { +func NewTableViewWithBlockKey(blockKeyID string) (view *View, blockKey, selectKey *Key) { name := getI18nName("table") view = &View{ ID: ast.NewNodeID(), @@ -188,6 +188,9 @@ func NewTableViewWithBlockKey(blockKeyID string) (view *View, blockKey *Key) { } blockKey = NewKey(blockKeyID, getI18nName("key"), "", KeyTypeBlock) view.Table.Columns = []*ViewTableColumn{{ID: blockKeyID}} + + selectKey = NewKey(ast.NewNodeID(), getI18nName("select"), "", KeyTypeSelect) + view.Table.Columns = append(view.Table.Columns, &ViewTableColumn{ID: selectKey.ID}) return } @@ -202,11 +205,11 @@ type Viewable interface { } func NewAttributeView(id string) (ret *AttributeView) { - view, blockKey := NewTableViewWithBlockKey(ast.NewNodeID()) + view, blockKey, selectKey := NewTableViewWithBlockKey(ast.NewNodeID()) ret = &AttributeView{ Spec: 0, ID: id, - KeyValues: []*KeyValues{{Key: blockKey}}, + KeyValues: []*KeyValues{{Key: blockKey}, {Key: selectKey}}, ViewID: view.ID, Views: []*View{view}, } diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index cd52a232d..52fc6e325 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -596,7 +596,7 @@ func RenderAttributeView(avID, viewID, query string, page, pageSize int) (viewab func renderAttributeView(attrView *av.AttributeView, viewID, query string, page, pageSize int) (viewable av.Viewable, err error) { if 1 > len(attrView.Views) { - view, _ := av.NewTableViewWithBlockKey(ast.NewNodeID()) + view, _, _ := av.NewTableViewWithBlockKey(ast.NewNodeID()) attrView.Views = append(attrView.Views, view) attrView.ViewID = view.ID if err = av.SaveAttributeView(attrView); nil != err {