From dcf28440f7d60dfba231d0a097b04b168e64d36b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 10 Jun 2021 11:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=A8=E6=A0=BC=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=88=E6=98=AF=E5=90=A6=E6=94=AF=E6=8C=81=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E9=A1=B5=E9=9D=A2showPrint=EF=BC=89?=
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        | 2 ++
 ruoyi-admin/src/main/resources/templates/demo/table/print.html | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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 b7024ca83..6be6cbf8c 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
@@ -61,6 +61,7 @@ var table = {
                     showColumns: true,
                     showToggle: true,
                     showExport: false,
+                    showPrint: false,
                     exportDataType: 'all',
                     exportTypes: ['csv', 'txt', 'doc', 'excel'],
                     clickToSelect: false,
@@ -110,6 +111,7 @@ var table = {
                     showColumns: options.showColumns,                   // 是否显示隐藏某列下拉框
                     showToggle: options.showToggle,                     // 是否显示详细视图和列表视图的切换按钮
                     showExport: options.showExport,                     // 是否支持导出文件
+                    showPrint: options.showPrint,                       // 是否支持打印页面
                     showHeader: options.showHeader,                     // 是否显示表头
                     showFullscreen: options.showFullscreen,             // 是否显示全屏按钮
                     uniqueId: options.uniqueId,                         // 唯一的标识符
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/print.html b/ruoyi-admin/src/main/resources/templates/demo/table/print.html
index 85c0c4096..8695376ad 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/print.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/print.html
@@ -15,7 +15,7 @@
 			         data-print-filter 设置值以按此列过滤打印的数据。
 			         data-print-formatter 函数（值，行，索引）-返回字符串。格式化打印表中此列的单元格值。函数行为类似于“ formatter”列选项
 			         printIgnore 设置为true可以在打印页面中隐藏此列。 -->
-				<table id="bootstrap-table"  data-show-print="true"></table>
+				<table id="bootstrap-table"></table>
 			</div>
 		</div>
 	</div>
@@ -27,6 +27,7 @@
         $(function() {
             var options = {
                 url: prefix + "/list",
+                showPrint: true,
 		        showSearch: false,
 		        showRefresh: false,
 		        showToggle: false,