From d4beca3c3be71c258dc825840eb65bd30293dd99 Mon Sep 17 00:00:00 2001
From: sxile <3440626@qq.com>
Date: Tue, 12 Nov 2019 14:08:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=A8=A1=E7=B3=8A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/dict/data/data.html       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html b/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
index 48995dc..3794ce3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/data/data.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-	<th:block th:include="include :: header('字典数据列表')" />
+	<th:block th:include="include :: select2-css" />
 </head>
 <body class="gray-bg">
 	<div class="container-div">
@@ -11,9 +11,10 @@
 					<div class="select-list">
 						<ul>
 						    <li>
-								字典名称：<select id="dictType" name="dictType">
-					                      <option th:each="dict : ${dictList}" th:text="${dict['dictName']}" th:value="${dict['dictType']}" th:field="*{dict.dictType}"></option>
-					                  </select>
+								字典名称：
+							<select id="dictType" name="dictType" class="form-control">
+								<option th:each="dict : ${dictList}" th:text="${dict['dictName']}" th:value="${dict['dictType']}" th:field="*{dict.dictType}"></option>
+							</select>
 							</li>
 							<li>
 								字典标签：<input type="text" name="dictLabel"/>
@@ -26,7 +27,7 @@
 							</li>
 							<li>
 								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-							    <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 							</li>
 						</ul>
 					</div>
@@ -54,6 +55,7 @@
 		</div>
 	</div>
 	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: select2-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('system:dict:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:dict:remove')}]];
@@ -132,6 +134,12 @@
 		    var dictType = $("#dictType option:selected").val();
 		    $.operate.add(dictType);
 		}
+
+		function resetPre() {
+			$.form.reset();
+			$("#dictType").val($("#dictType").val()).trigger("change");
+		}
+
 	</script>
 </body>
 </html>
\ No newline at end of file
