Skip to content

Commit 4cff2e1

Browse files
committed
加入lua tagaciton 参数
1 parent d97239d commit 4cff2e1

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

v3/gen/luasrc/func.go

+19-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ func WrapValue(globals *model.Globals, cell *model.Cell, valueType *model.TypeDe
4141

4242
func init() {
4343
UsefulFunc["WrapTabValue"] = func(globals *model.Globals, dataTable *model.DataTable, allHeaders []*model.TypeDefine, row, col int) (ret string) {
44-
4544
// 找到完整的表头(按完整表头遍历)
4645
header := allHeaders[col]
4746

47+
4848
if header == nil {
4949
return ""
5050
}
@@ -57,8 +57,25 @@ func init() {
5757
return WrapValue(globals, valueCell, header)
5858
} else {
5959
// 这个表中没有这列数据
60-
return WrapValue(globals, nil, header)
60+
return WrapValue(globals, nil, header)
61+
}
62+
}
63+
64+
UsefulFunc["IsWrapFieldName"] = func(globals *model.Globals, dataTable *model.DataTable, allHeaders []*model.TypeDefine, row, col int) (ret bool) {
65+
// 找到完整的表头(按完整表头遍历)
66+
header := allHeaders[col]
67+
68+
69+
if header == nil {
70+
return false
71+
}
72+
73+
if globals.CanDoAction(model.ActionNoGennFieldLua, header) {
74+
return false
6175
}
76+
77+
return true
6278
}
6379

80+
6481
}

v3/gen/luasrc/text.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ return {
77
init = function( g )
88
{{range $di, $tab := .Datas.AllTables}}
99
g.{{$tab.HeaderType}} = { {{range $unusedrow,$row := $tab.DataRowIndex}}{{$headers := $.Types.AllFieldByName $tab.OriginalHeaderType}}
10-
{ {{range $col, $header := $headers}}{{$header.FieldName}} = {{WrapTabValue $ $tab $headers $row $col}}, {{end}}}, {{end}}
10+
{ {{range $col, $header := $headers}}{{if IsWrapFieldName $ $tab $headers $row $col}}{{$header.FieldName}} = {{WrapTabValue $ $tab $headers $row $col}}, {{end}}{{end}}}, {{end}}
1111
}
1212
{{end}}
1313
{{range $ii, $idx := GetIndices $}}
@@ -34,7 +34,7 @@ const templateText_luadir = `-- Generated by github.com/davyxu/tabtoy
3434
return {
3535
init = function( g )
3636
g.{{$.Tab.HeaderType}} = { {{range $unusedrow,$row := $.Tab.DataRowIndex}}{{$headers := $.G.Types.AllFieldByName $.Tab.OriginalHeaderType}}
37-
{ {{range $col, $header := $headers}}{{$header.FieldName}} = {{WrapTabValue $.G $.Tab $headers $row $col}}, {{end}}}, {{end}}
37+
{ {{range $col, $header := $headers}}{{if IsWrapFieldName $.G $.Tab $headers $row $col}}{{$header.FieldName}} = {{WrapTabValue $.G $.Tab $headers $row $col}}, {{end}}{{end}}}, {{end}}
3838
}
3939
{{range $ii, $idx := GetIndicesByTable $.Tab}}
4040
-- {{$idx.Table.HeaderType}}

v3/model/tagaction.go

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const (
1010
ActionNoGenFieldJsonDir = "nogenfield_jsondir"
1111
ActionNoGenFieldBinary = "nogenfield_binary"
1212
ActionNoGenFieldPbBinary = "nogenfield_pbbin"
13+
ActionNoGennFieldLua = "nogenfield_lua"
1314
ActionNoGenTable = "nogentab"
1415
)
1516

0 commit comments

Comments
 (0)