RemoveIndex增加对于object的支持，同时修正Bug

suiyunonghen · Jun 26, 2021 · 94e2967 · 94e2967
1 parent 3f07bad
commit 94e2967
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 11 deletions.
diff --git a/dxvalue.go b/dxvalue.go
@@ -56,40 +56,58 @@ func (obj *VObject)getKv()*strkv  {
 }
 
 func (obj *VObject)Remove(Name string)  {
+	l := len(obj.strkvs)
 	if !obj.keysUnescaped && strings.IndexByte(Name, '\\') < 0 {
-		for i := 0;i<len(obj.strkvs);i++{
+		for i := 0;i<l;i++{
 			if IgnoreCase && strings.EqualFold(obj.strkvs[i].K,Name) || obj.strkvs[i].K == Name {
-				obj.strkvs = append(obj.strkvs[:i],obj.strkvs[i+1:]...)
+				if i == l - 1{
+					obj.strkvs = obj.strkvs[:i]
+				}else{
+					obj.strkvs = append(obj.strkvs[:i],obj.strkvs[i+1:]...)
+				}
 				return
 			}
 		}
 	}
 	//解转义
 	obj.UnEscapestrs()
-	for i := 0;i<len(obj.strkvs);i++{
+	for i := 0;i<l;i++{
 		if IgnoreCase && strings.EqualFold(obj.strkvs[i].K,Name) || obj.strkvs[i].K == Name{
-			obj.strkvs = append(obj.strkvs[:i],obj.strkvs[i+1:]...)
+			if i == l - 1{
+				obj.strkvs = obj.strkvs[:i]
+			}else{
+				obj.strkvs = append(obj.strkvs[:i],obj.strkvs[i+1:]...)
+			}
 			return
 		}
 	}
 }
 
 func (obj *VObject)ExtractValue(Name string)*DxValue  {
+	l := len(obj.strkvs)
 	if !obj.keysUnescaped && strings.IndexByte(Name, '\\') < 0 {
-		for i := 0;i<len(obj.strkvs);i++{
+		for i := 0;i<l;i++{
 			if IgnoreCase && strings.EqualFold(obj.strkvs[i].K,Name) || obj.strkvs[i].K == Name{
 				result := obj.strkvs[i].V
-				obj.strkvs = append(obj.strkvs[:i],obj.strkvs[i+1:]...)
+				if i == l - 1{
+					obj.strkvs = obj.strkvs[:i]
+				}else{
+					obj.strkvs = append(obj.strkvs[:i],obj.strkvs[i+1:]...)
+				}
 				return result
 			}
 		}
 	}
 	//解转义
 	obj.UnEscapestrs()
-	for i := 0;i<len(obj.strkvs);i++{
+	for i := 0;i<l;i++{
 		if IgnoreCase && strings.EqualFold(obj.strkvs[i].K,Name) || obj.strkvs[i].K == Name{
 			result := obj.strkvs[i].V
-			obj.strkvs = append(obj.strkvs[:i],obj.strkvs[i+1:]...)
+			if i == l - 1{
+				obj.strkvs = obj.strkvs[:i]
+			}else{
+				obj.strkvs = append(obj.strkvs[:i],obj.strkvs[i+1:]...)
+			}
 			return result
 		}
 	}
@@ -653,8 +671,20 @@ func (v *DxValue)ExtractValue(Name string)*DxValue  {
 }
 
 func (v *DxValue)RemoveIndex(idx int)  {
-	if v.DataType == VT_Array && idx >= 0 && idx < len(v.farr){
-		v.farr = append(v.farr[:idx],v.farr[idx+1:]...)
+	if v.DataType == VT_Array && idx >= 0 {
+		l := len(v.farr)
+		if idx == l - 1{
+			v.farr = v.farr[:idx]
+		}else if idx < l - 1{
+			v.farr = append(v.farr[:idx],v.farr[idx+1:]...)
+		}
+	}else if v.DataType == VT_Object && idx >= 0 && idx < len(v.fobject.strkvs){
+		l := len(v.fobject.strkvs)
+		if idx == l - 1{
+			v.fobject.strkvs = v.fobject.strkvs[:idx]
+		}else{
+			v.fobject.strkvs = append(v.fobject.strkvs[:idx],v.fobject.strkvs[idx+1:]...)
+		}
 	}
 }
 

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/json-iterator/go v1.1.7
-	github.com/suiyunonghen/DxCommonLib v0.3.3
+	github.com/suiyunonghen/DxCommonLib v0.3.4
 )
 
 //replace github.com/suiyunonghen/DxCommonLib => /../DxCommonLib