From cad0d0d2f6805521bce02ecdc888e72440597b0c Mon Sep 17 00:00:00 2001 From: mnisummer <495305122@qq.com> Date: Wed, 30 Mar 2022 15:10:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E5=90=88?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E7=A4=BA=E4=BE=8B=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/demo/table/groupHeader.html | 77 +++++++------------ 1 file changed, 28 insertions(+), 49 deletions(-) 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 27d2b8d60..20ec7ccfb 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html @@ -17,61 +17,40 @@ var datas = [[${@dict.getType('sys_normal_disable')}]]; $(function() { + //合并行 & 合并列 + let columns = [ + [ + { checkbox : true, rowspan : 2 }, + { title : '基本信息', align : 'center', colspan : 5 }, + { title : '其他信息', align : 'center', colspan : 3 } + ], + [ + { field : 'userId', title : '用户ID' }, + { field : 'userCode', title : '用户编号' }, + { field : 'userName', title : '用户姓名' }, + { field : 'userPhone', title : '用户手机' }, + { field : 'userEmail', title : '用户邮箱' }, + { field : 'userBalance', title : '用户余额' }, + { field : 'status', title : '用户状态', formatter : function (value, row, index) { + return $.table.selectDictLabel(datas, value); + } + }, + { title : '操作', align : 'center', formatter : function (value, row, index) { + var actions = []; + actions.push('编辑 '); + actions.push('删除'); + return actions.join(''); + } + } + ] + ]; var options = { url: prefix + "/list", showSearch: false, showRefresh: false, showToggle: false, showColumns: false, - columns : [ - [{ - title : '基本信息', - align : 'center', - colspan : 6 - }, { - title : '其他信息', - align : 'center', - colspan : 3 - } - ], - [{ - checkbox : true - }, { - field : 'userId', - title : '用户ID' - }, { - field : 'userCode', - title : '用户编号' - }, { - field : 'userName', - title : '用户姓名' - }, { - field : 'userPhone', - title : '用户手机' - }, { - field : 'userEmail', - title : '用户邮箱' - }, { - field : 'userBalance', - title : '用户余额' - }, { - field : 'status', - title : '用户状态', - formatter : function (value, row, index) { - return $.table.selectDictLabel(datas, value); - } - }, { - title : '操作', - align : 'center', - formatter : function (value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); - } - } - ] - ] + columns : columns }; $.table.init(options); }); From cecbde26c4d0ec0dcce6997b28ce3d11997d4c5c Mon Sep 17 00:00:00 2001 From: mnisummer <495305122@qq.com> Date: Wed, 30 Mar 2022 15:10:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E5=90=88?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E7=A4=BA=E4=BE=8B=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/demo/table/groupHeader.html | 77 +++++++------------ 1 file changed, 28 insertions(+), 49 deletions(-) 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 27d2b8d60..20ec7ccfb 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html @@ -17,61 +17,40 @@ var datas = [[${@dict.getType('sys_normal_disable')}]]; $(function() { + //合并行 & 合并列 + let columns = [ + [ + { checkbox : true, rowspan : 2 }, + { title : '基本信息', align : 'center', colspan : 5 }, + { title : '其他信息', align : 'center', colspan : 3 } + ], + [ + { field : 'userId', title : '用户ID' }, + { field : 'userCode', title : '用户编号' }, + { field : 'userName', title : '用户姓名' }, + { field : 'userPhone', title : '用户手机' }, + { field : 'userEmail', title : '用户邮箱' }, + { field : 'userBalance', title : '用户余额' }, + { field : 'status', title : '用户状态', formatter : function (value, row, index) { + return $.table.selectDictLabel(datas, value); + } + }, + { title : '操作', align : 'center', formatter : function (value, row, index) { + var actions = []; + actions.push('编辑 '); + actions.push('删除'); + return actions.join(''); + } + } + ] + ]; var options = { url: prefix + "/list", showSearch: false, showRefresh: false, showToggle: false, showColumns: false, - columns : [ - [{ - title : '基本信息', - align : 'center', - colspan : 6 - }, { - title : '其他信息', - align : 'center', - colspan : 3 - } - ], - [{ - checkbox : true - }, { - field : 'userId', - title : '用户ID' - }, { - field : 'userCode', - title : '用户编号' - }, { - field : 'userName', - title : '用户姓名' - }, { - field : 'userPhone', - title : '用户手机' - }, { - field : 'userEmail', - title : '用户邮箱' - }, { - field : 'userBalance', - title : '用户余额' - }, { - field : 'status', - title : '用户状态', - formatter : function (value, row, index) { - return $.table.selectDictLabel(datas, value); - } - }, { - title : '操作', - align : 'center', - formatter : function (value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); - } - } - ] - ] + columns : columns }; $.table.init(options); }); From d7022010ea0d21529326a2965879f673d48837e8 Mon Sep 17 00:00:00 2001 From: mnisummer <495305122@qq.com> Date: Wed, 30 Mar 2022 15:10:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=84=E5=90=88?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E7=A4=BA=E4=BE=8B=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/demo/table/groupHeader.html | 77 +++++++------------ 1 file changed, 28 insertions(+), 49 deletions(-) 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 27d2b8d60..20ec7ccfb 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/groupHeader.html @@ -17,61 +17,40 @@ var datas = [[${@dict.getType('sys_normal_disable')}]]; $(function() { + //合并行 & 合并列 + let columns = [ + [ + { checkbox : true, rowspan : 2 }, + { title : '基本信息', align : 'center', colspan : 5 }, + { title : '其他信息', align : 'center', colspan : 3 } + ], + [ + { field : 'userId', title : '用户ID' }, + { field : 'userCode', title : '用户编号' }, + { field : 'userName', title : '用户姓名' }, + { field : 'userPhone', title : '用户手机' }, + { field : 'userEmail', title : '用户邮箱' }, + { field : 'userBalance', title : '用户余额' }, + { field : 'status', title : '用户状态', formatter : function (value, row, index) { + return $.table.selectDictLabel(datas, value); + } + }, + { title : '操作', align : 'center', formatter : function (value, row, index) { + var actions = []; + actions.push('编辑 '); + actions.push('删除'); + return actions.join(''); + } + } + ] + ]; var options = { url: prefix + "/list", showSearch: false, showRefresh: false, showToggle: false, showColumns: false, - columns : [ - [{ - title : '基本信息', - align : 'center', - colspan : 6 - }, { - title : '其他信息', - align : 'center', - colspan : 3 - } - ], - [{ - checkbox : true - }, { - field : 'userId', - title : '用户ID' - }, { - field : 'userCode', - title : '用户编号' - }, { - field : 'userName', - title : '用户姓名' - }, { - field : 'userPhone', - title : '用户手机' - }, { - field : 'userEmail', - title : '用户邮箱' - }, { - field : 'userBalance', - title : '用户余额' - }, { - field : 'status', - title : '用户状态', - formatter : function (value, row, index) { - return $.table.selectDictLabel(datas, value); - } - }, { - title : '操作', - align : 'center', - formatter : function (value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); - } - } - ] - ] + columns : columns }; $.table.init(options); });