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

kernel/av/av.go

@@ -275,8 +275,26 @@ func SaveAttributeView(av *AttributeView) (err error) {
 		}
 
 		for _, v := range kv.Values {
-			if "" == v.KeyID {
-				v.KeyID = kv.Key.ID
+			if "" == kv.Key.ID {
+				kv.Key.ID = ast.NewNodeID()
+				for _, val := range kv.Values {
+					val.KeyID = kv.Key.ID
+				}
+				if "" == v.KeyID {
+					v.KeyID = kv.Key.ID
+				}
+
+				for _, view := range av.Views {
+					switch view.LayoutType {
+					case LayoutTypeTable:
+						for _, column := range view.Table.Columns {
+							if "" == column.ID {
+								column.ID = kv.Key.ID
+								break
+							}
+						}
+					}
+				}
 			}
 		}
 	}

kernel/model/attribute_view.go

@@ -49,7 +49,7 @@ func SearchAttributeViewNonRelationKey(avID, keyword string) (ret []*av.Key) {
 	}
 
 	for _, keyValues := range attrView.KeyValues {
-		if av.KeyTypeRelation != keyValues.Key.Type {
+		if av.KeyTypeRelation != keyValues.Key.Type && av.KeyTypeRollup != keyValues.Key.Type {
 			if strings.Contains(strings.ToLower(keyValues.Key.Name), strings.ToLower(keyword)) {
 				ret = append(ret, keyValues.Key)
 			}