diff --git a/src/main/java/com/boot/security/server/utils/TemplateUtil.java b/src/main/java/com/boot/security/server/utils/TemplateUtil.java index b66072a..d38d3d4 100644 --- a/src/main/java/com/boot/security/server/utils/TemplateUtil.java +++ b/src/main/java/com/boot/security/server/utils/TemplateUtil.java @@ -253,9 +253,7 @@ public class TemplateUtil { text = text.replace("{beanName}", beanName); List beanFieldNames = input.getBeanFieldName(); text = text.replace("{columnsDatas}", getHtmlColumnsDatas(beanFieldNames)); - text = text.replace("{columnDefs}", getHtmlColumnDefs(beanFieldNames)); text = text.replace("{ths}", getHtmlThs(beanFieldNames)); - text = text.replace("{lastIndex}", beanFieldNames.size() + ""); FileUtil.saveTextFile(text, path + File.separator + beanParamName + "List.html"); log.debug("生成查询页面：{}模板", beanName); @@ -318,12 +316,4 @@ public class TemplateUtil { return builder.toString(); } - private static String getHtmlColumnDefs(List beanFieldNames) { - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < beanFieldNames.size(); i++) { - builder.append("\t\t\t\t{\"name\" : \"" + beanFieldNames.get(i) + "\", \"targets\" : \"" + i + "\"},\n"); - } - - return builder.toString(); - } } diff --git a/src/main/resources/generate/htmlList.txt b/src/main/resources/generate/htmlList.txt index 4a4488b..2a79c8f 100644 --- a/src/main/resources/generate/htmlList.txt +++ b/src/main/resources/generate/htmlList.txt @@ -80,22 +80,19 @@ function init(){ }, "dom": "<'dt-toolbar'r>t<'dt-toolbar-footer'<'col-sm-10 col-xs-12 hidden-xs'i><'col-xs-12 col-sm-10' p v>>", "columns": [ -{columnsDatas} { "data": "", "defaultContent": ""}, +{columnsDatas} { + "data": "", + "defaultContent": "", + "render": function (data, type, row) { + var id = row['id']; + var href = "update{beanName}.html?id=" + id; + var edit = buttonEdit(href, "", pers); + var del = buttonDel(id, "", pers); + return edit + del; + } + }, ], - "columnDefs": [ -{columnDefs} - { - "targets": {lastIndex}, - "render": function (data, type, row) { - var id = row['id']; - var href = "update{beanName}.html?id=" + id; - var edit = buttonEdit(href, "", pers); - var del = buttonDel(id, "", pers); - return edit + del; - } - }, - ], "order": [[ 0, "asc" ]] } ); } diff --git a/src/main/resources/static/pages/file/fileList.html b/src/main/resources/static/pages/file/fileList.html index 668f745..004e21d 100644 --- a/src/main/resources/static/pages/file/fileList.html +++ b/src/main/resources/static/pages/file/fileList.html @@ -90,16 +90,9 @@ function init(){ }, "dom": "<'dt-toolbar'r>t<'dt-toolbar-footer'<'col-sm-10 col-xs-12 hidden-xs'i><'col-xs-12 col-sm-10' p v>>", "columns": [ - { "data": "url", "defaultContent": ""}, - { "data": "path", "defaultContent": ""}, - { "data": "contentType", "defaultContent": ""}, - { "data": "updateTime", "defaultContent": ""}, - { "data": "", "defaultContent": ""}, - - ], - "columnDefs": [ { - "targets": 0, + "data": "url", + "defaultContent": "", "render": function (data, type, row) { var url = row['url']; var type = row['type']; @@ -113,18 +106,20 @@ function init(){ return u; } }, - { "name": "path", "targets": 1 }, - { "name": "contentType", "targets": 2 }, - { "name": "updateTime", "targets": 3 }, + { "data": "path", "defaultContent": ""}, + { "data": "contentType", "defaultContent": ""}, + { "data": "updateTime", "defaultContent": ""}, { - "targets": 4, + "data": "", + "defaultContent": "", "render": function (data, type, row) { var id = row['id']; var del = buttonDel(id, "sys:file:del", pers); return del; } - } - ], + }, + + ], "order": [[ 3, "desc" ]] } ); } diff --git a/src/main/resources/static/pages/job/jobList.html b/src/main/resources/static/pages/job/jobList.html index 165841e..092e774 100644 --- a/src/main/resources/static/pages/job/jobList.html +++ b/src/main/resources/static/pages/job/jobList.html @@ -102,19 +102,9 @@ function init(){ { "data": "springBeanName", "defaultContent": ""}, { "data": "methodName", "defaultContent": ""}, { "data": "description", "defaultContent": ""}, - { "data": "status", "defaultContent": ""}, - { "data": "updateTime", "defaultContent": ""}, - { "data": "", "defaultContent": ""}, - ], - "columnDefs": [ - { "name": "id", "targets": 0 }, - { "name": "jobName", "targets": 1 }, - { "name": "cron", "targets": 2 }, - { "name": "springBeanName", "targets": 3 }, - { "name": "methodName", "targets": 4 }, - { "name": "description", "targets": 5 }, { - "targets": 6, + "data": "status", + "defaultContent": "", "render": function (data, type, row) { var status = row['status']; var a = ""; @@ -126,9 +116,10 @@ function init(){ return a; } }, - { "name": "updateTime", "targets": 7}, + { "data": "updateTime", "defaultContent": ""}, { - "targets": 8, + "data": "", + "defaultContent": "", "render": function (data, type, row) { var isSysJob = row['isSysJob']; if(!isSysJob) { @@ -142,8 +133,8 @@ function init(){ } } }, - ], - "order": [[6, "desc"],[ 7, "desc" ]] + ], + "order": [[6, "desc"],[ 7, "desc" ]] } ); } diff --git a/src/main/resources/static/pages/log/logList.html b/src/main/resources/static/pages/log/logList.html index 54ff1e6..a4691e1 100644 --- a/src/main/resources/static/pages/log/logList.html +++ b/src/main/resources/static/pages/log/logList.html @@ -107,35 +107,28 @@ function init(){ "dom": "<'dt-toolbar'r>t<'dt-toolbar-footer'<'col-sm-10 col-xs-12 hidden-xs'i><'col-xs-12 col-sm-10' p v>>", "columns": [ {"data" : "id", "defaultContent" : ""}, - {"data" : "user", "defaultContent" : ""}, + { + "data" : "user", + "defaultContent" : "", + "render": function (data, type, row) { + var user = row['user']; + return user['nickname']; + } + }, {"data" : "module", "defaultContent" : ""}, - {"data" : "flag", "defaultContent" : ""}, + { + "data" : "flag", + "defaultContent" : "", + "render": function (data, type, row) { + var flag = row['flag']; + return flag ? "成功":"失败"; + } + }, {"data" : "remark", "defaultContent" : ""}, {"data" : "createTime", "defaultContent" : ""}, ], - "columnDefs": [ - {"name" : "id", "targets" : 0}, - { - "targets": 1, - "render": function (data, type, row) { - var user = row['user']; - return user['nickname']; - } - }, - {"name" : "module", "targets" : 2}, - { - "targets": 3, - "render": function (data, type, row) { - var flag = row['flag']; - return flag ? "成功":"失败"; - } - }, - {"name" : "remark", "targets" : 4}, - {"name" : "createTime", "targets" : 5}, - - ], "order": [[ 5, "desc" ]] } ); } diff --git a/src/main/resources/static/pages/mail/mailList.html b/src/main/resources/static/pages/mail/mailList.html index 2248cc8..f9b226f 100644 --- a/src/main/resources/static/pages/mail/mailList.html +++ b/src/main/resources/static/pages/mail/mailList.html @@ -46,7 +46,7 @@ id 标题 内容 - 时间 + 时间 操作 @@ -103,30 +103,26 @@ function init(){ "columns": [ { "data": "id", "defaultContent": ""}, { "data": "subject", "defaultContent": ""}, - { "data": "content", "defaultContent": ""}, - { "data": "createTime", "defaultContent": ""}, - ], - "columnDefs": [ - { "name": "id", "targets": 0 }, - { "name": "subject", "targets": 1 }, { - "targets": 2, + "data": "content", + "defaultContent": "", "render": function (data, type, row) { var content = row['content']; var c = removeHTMLTag(content); return c; - } + } }, - { "name": "createTime", "targets": 3 }, + { "data": "createTime", "defaultContent": ""}, { - "targets": 4, + "data": "content", + "defaultContent": "", "render": function (data, type, row) { var id = row['id']; var href = "mailDetail.html?id=" + id; return ""; - } - } - ], + } + }, + ], "order": [[ 3, "desc" ]] } ); } diff --git a/src/main/resources/static/pages/notice/noticeList.html b/src/main/resources/static/pages/notice/noticeList.html index 56ef059..a80d134 100644 --- a/src/main/resources/static/pages/notice/noticeList.html +++ b/src/main/resources/static/pages/notice/noticeList.html @@ -100,7 +100,7 @@ function init(){ d.status = $('#status').val(); d.beginTime = $('#beginTime').val(); d.endTime = $('#endTime').val(); - }, + }, "error":function(xhr, textStatus, errorThrown){ var msg = xhr.responseText; console.log(msg) @@ -111,15 +111,9 @@ function init(){ { "data": "id", "defaultContent": ""}, { "data": "title", "defaultContent": ""}, { "data": "updateTime", "defaultContent": ""}, - { "data": "status", "defaultContent": ""}, - { "data": "", "defaultContent": ""}, - ], - "columnDefs": [ - { "name": "id", "targets": 0 }, - { "name": "title", "targets": 1 }, - { "name": "updateTime", "targets": 2 }, { - "targets": 3, + "data": "status", + "defaultContent": "", "render": function (data, type, row) { var status = row['status']; var a = ""; @@ -132,7 +126,8 @@ function init(){ } }, { - "targets": 4, + "data": "", + "defaultContent": "", "render": function (data, type, row) { var id = row['id']; var status = row['status']; @@ -143,9 +138,9 @@ function init(){ } var del = buttonDel(id, "notice:del", pers); return edit + del + ""; - } - } - ], + } + }, + ], "order": [[ 2, "desc" ],[1, "desc"]] } ); } diff --git a/src/main/resources/static/pages/notice/noticePubList.html b/src/main/resources/static/pages/notice/noticePubList.html index 905f73c..51e6073 100644 --- a/src/main/resources/static/pages/notice/noticePubList.html +++ b/src/main/resources/static/pages/notice/noticePubList.html @@ -93,10 +93,6 @@ function init(){ d.beginTime = $('#beginTime').val(); d.endTime = $('#endTime').val(); d.isRead = $('#isRead').val(); - }, - "error":function(xhr, textStatus, errorThrown){ - var msg = xhr.responseText; - console.log(msg) } }, "dom": "<'dt-toolbar'r>t<'dt-toolbar-footer'<'col-sm-10 col-xs-12 hidden-xs'i><'col-xs-12 col-sm-10' p v>>", @@ -104,42 +100,26 @@ function init(){ { "data": "title", "defaultContent": ""}, { "data": "updateTime", "defaultContent": ""}, { "data": "readTime", "defaultContent": ""}, - { "data": "", "defaultContent": ""}, - ], - "columnDefs": [ { - "targets": 0, - "render": function (data, type, row) { - var title = row['title']; - return title; - } - }, - { "name": "updateTime", "targets": 1 }, - { - "targets": 2, + "data": "", + "defaultContent": "", "render": function (data, type, row) { var isRead = row['isRead']; if(isRead){ return "已读"; } return "未读"; - } + } }, { - "targets": 3, - "render": function (data, type, row) { - var readTime = row['readTime']; - return readTime; - } - }, - { - "targets": 4, + "data": "", + "defaultContent": "", "render": function (data, type, row) { var id = row['id']; return ""; - } - } - ], + } + }, + ], "order": [[ 2, "asc" ],[1, "desc"]] } ); } diff --git a/src/main/resources/static/pages/role/roleList.html b/src/main/resources/static/pages/role/roleList.html index 6378874..f0b1492 100644 --- a/src/main/resources/static/pages/role/roleList.html +++ b/src/main/resources/static/pages/role/roleList.html @@ -88,14 +88,9 @@ function init(){ { "data": "name", "defaultContent": ""}, { "data": "description", "defaultContent": ""}, { "data": "updateTime", "defaultContent": ""}, - { "data": "", "defaultContent": ""}, - ], - "columnDefs": [ - { "name": "name", "targets": 0 }, - { "name": "description", "targets": 1 }, - { "name": "updateTime", "targets": 2}, { - "targets": 3, + "data": "", + "defaultContent": "", "render": function (data, type, row) { var id = row['id']; var href = "addRole.html?id=" + id; @@ -104,8 +99,8 @@ function init(){ return edit + del; } }, - ], - "order": [[ 2, "desc" ]] + ], + "order": [[ 2, "desc" ]] } ); } diff --git a/src/main/resources/static/pages/user/userList.html b/src/main/resources/static/pages/user/userList.html index d6ae5a4..1ca1dcd 100644 --- a/src/main/resources/static/pages/user/userList.html +++ b/src/main/resources/static/pages/user/userList.html @@ -106,17 +106,9 @@ function init(){ { "data": "nickname", "defaultContent": ""}, { "data": "phone", "defaultContent": ""}, { "data": "email", "defaultContent": ""}, - { "data": "status", "defaultContent": ""}, - { "data": "", "defaultContent": ""}, - - ], - "columnDefs": [ - { "name": "username", "targets": 0 }, - { "name": "nickname", "targets": 1 }, - { "name": "phone", "targets": 2 }, - { "name": "email", "targets": 3 }, { - "targets": 4, + "data": "status", + "defaultContent": "", "render": function (data, type, row) { var status = row['status']; var a = ""; @@ -131,15 +123,17 @@ function init(){ } }, { - "targets": 5, + "data": "", + "defaultContent": "", "render": function (data, type, row) { var id = row['id']; var href = "updateUser.html?id=" + id; var edit = buttonEdit(href, "sys:user:add", pers); return edit; } - } - ], + }, + + ], "order": [[ 0, "desc" ],[1, "asc"]] } ); }