diff --git a/data/country/v1.xlsx b/data/country/v1.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..d4b277333830907955133dd1c1093a98bfe78785 Binary files /dev/null and b/data/country/v1.xlsx differ diff --git a/demo/test/test_country.yaml b/demo/test/test_country.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6f46d6b1da690c31c7fb2ca0b11453c19d423750 --- /dev/null +++ b/demo/test/test_country.yaml @@ -0,0 +1,34 @@ +title: country name +desc: 测试国家名称 +author: zentao +version: "1.0" +fields: + - field: cnfull + from: base.country.v1.yaml + use: cnfull + prefix: "" + postfix: "\t" + + - field: cnshort + from: base.country.v1.yaml + use: cnshort + prefix: "" + postfix: "\t" + + - field: enfull + from: base.country.v1.yaml + use: enfull + prefix: "" + postfix: "\t" + + - field: enshort + from: base.country.v1.yaml + use: enshort + prefix: "" + postfix: "\t" + + - field: areacode + from: base.country.v1.yaml + use: areacode + prefix: "" + postfix: "\t" \ No newline at end of file diff --git a/demo/test/test_date.yaml b/demo/test/test_date.yaml index e9328ebfc1b8edf0e8dc123bf73d29ac0c8cde14..baae4b8a8dccefe9345a3406d5c73c09a06be9c3 100644 --- a/demo/test/test_date.yaml +++ b/demo/test/test_date.yaml @@ -1,5 +1,5 @@ -title: month date -desc: 月日 +title: date +desc: 测试日期数据 author: zentao version: "1.0" fields: diff --git a/src/gen/excel.go b/src/gen/excel.go index 892d0ba21a20975e2a26f6939d73d0c5d65e6117..32785eec55647b9d3aeadf278268906932a9c08e 100644 --- a/src/gen/excel.go +++ b/src/gen/excel.go @@ -131,6 +131,7 @@ func ConvertSingleExcelToSQLiteIfNeeded(dbName string, path string) (firstSheet if colIndex > 0 { valList = valList + ", " } + colCell = strings.Replace(colCell, "'", "''", -1) valList = valList + "'" + colCell + "'" } valList = valList + ")" diff --git a/yaml/base/country/v1.yaml b/yaml/base/country/v1.yaml new file mode 100644 index 0000000000000000000000000000000000000000..26238dfeff7a5cdd5520fddb04ab44625f8c695f --- /dev/null +++ b/yaml/base/country/v1.yaml @@ -0,0 +1,46 @@ +title: 国家数据 +desc: +author: zentao +version: 1.0 + +field: country +instances: + - instance: cnfull + note: 国家中文全名 + fields: + - field: field1 + from: country.v1 + select: cnfull + postfix: "\t" + + - instance: cnshort + note: 国家中文名 + fields: + - field: field1 + from: country.v1 + select: cnshort + postfix: "\t" + + - instance: enfull + note: 国家英文全名 + fields: + - field: field1 + from: country.v1 + select: enfull + postfix: "\t" + + - instance: enshort + note: 国家英文全名 + fields: + - field: field1 + from: country.v1 + select: enshort + postfix: "\t" + + - instance: areacode + note: 国家编码 + fields: + - field: field1 + from: country.v1 + select: areacode + postfix: "\t" \ No newline at end of file