diff --git a/data/name/cn.given.v1.xlsx b/data/name/cn.given.v1.xlsx index 0c1d097f8207bb45e04c61407bdb1c799c0dea60..04338b8623f3f3d79e751e512169c7b978fb4085 100644 Binary files a/data/name/cn.given.v1.xlsx and b/data/name/cn.given.v1.xlsx differ diff --git a/demo/default.yaml b/demo/default.yaml index 2b66612c88cb2d4d7aa657686f38b6962dd73465..235b236dfa365cb7c3fbe603e42f36a16aeb7f45 100644 --- a/demo/default.yaml +++ b/demo/default.yaml @@ -64,7 +64,6 @@ author: zentao version: 1.0 fields: - - field: field_common # 默认的列表类型,通过逗号隔成若干区间。 range: 1-10, 20-25, 27, 29, 30 # 1,2,3...,10,20,21,22...,25,27,29.30 prefix: "" # 前缀 diff --git a/src/gen/excel.go b/src/gen/excel.go index f73418e12d61c8f10c924776d2c914bd1f6b6d76..8dc28c02f0cc8421f560f0bb6828e0775ba5b498 100644 --- a/src/gen/excel.go +++ b/src/gen/excel.go @@ -277,7 +277,7 @@ func ReadDataFromSQLite(field model.DefField, dbName string, tableName string) ( colStr = "`词语` AS `" + selectCol + "`" } - sqlStr := fmt.Sprintf("SELECT %s FROM %s WHERE %s", colStr, from, where) + sqlStr := fmt.Sprintf("SELECT %s FROM `%s` WHERE %s", colStr, from, where) rows, err := db.Query(sqlStr) if err != nil { logUtils.PrintTo(i118Utils.I118Prt.Sprintf("fail_to_exec_query", sqlStr, err.Error())) diff --git a/tmp/cache/.data.db b/tmp/cache/.data.db index fbf76cc36464f1018196f36d877a61e52699789b..15921bafa849e0abf7433a605f6200dd0f9ff70b 100644 Binary files a/tmp/cache/.data.db and b/tmp/cache/.data.db differ diff --git a/yaml/article/chinese/jixuwen/01/jixuwen.yaml b/yaml/article/chinese/jixuwen/01/jixuwen.yaml index 9b18ca811f53304c55e55b73a5c2bac5b5627816..783fdf39d697b5392e6fc3a2696b6104d0cae7be 100644 --- a/yaml/article/chinese/jixuwen/01/jixuwen.yaml +++ b/yaml/article/chinese/jixuwen/01/jixuwen.yaml @@ -9,32 +9,4 @@ fields: - field: "2" range: jixuwen-p02-s01.yaml - field: "3" - range: jixuwen-p02-s02.yaml - - field: "4" - range: jixuwen-p03-s01.yaml - - field: "5" - range: jixuwen-p03-s02.yaml - - field: "6" - range: jixuwen-p03-s03.yaml - - field: "7" - range: jixuwen-p03-s04.yaml - - field: "8" - range: jixuwen-p03-s05.yaml - - field: "9" - range: jixuwen-p03-s06.yaml - - field: "10" - range: jixuwen-p04-s01.yaml - - field: "11" - range: jixuwen-p04-s02.yaml - - field: "12" - range: jixuwen-p04-s03.yaml - - field: "13" - range: jixuwen-p05-s01.yaml - - field: "14" - range: jixuwen-p05-s02.yaml - - field: "15" - range: jixuwen-p06-s01.yaml - - field: "16" - range: jixuwen-p06-s02.yaml - - field: "17" - range: jixuwen-p06-s03.yaml + range: jixuwen-p02-s02.yaml \ No newline at end of file