From 77c4a350d489d030b5589599bcaead08e7d9c851 Mon Sep 17 00:00:00 2001 From: Hacker <721806280@qq.com> Date: Wed, 8 Jul 2020 20:58:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20ruoyi-admin/src/main/resources/sta?= =?UTF-8?q?tic/css/style.css.=20=E4=BF=AE=E6=AD=A3=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/css/style.css | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css index 88df79a49..c9a889a8c 100644 --- a/ruoyi-admin/src/main/resources/static/css/style.css +++ b/ruoyi-admin/src/main/resources/static/css/style.css @@ -4921,6 +4921,7 @@ dd.project-people { font-size: 10px; text-transform: uppercase; } + /* Chat view */ .message-input { height: 90px !important; @@ -4954,9 +4955,10 @@ dd.project-people { margin-left: -30px; } -@media ( max-width : 992px) { - .chat-users, .chat-statistic { - margin-left: 0px; +@media (max-width: 992px) { + .chat-users, + .chat-statistic { + margin-left: 0; } } @@ -4976,12 +4978,12 @@ dd.project-people { margin-top: 1px; } -.chat-discussion .chat-message:nth-child(2n+1) .message-avatar { +.chat-discussion .chat-message.left .message-avatar { float: left; margin-right: 10px; } -.chat-discussion .chat-message:nth-child(2n) .message-avatar { +.chat-discussion .chat-message.right .message-avatar { float: right; margin-left: 10px; } @@ -4996,20 +4998,20 @@ dd.project-people { border-radius: 4px; } -.chat-discussion .chat-message:nth-child(2n+1) .message-date { +.chat-discussion .chat-message.left .message-date { float: right; } -.chat-discussion .chat-message:nth-child(2n) .message-date { +.chat-discussion .chat-message.right .message-date { float: left; } -.chat-discussion .chat-message:nth-child(2n+1) .message { +.chat-discussion .chat-message.left .message { text-align: left; margin-left: 55px; } -.chat-discussion .chat-message:nth-child(2n) .message { +.chat-discussion .chat-message.right .message { text-align: right; margin-right: 55px; } @@ -5038,6 +5040,7 @@ dd.project-people { .chat-message-form .form-group { margin-bottom: 0; } + /* jsTree */ .jstree-open>.jstree-anchor>.fa-folder:before { content: "\f07c"; From 44895c3d17a5a8b3cb368ab8a4d83f96bb565b62 Mon Sep 17 00:00:00 2001 From: abbfun <819589789@qq.com> Date: Fri, 10 Jul 2020 10:00:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20ruoyi-admin/src/main/resources/sta?= =?UTF-8?q?tic/ruoyi/css/ry-ui.css.=20=E6=96=87=E6=9C=AC=E5=8C=BA=EF=BC=88?= =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=96=87=E6=9C=AC=E6=A1=86=EF=BC=89=E8=A1=A5?= =?UTF-8?q?=E9=BD=90=E5=BF=85=E5=A1=AB=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E3=80=82=E5=8E=9F=E5=8F=AA=E6=9C=89=E6=96=87?= =?UTF-8?q?=E5=AD=97=E6=8F=90=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ca45322c1..e27e63c1a 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 @@ -346,7 +346,7 @@ label.error { right: 3px } -.Validform_error,input.error,select.error { +.Validform_error,input.error,textarea.error,select.error { background-color: #fbe2e2; border-color: #c66161; color: #c00 From d56d6ac5ace9b1d6b810e91e5f28b6bfa9c9f559 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 10 Jul 2020 11:54:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Excel=E6=94=AF=E6=8C=81sort=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/annotation/Excel.java | 5 +++++ .../src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java index 4a30cc557..9b1c0d9f3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java @@ -14,6 +14,11 @@ import java.lang.annotation.Target; @Target(ElementType.FIELD) public @interface Excel { + /** + * 导出时在excel中排序 + */ + public int sort() default Integer.MAX_VALUE; + /** * 导出到Excel中的名字. */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 688d15188..708a1d7d1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -11,11 +11,13 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.stream.Collectors; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.Cell; @@ -844,6 +846,7 @@ public class ExcelUtil } } } + this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); } /**