Merge branch 'master' of https://github.com/easysoft/zendata

demo/19_from_excel.yaml

@@ -26,7 +26,7 @@ fields:
     postfix: "\t"
 
   - field: columns                        # 变量，从excel中读取的列。如果命令指定-F参数，需要包含以避免忽略处理。
-    range: [city,state]
+    range: [city,state, stateShort]
     postfix: "\t"
   - field: conditions                     # 变量，用于where条件里。如果命令指定-F参数，需要包含以避免忽略处理。
     range: [山东,江苏]

src/gen/excel.go

@@ -291,7 +291,6 @@ func ReadDataFromSQLite(field model.DefField, dbName string, tableName string, t
 
 	sqlStr := fmt.Sprintf("SELECT %s FROM `%s` WHERE %s", colStr, from, where)
 	rows, err := vari.DB.Raw(sqlStr).Rows()
-	defer rows.Close()
 
 	if err != nil {
 		logUtils.PrintTo(i118Utils.I118Prt.Sprintf("fail_to_exec_query", "", err.Error()))
@@ -300,6 +299,7 @@ func ReadDataFromSQLite(field model.DefField, dbName string, tableName string, t
 		return list, ""
 	}
 
+	defer rows.Close()
 	valMapArr := make([]map[string]string, 0)
 	columns, err := rows.Columns()
 	colNum := len(columns)