From 05980c69ee3f21349983e795f15bb83bb10df534 Mon Sep 17 00:00:00 2001
From: hansonyu183 <95766183@qq.com>
Date: Mon, 22 Jun 2020 22:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:AutoCode=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8=E6=A0=BC=E4=B8=8D=E6=98=BE=E7=A4=BAbool?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复：多了个}
---
 server/resource/template/fe/table.vue.tpl | 23 ++++++++++++++---------
 server/resource/template/te/model.go.tpl  |  3 +--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/server/resource/template/fe/table.vue.tpl b/server/resource/template/fe/table.vue.tpl
index c6fedf49..464c44a6 100644
--- a/server/resource/template/fe/table.vue.tpl
+++ b/server/resource/template/fe/table.vue.tpl
@@ -2,9 +2,7 @@
   <div>
     <div class="search-term">
       <el-form :inline="true" :model="searchInfo" class="demo-form-inline">
-           {{- range .Fields}}
-              {{- if .FieldSearchType}}
-                {{- if eq .FieldType "bool" }}
+           {{- range .Fields}}  {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
             <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
                 <el-col :span="8">
             <el-select v-model="searchInfo.{{.FieldJson}}" placeholder="请选择">
@@ -28,10 +26,7 @@
                   {{- else }}
         <el-form-item label="{{.FieldDesc}}">
           <el-input placeholder="搜索条件" v-model="searchInfo.{{.FieldJson}}"></el-input>
-        </el-form-item>
-                  {{ end }}
-              {{ end }}
-           {{ end }}
+        </el-form-item> {{ end }} {{ end }}  {{ end }}
         <el-form-item>
           <el-button @click="onSubmit" type="primary">查询</el-button>
         </el-form-item>
@@ -52,8 +47,11 @@
     <el-table-column label="日期" width="180">
          <template slot-scope="scope">{{ "{{scope.row.CreatedAt|formatDate}}" }}</template>
     </el-table-column>
-    {{range .Fields}}
-     <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120"></el-table-column>
+    {{range .Fields}}  {{- if eq .FieldType "bool" }}
+    <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+         <template slot-scope="scope">{{ "{{scope.row."}}{{.FieldJson}}{{"|formatBoolean}}" }}</template>
+    </el-table-column> {{- else }}
+    <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120"></el-table-column> {{ end }}
     {{ end }}
       <el-table-column label="按钮组">
         <template slot-scope="scope">
@@ -124,6 +122,13 @@ export default {
       } else {
         return "";
       }
+    },
+    formatBoolean: function(bool) {
+      if (bool != null) {
+        return bool ? "是" :"否";
+      } else {
+        return "";
+      }
     }
   },
   methods: {
diff --git a/server/resource/template/te/model.go.tpl b/server/resource/template/te/model.go.tpl
index 0a51ad59..ed429ab6 100644
--- a/server/resource/template/te/model.go.tpl
+++ b/server/resource/template/te/model.go.tpl
@@ -13,5 +13,4 @@ type {{.StructName}} struct {
             {{- else }}
       {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:'{{.Comment}}'"`
             {{- end }}  {{- end }} 
-}
-}
+}
\ No newline at end of file