diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java
index b7e5832..4a2c329 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/DemoTableController.java
@@ -167,6 +167,15 @@ public class DemoTableController extends BaseController
return prefix + "/detail";
}
+ /**
+ * 表格父子视图
+ */
+ @GetMapping("/child")
+ public String child()
+ {
+ return prefix + "/child";
+ }
+
/**
* 表格图片预览
*/
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
index 97aeb02..06ab422 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
@@ -832,6 +832,10 @@ label {
display: inline-block
}
+.editable-input .input-sm {
+ height: 32px!important;
+}
+
/** 表格冻结列样式 **/
.left-fixed-table-columns, .left-fixed-body-columns {
position: absolute;
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 2ed9f92..7fbfe76 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
@@ -35,6 +35,7 @@
showToggle: true,
showExport: false,
clickToSelect: false,
+ mobileResponsive: true,
rememberSelected: false,
fixedColumns: false,
fixedNumber: 0,
@@ -78,6 +79,7 @@
showExport: options.showExport, // 是否支持导出文件
uniqueId: options.uniqueId, // 唯 一的标识符
clickToSelect: options.clickToSelect, // 是否启用点击选中行
+ mobileResponsive: options.mobileResponsive, // 是否支持移动端适配
detailView: options.detailView, // 是否启用显示细节视图
onClickRow: options.onClickRow, // 点击某行触发的事件
onDblClickRow: options.onDblClickRow, // 双击某行触发的事件
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/table/check.html b/ruoyi-admin/src/main/resources/templates/demo/modal/table/check.html
index 15c4eaa..1ba7784 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/table/check.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/modal/table/check.html
@@ -7,7 +7,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/table/parent.html b/ruoyi-admin/src/main/resources/templates/demo/modal/table/parent.html
index eb8d627..0807206 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/table/parent.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/modal/table/parent.html
@@ -7,7 +7,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/modal/table/radio.html b/ruoyi-admin/src/main/resources/templates/demo/modal/table/radio.html
index 4f3bea8..0df48f0 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/modal/table/radio.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/modal/table/radio.html
@@ -7,7 +7,7 @@
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 03f27e5..6a3f897 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/operate/table.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/operate/table.html
@@ -30,7 +30,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/button.html b/ruoyi-admin/src/main/resources/templates/demo/table/button.html
index 7dd439e..7a86644 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/button.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/button.html
@@ -23,7 +23,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/child.html b/ruoyi-admin/src/main/resources/templates/demo/table/child.html
new file mode 100644
index 0000000..73ad544
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/child.html
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/curd.html b/ruoyi-admin/src/main/resources/templates/demo/table/curd.html
index f769daf..3a67d87 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/curd.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/curd.html
@@ -36,7 +36,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/detail.html b/ruoyi-admin/src/main/resources/templates/demo/table/detail.html
index 3460529..ef6bd18 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/detail.html
@@ -7,7 +7,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/editable.html b/ruoyi-admin/src/main/resources/templates/demo/table/editable.html
index f8a76f6..5b2de5d 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/editable.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/editable.html
@@ -16,7 +16,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/event.html b/ruoyi-admin/src/main/resources/templates/demo/table/event.html
index 58197b3..5b4d5ce 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/event.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/event.html
@@ -8,7 +8,7 @@
自定义触发事件(点击某行/双击某行/单击某格/双击某格/服务器发送数据前触发/数据被加载时触发)
-
+
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 f7ab3db..f4a058a 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/export.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/export.html
@@ -7,7 +7,7 @@
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 132cb15..dce0e53 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html
@@ -18,7 +18,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/footer.html b/ruoyi-admin/src/main/resources/templates/demo/table/footer.html
index cc62007..215880e 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/footer.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/footer.html
@@ -7,7 +7,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html b/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html
index 8a828b0..77226ff 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html
@@ -7,7 +7,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/image.html b/ruoyi-admin/src/main/resources/templates/demo/table/image.html
index 26166ea..514cd7f 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/image.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/image.html
@@ -7,7 +7,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/multi.html b/ruoyi-admin/src/main/resources/templates/demo/table/multi.html
index dc66c32..3ecb155 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/multi.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/multi.html
@@ -33,7 +33,7 @@
@@ -68,7 +68,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/other.html b/ruoyi-admin/src/main/resources/templates/demo/table/other.html
index 84c4b7b..e891925 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/other.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/other.html
@@ -27,7 +27,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/pageGo.html b/ruoyi-admin/src/main/resources/templates/demo/table/pageGo.html
index f714fed..282f300 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/pageGo.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/pageGo.html
@@ -7,7 +7,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/params.html b/ruoyi-admin/src/main/resources/templates/demo/table/params.html
index 0d2329a..baf0335 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/params.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/params.html
@@ -8,7 +8,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/remember.html b/ruoyi-admin/src/main/resources/templates/demo/table/remember.html
index 03384c5..1250a3c 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/remember.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/remember.html
@@ -12,7 +12,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/reorder.html b/ruoyi-admin/src/main/resources/templates/demo/table/reorder.html
index 9e5f3a0..8c40c4d 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/reorder.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/reorder.html
@@ -8,7 +8,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 13b4c07..68a07f5 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -103,6 +103,7 @@
+
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html b/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
index ce44db3..738d845 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
@@ -50,7 +50,7 @@
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 721eca3..9c7a01c 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/online/online.html
@@ -32,7 +32,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
index e220b80..9703adf 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/operlog/operlog.html
@@ -56,7 +56,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/config/config.html b/ruoyi-admin/src/main/resources/templates/system/config/config.html
index b6a1fc7..4a68626 100644
--- a/ruoyi-admin/src/main/resources/templates/system/config/config.html
+++ b/ruoyi-admin/src/main/resources/templates/system/config/config.html
@@ -52,7 +52,7 @@
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 fc81431..48995dc 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
@@ -49,7 +49,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html b/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
index dd5d74b..112aa0f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dict/type/type.html
@@ -53,7 +53,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/notice.html b/ruoyi-admin/src/main/resources/templates/system/notice/notice.html
index 548f19b..b4fc7d3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/notice/notice.html
+++ b/ruoyi-admin/src/main/resources/templates/system/notice/notice.html
@@ -44,7 +44,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/post/post.html b/ruoyi-admin/src/main/resources/templates/system/post/post.html
index 34e5b2c..235f028 100644
--- a/ruoyi-admin/src/main/resources/templates/system/post/post.html
+++ b/ruoyi-admin/src/main/resources/templates/system/post/post.html
@@ -47,7 +47,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/authUser.html b/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
index b7ddd88..8ff7d82 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
@@ -39,7 +39,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/role.html b/ruoyi-admin/src/main/resources/templates/system/role/role.html
index fc68327..8b878a7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/role.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html
@@ -53,7 +53,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html b/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
index cdc8982..5f850cf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/selectUser.html
@@ -28,7 +28,7 @@
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 b3257ca..f198996 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -80,7 +80,7 @@
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 784a18f..2591d68 100644
--- a/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
+++ b/ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
@@ -47,7 +47,7 @@
diff --git a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
index 52e5eec..a5e9e4d 100644
--- a/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
+++ b/ruoyi-generator/src/main/resources/templates/tool/gen/importTable.html
@@ -26,7 +26,7 @@
diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
index 8069d2f..fa3bcfb 100644
--- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm
@@ -74,7 +74,7 @@
diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-generator/src/main/resources/vm/sql/sql.vm
index de26cb3..74343e1 100644
--- a/ruoyi-generator/src/main/resources/vm/sql/sql.vm
+++ b/ruoyi-generator/src/main/resources/vm/sql/sql.vm
@@ -17,3 +17,6 @@ values('${functionName}修改', @parentId, '3', '#', 'F', '0', '${permissionPr
insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
values('${functionName}删除', @parentId, '4', '#', 'F', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
+
+insert into sys_menu (menu_name, parent_id, order_num, url,menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values('${functionName}导出', @parentId, '5', '#', 'F', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html
index f5d206a..049db75 100644
--- a/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html
+++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html
@@ -53,7 +53,7 @@
diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html
index 1671414..d203ab5 100644
--- a/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html
+++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html
@@ -54,7 +54,7 @@