From aa04cf9cec6057e88e0e502807865c1e72592ab6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 5 Sep 2022 16:31:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/entity/LawsMonthlyReportTitleTemplateEO.java | 3 +++ .../impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java index 7b9888886..4a66c3f86 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java @@ -81,4 +81,7 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable { //排序 private int sort; + + @TableField(exist = false) + private String key; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 20950cba4..8852e0412 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -220,6 +220,10 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEOTemp, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEOTemp, req.getParameterMap()); List lawsMonthlyReportTitleTemplateEOS = this.list(queryWrapper); + for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : lawsMonthlyReportTitleTemplateEOS) { + //前端需要的特殊数据格式 + lawsMonthlyReportTitleTemplateEO.setKey(lawsMonthlyReportTitleTemplateEO.getId()); + } List parentList = lawsMonthlyReportTitleTemplateEOS.stream() .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); Collections.sort(parentList, new Comparator() { From 0fb59689e973d21b58ac7a9b9f49524861955245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Mon, 5 Sep 2022 18:04:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 54 +++++++++++ .../processForm/processDetails/index.vue | 2 +- .../components/listOfRegulations.vue | 91 +++++++++++++++++-- 3 files changed, 138 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 31e0b904d..e647e1e68 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -725,6 +725,29 @@ getAction(this.url.list, query).then((res) => { if (res.success) { this.dataSource = res.result || [] + if (this.dataSource.length == 0) { + this.$nextTick(() => { + let anttablebody = document.getElementsByClassName('ant-table-body') + let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner') + let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner') + anttablebody[0].classList.add('ant-table-body-one') + antfixedLeft[0].classList.add('antfixedLeft') + antfixedRight[0].classList.add('antfixedRight') + }) + } else { + let anttablebody = document.getElementsByClassName('ant-table-body-one') + let antfixedLeft = document.getElementsByClassName('antfixedLeft') + let antfixedRight = document.getElementsByClassName('antfixedRight') + if (anttablebody && anttablebody.length > 0) { + anttablebody[0].classList.remove('ant-table-body-one') + } + if (antfixedLeft && antfixedLeft.length > 0) { + antfixedLeft[0].classList.remove('antfixedLeft') + } + if (antfixedRight && antfixedRight.length > 0) { + antfixedRight[0].classList.remove('antfixedRight') + } + } this.loading = false } else { this.loading = false @@ -1030,6 +1053,37 @@ ::v-deep .ant-table-body { background: transparent!important; } + + ::v-deep .ant-table-fixed-header .ant-table-body-inner { + overflow: visible; + } + + ::v-deep .ant-table-body { + padding-bottom: 7px; + } + + ::v-deep .ant-table-body-inner { + padding-bottom: 16px; + } + + ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar { + /*height: 0;*/ + width: 0; + } + + ::v-deep .ant-table-body-one { + padding-bottom: 0!important; + } + + ::v-deep .antfixedLeft { + padding-bottom: 0!important; + overflow: scroll!important; + } + + ::v-deep .antfixedRight { + padding-bottom: 0!important; + overflow: scroll!important; + }