From c8b42c5b827756f2d1e4f26f5c111b5df92284be Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 13 Jul 2020 20:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E8=A1=A8=E6=A0=BC=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=8C=89=E9=9C=80=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/demo/table/export.html |  1 +
 .../templates/demo/table/fixedColumns.html     |  1 +
 .../src/main/resources/templates/include.html  | 18 ++++++++++++------
 .../templates/monitor/online/online.html       |  1 +
 .../main/resources/templates/tool/gen/gen.html |  1 +
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/export.html b/ruoyi-admin/src/main/resources/templates/demo/table/export.html
index 1f014ca59..82be299a5 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/export.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/export.html
@@ -12,6 +12,7 @@
 		</div>
 	</div>
     <div th:include="include :: footer"></div>
+    <th:block th:include="include :: bootstrap-table-export-js" />
     <script th:inline="javascript">
         var prefix = ctx + "demo/table";
         var datas = [[${@dict.getType('sys_normal_disable')}]];
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html b/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
index 802e545a0..cd53b3228 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
@@ -23,6 +23,7 @@
 		</div>
 	</div>
     <div th:include="include :: footer"></div>
+    <th:block th:include="include :: bootstrap-table-fixed-columns-js" />
     <script th:inline="javascript">
         var prefix = ctx + "demo/table";
         var datas = [[${@dict.getType('sys_normal_disable')}]];
diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html
index 060f56e98..7b1c7c5db 100644
--- a/ruoyi-admin/src/main/resources/templates/include.html
+++ b/ruoyi-admin/src/main/resources/templates/include.html
@@ -25,17 +25,12 @@
 	<script th:src="@{/ajax/libs/bootstrap-table/bootstrap-table.min.js?v=20200529}"></script>
 	<script th:src="@{/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js}"></script>
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js}"></script>
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js}"></script>
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js}"></script>
 	<!-- jquery-validate 表单验证插件 -->
 	<script th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
 	<script th:src="@{/ajax/libs/validate/messages_zh.min.js}"></script>
 	<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js}"></script>
 	<!-- jquery-validate 表单树插件 -->
 	<script th:src="@{/ajax/libs/bootstrap-treetable/bootstrap-treetable.js}"></script>
-	<!-- jquery-export 表格导出插件 -->
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js}"></script>
-	<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/tableExport.js}"></script>
 	<!-- 遮罩层 -->
 	<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js}"></script>
     <script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
@@ -188,4 +183,15 @@
 <div th:fragment="bootstrap-table-editable-js">
 	<script th:src="@{/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.min.js}"></script>
     <script th:src="@{/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js}"></script>
-</div>
\ No newline at end of file
+</div>
+
+<!-- 表格导出插件 -->
+<div th:fragment="bootstrap-table-export-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/tableExport.js}"></script>
+</div>
+
+<!-- 表格冻结列插件 -->
+<div th:fragment="bootstrap-table-fixed-columns-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js}"></script>
+</div>
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
index 3ee925f36..b9ebb29a0 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
@@ -37,6 +37,7 @@
 		</div>
 	</div>
 	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: bootstrap-table-export-js" />
 	<script th:inline="javascript">
 		var forceFlag = [[${@permission.hasPermi('monitor:online:forceLogout')}]];
 		var prefix = ctx + "monitor/online";
diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
index 1048fe21e..63efe95a8 100644
--- a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
+++ b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
@@ -52,6 +52,7 @@
 		</div>
 	</div>
 	<th:block th:include="include :: footer" />
+	<th:block th:include="include :: bootstrap-table-export-js" />
 	<script th:inline="javascript">
 		var prefix = ctx + "tool/gen";
 		var editFlag = [[${@permission.hasPermi('tool:gen:edit')}]];