From ca88185a1f356fd2010ddf09228c16befbde603e Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Wed, 6 May 2020 22:51:06 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84](v2.5):?=
=?UTF-8?q?=20v2.5=20beta=20update=20index.ftl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #335
2.5 Beta 详情:https://www.ydyno.com/archives/1225.html
---
.../src/main/resources/template/generator/front/index.ftl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-system/src/main/resources/template/generator/front/index.ftl
index 1731b6b0..dcbcdc9d 100644
--- a/eladmin-system/src/main/resources/template/generator/front/index.ftl
+++ b/eladmin-system/src/main/resources/template/generator/front/index.ftl
@@ -44,13 +44,13 @@
<#elseif column.formType = 'Textarea'>
<#elseif column.formType = 'Radio'>
- <#if column.dictName??>
+ <#if (column.dictName)?? && (column.dictName)!="">
{{ item.label }}
<#else>
未设置字典,请手动设置 Radio
#if>
<#elseif column.formType = 'Select'>
- <#if column.dictName??>
+ <#if (column.dictName)?? && (column.dictName)!="">
<#list columns as column>
<#if column.columnShow>
- <#if column.dictName??>
+ <#if (column.dictName)?? && (column.dictName)!="">
{{ dict.label.${column.dictName}[scope.row.${column.changeColumnName}] }}