github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

导入修改为模板渲染

pull/105/MERGE
RuoYi 2019-06-15 11:24:03 +08:00
parent ce18a9e86d
commit 91dd624048
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -271,8 +271,7 @@
}, },
// 导入数据 // 导入数据
importExcel: function(formId) { importExcel: function(formId) {
var currentId = $.common.isEmpty(formId) ? 'importForm' : formId; var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId;
$.form.reset(currentId);
layer.open({ layer.open({
type: 1, type: 1,
area: ['400px', '230px'], area: ['400px', '230px'],
@ -281,7 +280,7 @@
maxmin: true, maxmin: true,
shade: 0.3, shade: 0.3,
title: '导入' + $.table._option.modalName + '数据', title: '导入' + $.table._option.modalName + '数据',
content: $('#' + currentId), content: $('#' + currentId).html(),
btn: ['<i class="fa fa-check"></i> 导入', '<i class="fa fa-remove"></i> 取消'], btn: ['<i class="fa fa-check"></i> 导入', '<i class="fa fa-remove"></i> 取消'],
// 弹层外区域关闭 // 弹层外区域关闭
shadeClose: true, shadeClose: true,

4
ruoyi-admin/src/main/resources/templates/demo/operate/table.html
View File

@ -108,7 +108,8 @@
</script> </script>
</body> </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"> <div class="col-xs-offset-1">
<input type="file" id="file" name="file"/> <input type="file" id="file" name="file"/>
<div class="mt10 pt5"> <div class="mt10 pt5">
@ -120,4 +121,5 @@
</font> </font>
</div> </div>
</form> </form>
</script>
</html> </html>

5
ruoyi-admin/src/main/resources/templates/system/user/user.html
View File

@ -243,7 +243,9 @@
} }
</script> </script>
</body> </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"> <div class="col-xs-offset-1">
<input type="file" id="file" name="file"/> <input type="file" id="file" name="file"/>
<div class="mt10 pt5"> <div class="mt10 pt5">
@ -255,4 +257,5 @@
</font> </font>
</div> </div>
</form> </form>
</script>
</html> </html>