修复: 浮点数切割没有数据

davyxu · Apr 11, 2018 · 1abbb7b · 1abbb7b
1 parent 92ac167
commit 1abbb7b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/v2/sheet_data.go b/v2/sheet_data.go
@@ -154,7 +154,7 @@ func (self *DataSheet) processLine(fieldDef *model.FieldDescriptor, line *model.
 
 	var rawValue string
 	// 浮点数按本来的格式输出
-	if fieldDef.Type == model.FieldType_Float {
+	if fieldDef.Type == model.FieldType_Float && !fieldDef.IsRepeated {
 		rawValue = self.GetCellDataAsNumeric(self.Row, self.Column)
 	} else {
 		rawValue = self.GetCellData(self.Row, self.Column)

diff --git a/v2/test/Config.json b/v2/test/Config.json
@@ -2,9 +2,9 @@
 	"Tool": "github.com/davyxu/tabtoy",
 	"Version": "2.8.10",
 	"UnitTest":[
-		{ "FloatNumber": 3.14159, "str": "card\\player_slat_016" },
-		{ "FloatNumber": 4.5, "str": "ret\nnext" },
-		{ "FloatNumber": 4.6, "str": "ret\rnext" },
-		{ "FloatNumber": 1.6 },
-		{ "FloatNumber": 5.89 }
+		{ "FloatNumber": 3.14159, "str": "card\\player_slat_016", "HPByLevel":[ 0.1, 0.2 ] },
+		{ "FloatNumber": 4.5, "str": "ret\nnext", "HPByLevel":[  ] },
+		{ "FloatNumber": 4.6, "str": "ret\rnext", "HPByLevel":[  ] },
+		{ "FloatNumber": 1.6, "HPByLevel":[  ] },
+		{ "FloatNumber": 5.89, "HPByLevel":[  ] }
 	]}
diff --git a/v2/test/UnitTest.xlsx b/v2/test/UnitTest.xlsx