From e593b59c1efa90eeac6363876f761a419f03bf20 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 15 Jun 2019 11:24:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js      | 5 ++---
 .../src/main/resources/templates/demo/operate/table.html     | 4 +++-
 .../src/main/resources/templates/system/user/user.html       | 5 ++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 08202586..7c5b9bb0 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -271,8 +271,7 @@
             },
             // 导入数据
             importExcel: function(formId) {
-            	var currentId = $.common.isEmpty(formId) ? 'importForm' : formId;
-            	$.form.reset(currentId);
+            	var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId;
             	layer.open({
             		type: 1,
             		area: ['400px', '230px'],
@@ -281,7 +280,7 @@
             		maxmin: true,
             		shade: 0.3,
             		title: '导入' + $.table._option.modalName + '数据',
-            		content: $('#' + currentId),
+            		content: $('#' + currentId).html(),
             		btn: ['<i class="fa fa-check"></i> 导入', '<i class="fa fa-remove"></i> 取消'],
             		// 弹层外区域关闭
             		shadeClose: true,
diff --git a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html b/ruoyi-admin/src/main/resources/templates/demo/operate/table.html
index aff8c139..92690b76 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/operate/table.html
@@ -108,7 +108,8 @@
     </script>
 </body>
 <!-- 导入区域 -->
-<form id="importForm" enctype="multipart/form-data" class="mt20 mb10" style="display: none;">
+<script id="importTpl" type="text/template">
+<form enctype="multipart/form-data" class="mt20 mb10">
 	<div class="col-xs-offset-1">
 		<input type="file" id="file" name="file"/>
 		<div class="mt10 pt5">
@@ -120,4 +121,5 @@
 		</font>
 	</div>
 </form>
+</script>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html
index 998f706c..be0f01ac 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -243,7 +243,9 @@
 		}
 	</script>
 </body>
-<form id="importForm" enctype="multipart/form-data" class="mt20 mb10" style="display: none;">
+<!-- 导入区域 -->
+<script id="importTpl" type="text/template">
+<form enctype="multipart/form-data" class="mt20 mb10">
 	<div class="col-xs-offset-1">
 		<input type="file" id="file" name="file"/>
 		<div class="mt10 pt5">
@@ -255,4 +257,5 @@
 		</font>
 	</div>
 </form>
+</script>
 </html>
\ No newline at end of file