From 103a5b279b2d998fdfd91f34b54953979e7086fd Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Mon, 27 Feb 2023 21:56:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=8D=E6=9F=A5=E8=AF=A2=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/template/vm/ts/model.template       |  5 +++++
 resource/template/vm/vue/detail-vue.template | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/resource/template/vm/ts/model.template b/resource/template/vm/ts/model.template
index 7025194..90edfea 100644
--- a/resource/template/vm/ts/model.template
+++ b/resource/template/vm/ts/model.template
@@ -31,6 +31,11 @@ export interface {{.table.ClassName}}TableColumns {
 export interface {{.table.ClassName}}InfoData {
     {{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}}
+    {{range $ti, $linkedTable := $.table.LinkedTables}}
+    {{if eq $column.LinkTableClass $linkedTable.ClassName}}
+    linked{{$column.GoField}}:Linked{{$.table.ClassName}}{{$linkedTable.ClassName}}; // {{$column.ColumnComment}}
+    {{end}}
+    {{end}}
     {{end}}
     {{range $ti, $linkedTable := .table.LinkedTables}}
     linked{{$.table.ClassName}}{{$linkedTable.ClassName}}:Linked{{$.table.ClassName}}{{$linkedTable.ClassName}};
diff --git a/resource/template/vm/vue/detail-vue.template b/resource/template/vm/vue/detail-vue.template
index ab1a1f6..f7a8d6a 100644
--- a/resource/template/vm/vue/detail-vue.template
+++ b/resource/template/vm/vue/detail-vue.template
@@ -24,7 +24,11 @@
         {{if or (eq $column.HtmlType "input") (eq $column.HtmlType "textarea") (eq $column.HtmlType "radio") (eq $column.HtmlType "select")}}
           <el-col :span="{{$column.ColSpan}}">
           {{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 ""}}
             <el-form-item label="{{$column.ColumnComment}}">{{"{{"}} proxy.getOptionValue(formData.{{$column.HtmlField}}, {{$column.HtmlField}}Options,'value','label') {{"}}"}}</el-form-item>
           {{else}}
@@ -242,6 +246,11 @@
           {{$column.HtmlField}}: [] ,
           {{else}}
           {{$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}}
           {{range $ti, $linkedTable := .table.LinkedTables}}
@@ -341,6 +350,11 @@
             {{else}}
             {{$column.HtmlField}}: undefined,
             {{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}}
             {{range $ti, $linkedTable := .table.LinkedTables}}
             linked{{$.table.ClassName}}{{$linkedTable.ClassName}}: {