fix 代码生成详情页不查询关联表数据

This commit is contained in:
yxh 2023-02-27 21:56:49 +08:00
parent f992d7dacc
commit 103a5b279b
2 changed files with 20 additions and 1 deletions

View File

@ -31,6 +31,11 @@ export interface {{.table.ClassName}}TableColumns {
export interface {{.table.ClassName}}InfoData { export interface {{.table.ClassName}}InfoData {
{{range $index, $column := .table.Columns}} {{range $index, $column := .table.Columns}}
{{if $column.IsPk}}{{$column.HtmlField}}:{{if eq $column.HtmlType "images" "file" "files" "checkbox"}}any[]{{else if eq $column.HtmlType "radio"}}boolean{{else}}{{$column.TsType}}|undefined{{end}}; // {{$column.ColumnComment}} {{else}}{{$column.HtmlField}}:{{if eq $column.HtmlType "images" "file" "files" "checkbox"}}any[]{{else if eq $column.HtmlType "radio"}}boolean{{else}}{{$column.TsType}}|undefined{{end}}; // {{$column.ColumnComment}} {{end}} {{if $column.IsPk}}{{$column.HtmlField}}:{{if eq $column.HtmlType "images" "file" "files" "checkbox"}}any[]{{else if eq $column.HtmlType "radio"}}boolean{{else}}{{$column.TsType}}|undefined{{end}}; // {{$column.ColumnComment}} {{else}}{{$column.HtmlField}}:{{if eq $column.HtmlType "images" "file" "files" "checkbox"}}any[]{{else if eq $column.HtmlType "radio"}}boolean{{else}}{{$column.TsType}}|undefined{{end}}; // {{$column.ColumnComment}} {{end}}
{{range $ti, $linkedTable := $.table.LinkedTables}}
{{if eq $column.LinkTableClass $linkedTable.ClassName}}
linked{{$column.GoField}}:Linked{{$.table.ClassName}}{{$linkedTable.ClassName}}; // {{$column.ColumnComment}}
{{end}}
{{end}}
{{end}} {{end}}
{{range $ti, $linkedTable := .table.LinkedTables}} {{range $ti, $linkedTable := .table.LinkedTables}}
linked{{$.table.ClassName}}{{$linkedTable.ClassName}}:Linked{{$.table.ClassName}}{{$linkedTable.ClassName}}; linked{{$.table.ClassName}}{{$linkedTable.ClassName}}:Linked{{$.table.ClassName}}{{$linkedTable.ClassName}};

View File

@ -24,7 +24,11 @@
{{if or (eq $column.HtmlType "input") (eq $column.HtmlType "textarea") (eq $column.HtmlType "radio") (eq $column.HtmlType "select")}} {{if or (eq $column.HtmlType "input") (eq $column.HtmlType "textarea") (eq $column.HtmlType "radio") (eq $column.HtmlType "select")}}
<el-col :span="{{$column.ColSpan}}"> <el-col :span="{{$column.ColSpan}}">
{{if ne $column.LinkTableName ""}} {{if ne $column.LinkTableName ""}}
<el-form-item label="{{$column.ColumnComment}}">{{"{{"}} proxy.getOptionValue(formData.{{$column.HtmlField}}, get{{$column.GoField}}Op) {{"}}"}}</el-form-item> {{range $ti, $linkedTable := $.table.LinkedTables}}
{{if eq $column.LinkTableClass $linkedTable.ClassName}}
<el-form-item label="{{$column.ColumnComment}}">{{"{{"}} formData.linked{{$column.GoField}}?formData.linked{{$column.GoField}}.{{CaseCamelLower $column.LinkLabelName}}:'' {{"}}"}}</el-form-item>
{{end}}
{{end}}
{{else if ne $column.DictType ""}} {{else if ne $column.DictType ""}}
<el-form-item label="{{$column.ColumnComment}}">{{"{{"}} proxy.getOptionValue(formData.{{$column.HtmlField}}, {{$column.HtmlField}}Options,'value','label') {{"}}"}}</el-form-item> <el-form-item label="{{$column.ColumnComment}}">{{"{{"}} proxy.getOptionValue(formData.{{$column.HtmlField}}, {{$column.HtmlField}}Options,'value','label') {{"}}"}}</el-form-item>
{{else}} {{else}}
@ -242,6 +246,11 @@
{{$column.HtmlField}}: [] , {{$column.HtmlField}}: [] ,
{{else}} {{else}}
{{$column.HtmlField}}: undefined, {{$column.HtmlField}}: undefined,
{{range $ti, $linkedTable := $.table.LinkedTables}}
{{if eq $column.LinkTableClass $linkedTable.ClassName}}
linked{{$column.GoField}}:{{ "{" }}{{CaseCamelLower $column.LinkLabelId}}:undefined,{{CaseCamelLower $column.LinkLabelName}}:undefined {{ "}" }},
{{end}}
{{end}}
{{end}} {{end}}
{{end}} {{end}}
{{range $ti, $linkedTable := .table.LinkedTables}} {{range $ti, $linkedTable := .table.LinkedTables}}
@ -341,6 +350,11 @@
{{else}} {{else}}
{{$column.HtmlField}}: undefined, {{$column.HtmlField}}: undefined,
{{end}} {{end}}
{{range $ti, $linkedTable := $.table.LinkedTables}}
{{if eq $column.LinkTableClass $linkedTable.ClassName}}
linked{{$column.GoField}}:{{ "{" }}{{CaseCamelLower $column.LinkLabelId}}:undefined,{{CaseCamelLower $column.LinkLabelName}}:undefined {{ "}" }},
{{end}}
{{end}}
{{end}} {{end}}
{{range $ti, $linkedTable := .table.LinkedTables}} {{range $ti, $linkedTable := .table.LinkedTables}}
linked{{$.table.ClassName}}{{$linkedTable.ClassName}}: { linked{{$.table.ClassName}}{{$linkedTable.ClassName}}: {