infra/ii/bootable: 代码优化

infra/ii/bootable/_test/bootable.xml

@@ -22,6 +22,9 @@
             <Label>小数</Label>
             <Enums/>
             <Default/>
+            <Sets>
+                <Set Name="newName" OP="$sum" Value="number,float"/>
+            </Sets>
         </Field>
         <Field Name="array" Type="array" Required="true" Unique="false" Minimum="0" Maximum="0" Decimal="2">
             <Label>数组</Label>

infra/ii/bootable/type.go

@@ -105,7 +105,7 @@ func (q *Filter) handleLookupSearch(pipe *mo.Pipeline, info *ii.ItemInfo, items
 	// 格式化查询
 	q.handleField(match, field, lookField.Name, val, false)
 
-	looker := field.Looker()
+	looker := field.ArgLookup()
 	looker.Pipe(mo.Pipeline{match.Pipeline()})
 
 	*pipe = append(*pipe, looker.Pipeline())
@@ -191,6 +191,14 @@ func (q *Filter) Build(itemInfo ii.ItemInfo, items ii.Items) (mo.Pipeline, error
 		p = append(p, matcher.Pipeline())
 	}
 
+	arg, err := itemInfo.Aggregation(items)
+	if err != nil {
+		return nil, err
+	}
+	if len(arg) > 0 {
+		p = append(p, arg...)
+	}
+
 	if q.Offset > 0 {
 		p = append(p, mo.NewSkip(q.Offset).Pipeline())
 	}

infra/ii/bootable/type_test.go

@@ -86,10 +86,12 @@ func TestInsertTestData(t *testing.T) {
 	bootData2 := make(mo.A, len(names))
 	for i, name := range names {
 		gender := "Female"
+		target := "a1"
 		if i%2 == 1 {
 			gender = "Male"
+			target = "a2"
 		}
-		bootData2[i] = mo.M{"name": name, "age": network.Rand.Int63n(99), "gender": gender, "phone": strconv.FormatInt(network.Rand.Int63n(10000000000), 10), "creationTime": bd2}
+		bootData2[i] = mo.M{"name": name, "age": network.Rand.Int63n(99), "target": target, "gender": gender, "phone": strconv.FormatInt(network.Rand.Int63n(10000000000), 10), "creationTime": bd2}
 	}
 	_ = db.Collection("bootable2").Drop(context.Background())
 	_, err = db.Collection("bootable2").InsertMany(context.Background(), bootData2)
@@ -125,13 +127,8 @@ func initUser() {
 	if err = json.Unmarshal(b, &info); err != nil {
 		panic(err)
 	}
-	itemInfo, err := ii.ReadFile("../_test//user.xml")
-	if err != nil {
-		panic(err)
-	}
 	testUser = ii.User{
 		Data: info,
-		Item: itemInfo,
 	}
 }
 

infra/ii/bootable/utils.go

@@ -64,7 +64,10 @@ func handleTypeObject(info *ii.ItemInfo, row mo.M) {
 }
 
 func handleFieldLookup(info *ii.ItemInfo, row mo.M) {
-	for _, field := range info.LookupField() {
+	for _, field := range info.Fields {
+		if !field.HasLookup() {
+			continue
+		}
 		oldList, ok := row[field.Lookup.AS].(mo.A)
 		if !ok {
 			continue