From 7abd08f04ecef6c748c2cb8e3d32f77a998ff87a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 8 Apr 2024 10:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E9=80=89=E6=A1=86=E5=92=8C=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E6=8E=A7=E4=BB=B6=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=A0=B9=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/views/htmltags/form/radio.html    | 9 +++++++--
 .../src/main/resources/views/htmltags/form/select.html   | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/resources/views/htmltags/form/radio.html b/modules/core/src/main/resources/views/htmltags/form/radio.html
index a0ac87b7..8a9f31f8 100644
--- a/modules/core/src/main/resources/views/htmltags/form/radio.html
+++ b/modules/core/src/main/resources/views/htmltags/form/radio.html
@@ -59,8 +59,13 @@ var body = {
 	var checked, title;
 	for (var item in p.items){
 		checked = (@ObjectUtils.toString(p.value) == item[p.itemValue] ? ' checked' : '');
-		if (type.name(item) == 'DictData' && isNotBlank(item['description'])){
-			title = ' title="' + item['description'] + '"';
+		if (type.name(item) == 'DictData'){
+			if (!item['isRoot']) {
+				continue;
+			}
+			if (isNotBlank(item['description'])){
+				title = ' title="' + item['description'] + '"';
+			}
 		}
 		%><label${title}><input type="radio" id="${p.id}${itemLP.index}" name="${p.name}"
 			value="${item[p.itemValue]}"${p.attrs}${checked}> ${item[p.itemLabel]}</label><%
diff --git a/modules/core/src/main/resources/views/htmltags/form/select.html b/modules/core/src/main/resources/views/htmltags/form/select.html
index b4dc0769..6f0e469c 100644
--- a/modules/core/src/main/resources/views/htmltags/form/select.html
+++ b/modules/core/src/main/resources/views/htmltags/form/select.html
@@ -94,6 +94,9 @@ var body = {
 			attr = attr + (@ObjectUtils.toString(p.value) == iv ? ' selected' : '');
 		}
 		if (type.name(item) == 'DictData'){
+			if (!item['isRoot']) {
+				continue;
+			}
 			if (isNotBlank(item['description'])){
 				attr = attr + ' title="' + item['description'] + '"';
 			}